From 25538c1063d1e9a2d8dac1b813d43e7d8fb18e3f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:38 +0800
Subject: [PATCH] 经销商管理
---
admin/src/views/system/permission.vue | 2
admin/src/components/business/OperaCreationApproveWindow.vue | 2
admin/src/components/business/OperaShopLabelsWindow.vue | 2
admin/src/views/system/dict.vue | 2
admin/src/views/business/comment.vue | 6
admin/src/components/business/OperaWithdrawRecordWindow.vue | 2
admin/src/assets/style/alertstyle.scss | 12
admin/src/views/business/goodsorder.vue | 2
admin/src/assets/style/style.scss | 18 +
admin/src/views/business/integralGoods.vue | 2
admin/src/views/business/shopApply.vue | 4
admin/src/components/business/OperaArticleWindow.vue | 2
admin/src/components/business/OperaOrgsWindow.vue | 2
admin/src/views/business/platformGoods.vue | 2
admin/src/views/business/hotCity.vue | 2
admin/src/components/business/OperaBannerWindow.vue | 2
admin/src/components/business/OperaCouponWindow.vue | 6
admin/src/components/business/OperaLabelsZhuanquWindow.vue | 52 ++++-
admin/src/views/business/visiteStore.vue | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 27 ++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 5
admin/src/components/business/OperaLabelsWindow.vue | 2
admin/src/components/business/OperaIntegralShopMoneyWindow.vue | 2
admin/src/components/business/OperaShopApproveWindow.vue | 2
admin/src/components/business/OperaLabelKnowledgeWindow.vue | 2
admin/src/components/business/OperaShopWindow.vue | 10
admin/src/views/business/fund.vue | 2
admin/src/components/business/OperaLabelsAreaWindow.vue | 2
admin/src/components/business/OperaGoodsInfoWindow.vue | 2
admin/src/views/business/inviteRecord.vue | 2
admin/src/views/business/shopMoney.vue | 2
admin/src/views/business/integral.vue | 4
admin/src/components/business/OperaLabelExpressWindow.vue | 2
admin/src/views/business/member.vue | 5
admin/src/components/business/OperaPlatformGoodsSkuWindow.vue | 2
admin/src/components/common/GlobalWindow.vue | 2
admin/src/views/business/creation.vue | 2
admin/src/views/business/labelsKnowledge.vue | 2
admin/src/views/business/labels.vue | 2
admin/src/views/business/information.vue | 2
admin/src/views/business/shopLabels.vue | 2
admin/src/components/business/OperaInformationWindow.vue | 2
admin/src/components/business/OperaNoticeWindow.vue | 2
admin/src/components/business/OperaShipmentsWindow.vue | 2
admin/src/views/system/role.vue | 2
admin/src/views/business/notice.vue | 2
admin/src/components/business/OperaActivityWindow.vue | 10
admin/src/views/business/bannerZhuanqu.vue | 9
admin/src/components/business/OperaOrderRefundWindow.vue | 2
admin/src/components/business/OperaOrderMarkWindow.vue | 2
admin/src/views/business/labelsArea.vue | 2
admin/src/components/business/OperaCreationWindow.vue | 2
admin/src/views/business/coupon.vue | 4
admin/src/views/business/goodsLabels.vue | 2
admin/src/components/business/OperaBannerZhuanquWindow.vue | 136 +++++---------
admin/src/views/system/traceLog.vue | 2
admin/src/components/business/OperaHotCityWindow.vue | 2
admin/src/views/business/planGoodsorder.vue | 14
admin/src/components/business/OperaArticleLabelsWindow.vue | 2
admin/src/views/business/article.vue | 2
admin/src/views/business/shopComment.vue | 4
admin/src/views/system/data-permission.vue | 2
admin/src/components/business/OperaGoodsBrandWindow.vue | 2
admin/src/views/business/creationApply.vue | 2
admin/src/components/business/OperaCouponGoodsWindow.vue | 10
admin/src/views/system/user.vue | 2
admin/src/components/business/OperaGoodsWindow.vue | 3
admin/src/views/business/goodsBrand.vue | 2
admin/src/views/business/memberCoupon.vue | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 3
admin/src/components/system/position/PositionUserWindow.vue | 2
admin/src/views/system/loginLog.vue | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java | 3
admin/src/components/business/OperaCouponUsedDetail.vue | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Banner.java | 4
admin/src/components/business/OperaChangeIntegralWindow.vue | 2
admin/src/components/system/department/DepartmentUserWindow.vue | 2
admin/src/components/business/OperaVisiteStoreWindow.vue | 8
admin/src/views/business/goodsSku.vue | 2
admin/src/views/business/shop.vue | 2
admin/src/views/business/integralGoodsorder.vue | 14
admin/src/views/business/withdrawRecord.vue | 2
admin/src/views/business/articleLabels.vue | 2
admin/src/views/business/orgs.vue | 2
admin/src/components/business/OperaGoodsLabelsWindow.vue | 2
admin/src/views/business/orderComment.vue | 2
admin/src/views/business/activity.vue | 2
admin/src/views/business/planGoods.vue | 2
88 files changed, 267 insertions(+), 232 deletions(-)
diff --git a/admin/src/assets/style/alertstyle.scss b/admin/src/assets/style/alertstyle.scss
index d0ce027..e11afc9 100644
--- a/admin/src/assets/style/alertstyle.scss
+++ b/admin/src/assets/style/alertstyle.scss
@@ -1,9 +1,9 @@
-::v-deep .el-form-item {
- display: flex;
-}
-::v-deep .el-form-item__content {
+/*::v-deep .el-form-item {
+ display: flex ;
+}*/
+/*::v-deep .el-form-item__content {
flex: 1;
-}
+}*/
.address-plus {
display: flex;
@@ -26,6 +26,8 @@
}
}
+/*
::v-deep input {
text-align: left !important;
}
+*/
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index 686a3d8..1b76d04 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -46,11 +46,27 @@
.windows {
z-index: 9991 !important;
}
-
+.table-search-form .el-form {
+ display: flex !important;
+ flex-wrap: wrap;
+}
+.table-search-form .el-form-item__label{
+ min-width: 10px !important;
+}
+.el-form-item {
+ display: flex ;
+}
+.el-form-item__content{
+ margin-left: 0px !important;
+ flex: 1;
+}
// 绌挎妗嗙殑鎸夐挳
.el-transfer__buttons {
padding: 0 16px !important;
}
+.el-form-item__label{
+ min-width: 100px;
+}
.red{
color: red;
}
diff --git a/admin/src/components/business/OperaActivityWindow.vue b/admin/src/components/business/OperaActivityWindow.vue
index 6bf6642..56a6562 100644
--- a/admin/src/components/business/OperaActivityWindow.vue
+++ b/admin/src/components/business/OperaActivityWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" inline>
+ <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" >
<el-form-item label="娲诲姩鏍囬" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユ椿鍔ㄦ爣棰�" v-trim/>
</el-form-item>
@@ -178,7 +178,7 @@
}
}
return {
-
+
type: '0',
isUploading: false,
searchLoading: false,
@@ -249,7 +249,7 @@
this.orgs = []
this.applyTime = []
this.activityTime = []
-
+
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
@@ -278,7 +278,7 @@
this.form.imgurl = file.imgurl;
this.form.imgurlfull = file.imgurlfull;
},
-
+
selectApplyTime(v) {
if (!v) {
this.form.signStarttime = ''
@@ -316,7 +316,7 @@
} else {
this.shops = res.records
}
-
+
})
.finally(() => {
this.searchLoading = false
diff --git a/admin/src/components/business/OperaArticleLabelsWindow.vue b/admin/src/components/business/OperaArticleLabelsWindow.vue
index aef454a..24bab08 100644
--- a/admin/src/components/business/OperaArticleLabelsWindow.vue
+++ b/admin/src/components/business/OperaArticleLabelsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<!-- <el-form-item label="鎵�灞炴澘鍧�" prop="type">
<el-select
v-model="form.type"
diff --git a/admin/src/components/business/OperaArticleWindow.vue b/admin/src/components/business/OperaArticleWindow.vue
index 4bd1fe2..3515054 100644
--- a/admin/src/components/business/OperaArticleWindow.vue
+++ b/admin/src/components/business/OperaArticleWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<el-form-item label="鏂囩珷鍚嶇О" prop="title">
<el-input v-model="form.title" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaBannerWindow.vue b/admin/src/components/business/OperaBannerWindow.vue
index 10afec0..0d1e953 100644
--- a/admin/src/components/business/OperaBannerWindow.vue
+++ b/admin/src/components/business/OperaBannerWindow.vue
@@ -7,7 +7,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<!-- <el-form-item label="浣嶇疆" prop="position">
<!– {{ form.position }} –>
<el-select
diff --git a/admin/src/components/business/OperaBannerZhuanquWindow.vue b/admin/src/components/business/OperaBannerZhuanquWindow.vue
index 8ea0a8d..e5f8b98 100644
--- a/admin/src/components/business/OperaBannerZhuanquWindow.vue
+++ b/admin/src/components/business/OperaBannerZhuanquWindow.vue
@@ -1,13 +1,16 @@
<template>
- <GlobalAlertWindow
+ <GlobalWindow
v-loading="isUploading"
:title="title"
+ width="60%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�">
-
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
+ <el-form-item label="涓撳尯鍚嶇О" prop="title">
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ュ悕绉�" :maxlength="5" v-trim/>
+ </el-form-item>
<el-form-item label="灞曠ず鍥�" prop="imgFullUrl">
<UploadAvatarImage
:file="{ 'imgurlfull': form.imgFullUrl, 'imgurl': form.imgurl }"
@@ -17,65 +20,29 @@
@uploadBegin="isUploading = true"
/>
</el-form-item>
- <el-form-item label="涓撳尯鍚嶇О" prop="labelId">
- <el-select
- v-model="form.labelId"
- placeholder="璇烽�夋嫨涓撳尯鍚嶇О"
- clearable
- @change="labelChange"
- >
- <el-option
- v-for="item in types"
- :key="item.id"
- :value="item.id"
- :label="item.name"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍏宠仈浜у搧" prop="content">
- <el-select
- v-model="form.content"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉帮紝鍐嶉�夋嫨"
- filterable
- remote
- reserve-keyword
- :remote-method="remoteMethod"
- :loading="searchLoading"
- @change="selectShop"
- >
- <el-option
- v-for="item in goods"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-form-item label="閫変腑鍟嗗搧" prop="applyIdList" >
+ <span style="font-size: 12px;color: #216EEE" @click="selectGoods">宸叉寚瀹氥�� {{applyDataList.length}} 銆戜欢鍟嗗搧</span>
+ <el-button style="margin-left:30px;display: inline-block;width: 80px;" type="primary" @click="selectGoods">鍘婚�夋嫨 </el-button>
</el-form-item>
<el-form-item label="鎺掑簭鐮�" prop="sortnum">
<el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
</el-form>
- </GlobalAlertWindow>
+ <OperaCouponGoodsWindow ref="OperaCouponGoodsWindow" @success="doSelect"/>
+ </GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
-import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
+import GlobalWindow from '@/components/common/GlobalWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
-import { findAll } from "@/api/business/labels";
-import { findListByParentCategory } from '@/api/business/goods'
+import OperaCouponGoodsWindow from '@/components/business/OperaCouponGoodsWindow'
+import {allList as goodsList} from "@/api/business/goods";
export default {
name: 'OperaBannerWindow',
extends: BaseOpera,
- components: { GlobalAlertWindow, UploadAvatarImage },
+ components: { GlobalWindow, UploadAvatarImage ,OperaCouponGoodsWindow},
data () {
- let positionRule = (rule, value, callBack) => {
- if (!value) {
- callBack(new Error(rule.message))
- } else {
- callBack()
- }
- }
return {
isUploading: false,
searchLoading: false,
@@ -86,24 +53,24 @@
form: {
id: null,
imgurl: '',
+ title:'',
imgFullUrl: '',
content: '',
- labelId: '',
+ position: 3,
sortnum: '',
objName: '',
-
+ applyIdList:[]
},
- types:[],
- goods: [],
// 楠岃瘉瑙勫垯
rules: {
- content: [
- { required: true, validator: positionRule, message: '璇烽�夋嫨鍏宠仈浜у搧', tigger: 'change' }
+ title: [
+ { required: true, message: '璇疯緭鍏ヤ笓鍖哄悕绉�', tigger: 'blur' }
],
imgFullUrl: [
{ required: true, message: '璇蜂笂浼犱笓鍖哄浘鐗�', tigger: 'change' }
],
- }
+ },
+ applyDataList:[]
}
},
created () {
@@ -111,15 +78,26 @@
api: '/business/banner',
'field.id': 'id'
})
- findAll({ type: 12 })
- .then(res => {
- console.log(res);
- this.types = res
- })
},
methods: {
+ selectGoods () {
+ this.$refs.OperaCouponGoodsWindow.open('閫夋嫨鍟嗗搧', this.applyDataList)
+ },
+ doSelect (rows) {
+ console.log(rows, this.applyDataList)
+ this.applyDataList = []
+ this.form.applyIdList = []
+ if (rows && rows.length) {
+ rows.forEach(item => {
+ this.applyDataList.push(item)
+ this.form.applyIdList.push(item.id)
+ })
+ }
+ this.$refs.form.clearValidate();
+ },
open (title, target) {
-
+ this.applyDataList = []
+ this.form.applyIdList = []
this.title = title
this.visible = true
this.activities = []
@@ -138,38 +116,24 @@
for (const key in this.form) {
this.form[key] = target[key]
}
- this.form.content = +this.form.content
- this.remoteMethod(target.goodsName)
+ this.loadSelectGoods()
})
},
- labelChange() {
- this.this.goods = []
- this.form.labelId = ''
+ loadSelectGoods () {
+ goodsList({
+ zhuanquId: this.form.id // 鍟嗗搧鍒嗙被
+ }).then(res => {
+ this.applyDataList = res || []
+ this.applyDataList.forEach(t => {
+ this.form.applyIdList.push(t.id)
+ })
+ })
},
// 涓婁紶鍥剧墖
uploadAvatarSuccess(file) {
this.form.imgurl = file.imgurl;
this.form.imgFullUrl = file.imgurlfull;
- },
- remoteMethod(query) {
- if (query !== '') {
- this.searchLoading = true
- findListByParentCategory({
- name: query,
- categoryId: this.form.labelId
- })
- .then(res => {
- this.goods = res
- })
- .finally(() => {
- this.searchLoading = false
- })
- }
- },
- selectShop(val) {
- const temp = this.goods.find(item => item.id == val)
- this.form.objName = temp.name
- },
+ }
},
}
</script>
diff --git a/admin/src/components/business/OperaChangeIntegralWindow.vue b/admin/src/components/business/OperaChangeIntegralWindow.vue
index 820bef7..8b73b62 100644
--- a/admin/src/components/business/OperaChangeIntegralWindow.vue
+++ b/admin/src/components/business/OperaChangeIntegralWindow.vue
@@ -7,7 +7,7 @@
@confirm="confirm"
>
<p class="tip-warn" style="margin: 30px;"><i class="el-icon-warning"></i>鎿嶄綔璇存槑锛氱Н鍒嗗鍔犳垨鍑忓皯鍚庝細鍦ㄦ秷璐硅�呯灞曠ず锛岃璋ㄦ厧鎿嶄綔锛�</p>
- <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" >
<el-form-item label="绉垎浣欓" >
<span class="green" ><b>{{info.integral || 0}}</b></span>
</el-form-item>
diff --git a/admin/src/components/business/OperaCouponGoodsWindow.vue b/admin/src/components/business/OperaCouponGoodsWindow.vue
index 6c14332..fe62b30 100644
--- a/admin/src/components/business/OperaCouponGoodsWindow.vue
+++ b/admin/src/components/business/OperaCouponGoodsWindow.vue
@@ -8,7 +8,7 @@
>
<TableLayout>
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" id="curSearchForm" :model="searchForm" label-width="100px" style="display: block;" >
+ <el-form ref="searchForm" slot="search-form" id="curSearchForm" :model="searchForm" label-width="100px" inline >
<el-form-item label="" prop="name" label-width="5px" style="display: inline-block;margin-right: 30px;">
<el-input v-model="searchForm.name" style="width: 150px;" placeholder="鍟嗗搧鍚嶇О" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -251,7 +251,13 @@
}
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+::v-deep .el-select {
+ width: 100%;
+ .el-input__inner {
+ width: 100%;
+ }
+}
.table-pagination{
position: fixed !important;
bottom: 10px;
diff --git a/admin/src/components/business/OperaCouponUsedDetail.vue b/admin/src/components/business/OperaCouponUsedDetail.vue
index 549fa26..570559a 100644
--- a/admin/src/components/business/OperaCouponUsedDetail.vue
+++ b/admin/src/components/business/OperaCouponUsedDetail.vue
@@ -7,7 +7,7 @@
>
<TableLayout :permissions="['business:coupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍏戞崲浜�" prop="member">
<el-input v-model="searchForm.member" placeholder="璇疯緭鍏ユ樀绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/components/business/OperaCouponWindow.vue b/admin/src/components/business/OperaCouponWindow.vue
index a6649b7..a762bfe 100644
--- a/admin/src/components/business/OperaCouponWindow.vue
+++ b/admin/src/components/business/OperaCouponWindow.vue
@@ -1,12 +1,12 @@
<template>
<GlobalWindow
:title="title"
- width="80%"
+ width="60%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<p class="tip-header" >鍩烘湰灞炴��</p>
<el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" :maxlength="12" v-trim/>
@@ -95,7 +95,7 @@
<p class="tip-header" >鍙戞斁瑙勫垯</p>
<el-form-item label="鍙戞斁鎬婚噺" prop="num">
<div class="num-style">
- <el-input-number v-model="form.num" :controls="false" :min="0" :max="99999" placeholder="璇疯緭鍏ュ彂鏀炬�婚噺(0~99999)" v-trim></el-input-number>
+ <el-input v-model="form.num" type="number" :controls="false" :min="0" :max="99999" placeholder="璇疯緭鍏ュ彂鏀炬�婚噺(0~99999)" v-trim></el-input >
</div>
<p class="tip-warn" style="margin-bottom: 1px;"><i class="el-icon-warning"></i>鎻愰啋锛氬彂鏀炬�婚噺涓�0琛ㄧず涓嶉檺鍒�</p>
</el-form-item>
diff --git a/admin/src/components/business/OperaCreationApproveWindow.vue b/admin/src/components/business/OperaCreationApproveWindow.vue
index 33c19f4..0f02086 100644
--- a/admin/src/components/business/OperaCreationApproveWindow.vue
+++ b/admin/src/components/business/OperaCreationApproveWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" >
<el-form-item label="鍐呭" prop="content">
<el-input
type="textarea"
diff --git a/admin/src/components/business/OperaCreationWindow.vue b/admin/src/components/business/OperaCreationWindow.vue
index 465d0cf..d371476 100644
--- a/admin/src/components/business/OperaCreationWindow.vue
+++ b/admin/src/components/business/OperaCreationWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="124px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="124px" label-suffix="锛�" >
<el-form-item label="鐧诲綍璐﹀彿" prop="login">
<el-input v-model="form.login" placeholder="璇疯緭鍏ョ櫥褰曡处鍙�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaGoodsBrandWindow.vue b/admin/src/components/business/OperaGoodsBrandWindow.vue
index fa1bdc5..2c574d0 100644
--- a/admin/src/components/business/OperaGoodsBrandWindow.vue
+++ b/admin/src/components/business/OperaGoodsBrandWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍝佺墝鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ搧鐗屽悕绉�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaGoodsInfoWindow.vue b/admin/src/components/business/OperaGoodsInfoWindow.vue
index 98c0757..d0482d8 100644
--- a/admin/src/components/business/OperaGoodsInfoWindow.vue
+++ b/admin/src/components/business/OperaGoodsInfoWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" disabled v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaGoodsLabelsWindow.vue b/admin/src/components/business/OperaGoodsLabelsWindow.vue
index 13b9265..cfac92f 100644
--- a/admin/src/components/business/OperaGoodsLabelsWindow.vue
+++ b/admin/src/components/business/OperaGoodsLabelsWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim/>
diff --git a/admin/src/components/business/OperaGoodsWindow.vue b/admin/src/components/business/OperaGoodsWindow.vue
index e9be1ef..ee98ca5 100644
--- a/admin/src/components/business/OperaGoodsWindow.vue
+++ b/admin/src/components/business/OperaGoodsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-suffix="锛�" >
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" v-trim/>
</el-form-item>
@@ -300,7 +300,6 @@
</script>
<style lang="scss" scoped>
-@import "@/assets/style/alertstyle.scss";
::v-deep .el-form-item__content {
flex: 0.6;
}
diff --git a/admin/src/components/business/OperaHotCityWindow.vue b/admin/src/components/business/OperaHotCityWindow.vue
index 081708a..96c8fc6 100644
--- a/admin/src/components/business/OperaHotCityWindow.vue
+++ b/admin/src/components/business/OperaHotCityWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍩庡競鍚嶇О" prop="cityId">
<!-- <el-input v-model="form.cityId" placeholder="璇疯緭鍏ュ煄甯傜紪鐮侊紙鍏宠仈areas)" v-trim/> -->
<div class="address">
diff --git a/admin/src/components/business/OperaInformationWindow.vue b/admin/src/components/business/OperaInformationWindow.vue
index f9805e2..7c6e99e 100644
--- a/admin/src/components/business/OperaInformationWindow.vue
+++ b/admin/src/components/business/OperaInformationWindow.vue
@@ -7,7 +7,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" inline>
+ <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" >
<el-form-item label="鏍囬" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaIntegralShopMoneyWindow.vue b/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
index b663e1d..bb3c69d 100644
--- a/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
+++ b/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
@@ -7,7 +7,7 @@
>
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px" >
<el-form-item label="" prop="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏀舵敮绫诲瀷" @change="search" >
<el-option :key="0" :value="0" label="鏀跺叆"></el-option>
diff --git a/admin/src/components/business/OperaLabelExpressWindow.vue b/admin/src/components/business/OperaLabelExpressWindow.vue
index d31b009..32e6f45 100644
--- a/admin/src/components/business/OperaLabelExpressWindow.vue
+++ b/admin/src/components/business/OperaLabelExpressWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaLabelKnowledgeWindow.vue b/admin/src/components/business/OperaLabelKnowledgeWindow.vue
index 9ff4a42..af33bfe 100644
--- a/admin/src/components/business/OperaLabelKnowledgeWindow.vue
+++ b/admin/src/components/business/OperaLabelKnowledgeWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaLabelsAreaWindow.vue b/admin/src/components/business/OperaLabelsAreaWindow.vue
index edee68a..cb66405 100644
--- a/admin/src/components/business/OperaLabelsAreaWindow.vue
+++ b/admin/src/components/business/OperaLabelsAreaWindow.vue
@@ -7,7 +7,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<el-form-item label="鍖哄煙鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaLabelsWindow.vue b/admin/src/components/business/OperaLabelsWindow.vue
index 6ce3e95..29e9683 100644
--- a/admin/src/components/business/OperaLabelsWindow.vue
+++ b/admin/src/components/business/OperaLabelsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<el-form-item label="鎵�灞炴澘鍧�" prop="type">
<el-select
v-model="form.type"
diff --git a/admin/src/components/business/OperaLabelsZhuanquWindow.vue b/admin/src/components/business/OperaLabelsZhuanquWindow.vue
index 030d714..7bc436b 100644
--- a/admin/src/components/business/OperaLabelsZhuanquWindow.vue
+++ b/admin/src/components/business/OperaLabelsZhuanquWindow.vue
@@ -6,17 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
- <el-form-item label="鎵�灞炲搧鐗�" prop="parentId" v-if="form.type === 15">
- <el-select v-model="form.parentId" placeholder="璇烽�夋嫨鎵�灞炲搧鐗�" >
- <el-option
- v-for="item in labels()"
- :key="item.id"
- :value="item.id"
- :label="item.name"
- ></el-option>
- </el-select>
- </el-form-item>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" :maxlength="5" v-trim/>
</el-form-item>
@@ -29,6 +19,10 @@
@uploadBegin="isUploading = true"
/>
</el-form-item>
+ <el-form-item label="閫変腑鍟嗗搧" prop="applyIdList" >
+ <span style="font-size: 12px;color: #216EEE" @click="selectGoods">宸叉寚瀹氥�� {{applyDataList.length}} 銆戜欢鍟嗗搧</span>
+ <el-button style="margin-left:30px;display: inline-block;width: 80px;" type="primary" @click="selectGoods">鍘婚�夋嫨 </el-button>
+ </el-form-item>
<el-form-item label="鎺掑簭鐮�" prop="sortnum">
<el-input type="number" v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
@@ -36,6 +30,7 @@
<el-input type="textarea" v-model="form.info" placeholder="璇疯緭鍏ュ娉�" :maxlength="200" v-trim/>
</el-form-item>
</el-form>
+ <OperaCouponGoodsWindow ref="OperaCouponGoodsWindow" @success="doSelect"/>
</GlobalAlertWindow>
</template>
@@ -43,10 +38,12 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import OperaCouponGoodsWindow from '@/components/business/OperaCouponGoodsWindow'
+import {allList as goodsList} from "@/api/business/goods";
export default {
name: 'OperaLabelsWindow',
extends: BaseOpera,
- components: { GlobalAlertWindow, UploadAvatarImage },
+ components: { GlobalAlertWindow, UploadAvatarImage ,OperaCouponGoodsWindow},
data () {
return {
isUploading: false,
@@ -60,8 +57,10 @@
parentId: null,
sortnum: null,
imgFullurl: null,
+ applyIdList:[],
imgurl: ''
},
+ applyDataList:[],
// 楠岃瘉瑙勫垯
rules: {
parentId: [{ required: true, message: '璇烽�夋嫨鎵�灞炲搧鐗�' }],
@@ -77,11 +76,29 @@
})
},
methods: {
+ selectGoods () {
+ this.$refs.OperaCouponGoodsWindow.open('閫夋嫨鍟嗗搧', this.applyDataList)
+ },
+ doSelect (rows) {
+ console.log(rows, this.applyDataList)
+ this.applyDataList = []
+ this.form.applyIdList = []
+ if (rows && rows.length) {
+ rows.forEach(item => {
+ this.applyDataList.push(item)
+ this.form.applyIdList.push(item.id)
+ })
+ }
+ this.$refs.form.clearValidate();
+ },
open (title, target, type) {
this.title = title
this.visible = true
+ this.applyDataList = []
+ this.form.applyIdList = []
this.form.imgFullurl =null
this.form.imgurl =null
+ this.goods = []
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
@@ -98,6 +115,17 @@
this.form[key] = target[key]
}
this.form.type = type
+ this.loadSelectGoods()
+ })
+ },
+ loadSelectGoods () {
+ goodsList({
+ zhuanquId: this.form.id // 鍟嗗搧鍒嗙被
+ }).then(res => {
+ this.applyDataList = res || []
+ this.applyDataList.forEach(t => {
+ this.form.applyIdList.push(t.id)
+ })
})
},
// 涓婁紶鍥剧墖
diff --git a/admin/src/components/business/OperaNoticeWindow.vue b/admin/src/components/business/OperaNoticeWindow.vue
index a39efa7..92453bc 100644
--- a/admin/src/components/business/OperaNoticeWindow.vue
+++ b/admin/src/components/business/OperaNoticeWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" >
<el-form-item label="鏍囬" prop="title">
<el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
diff --git a/admin/src/components/business/OperaOrderMarkWindow.vue b/admin/src/components/business/OperaOrderMarkWindow.vue
index d91aab8..54ce4bf 100644
--- a/admin/src/components/business/OperaOrderMarkWindow.vue
+++ b/admin/src/components/business/OperaOrderMarkWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" label-width="120px" label-suffix="锛�" :rules="rules" inline>
+ <el-form :model="form" ref="form" label-width="120px" label-suffix="锛�" :rules="rules" >
<el-form-item label="澶囨敞" prop="sysInfo">
<el-input type="textarea" :autosize="{ minRows: 4, maxRows:4 }" v-model="form.sysInfo" placeholder="璇疯緭鍏ュ娉�" :maxlength="50" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaOrderRefundWindow.vue b/admin/src/components/business/OperaOrderRefundWindow.vue
index d8b2cd4..f6dc914 100644
--- a/admin/src/components/business/OperaOrderRefundWindow.vue
+++ b/admin/src/components/business/OperaOrderRefundWindow.vue
@@ -52,7 +52,7 @@
<div class="header">
<div class="header-b">閫�娆惧唴瀹�</div>
<div class="info-item" >
- <el-form :model="form" ref="form" label-width="120px" label-suffix="锛�" :rules="rules" inline>
+ <el-form :model="form" ref="form" label-width="120px" label-suffix="锛�" :rules="rules" >
<el-form-item label="閫�娆鹃噾棰�" prop="money" style="display: block;">
<el-input type="number" v-model="form.money" placeholder="璇疯緭鍏ラ��娆鹃噾棰�" v-trim> <template slot="append"> 鍏�</template> </el-input>
<span class="tip-warn" style="margin-bottom: 30px;font-size: 14px;"> <i class="el-icon-warning"></i>
diff --git a/admin/src/components/business/OperaOrgsWindow.vue b/admin/src/components/business/OperaOrgsWindow.vue
index 8291c2b..af0707e 100644
--- a/admin/src/components/business/OperaOrgsWindow.vue
+++ b/admin/src/components/business/OperaOrgsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="125px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="125px" label-suffix="锛�" >
<el-form-item label="鏈烘瀯鐧婚檰璐﹀彿" prop="loginname">
<el-input v-model="form.loginname" :disabled="isEdit" placeholder="璇疯緭鍏ョ櫥闄嗚处鍙�" v-trim/>
</el-form-item>
diff --git a/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue b/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
index a349d59..7a8c411 100644
--- a/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
+++ b/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<div class="title-style"><div>SKU閰嶇疆</div><div class="btn" @click="addSku">娣诲姞瑙勬牸</div></div>
<el-table
:data="skiuList"
diff --git a/admin/src/components/business/OperaShipmentsWindow.vue b/admin/src/components/business/OperaShipmentsWindow.vue
index 4b93227..2f1d6e9 100644
--- a/admin/src/components/business/OperaShipmentsWindow.vue
+++ b/admin/src/components/business/OperaShipmentsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<p class="tip-warn" style="margin: 30px;font-size: 14px;"><i class="el-icon-warning"></i>鎿嶄綔璇存槑锛氭偍姝ｅ湪閽堝璁㈠崟锛�<span class="red">{{ form.code }} </span>杩涜{{ form.status==2?'蹇�掑彉鏇�':'鍙戣揣' }}鎿嶄綔锛�</p>
<el-form-item label="蹇�掑叕鍙�" prop="kdId">
<el-select
diff --git a/admin/src/components/business/OperaShopApproveWindow.vue b/admin/src/components/business/OperaShopApproveWindow.vue
index ea76fab..1a7f5ec 100644
--- a/admin/src/components/business/OperaShopApproveWindow.vue
+++ b/admin/src/components/business/OperaShopApproveWindow.vue
@@ -5,7 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" >
<el-form-item label="鍐呭" prop="content">
<el-input
type="textarea"
diff --git a/admin/src/components/business/OperaShopLabelsWindow.vue b/admin/src/components/business/OperaShopLabelsWindow.vue
index cdf6a79..53d8732 100644
--- a/admin/src/components/business/OperaShopLabelsWindow.vue
+++ b/admin/src/components/business/OperaShopLabelsWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" :maxlength="5" v-trim/>
diff --git a/admin/src/components/business/OperaShopWindow.vue b/admin/src/components/business/OperaShopWindow.vue
index c0d797a..31afbbf 100644
--- a/admin/src/components/business/OperaShopWindow.vue
+++ b/admin/src/components/business/OperaShopWindow.vue
@@ -7,7 +7,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+ <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" >
<p class="tip-header" >璐﹀彿淇℃伅</p>
<el-form-item label="鐧诲綍璐﹀彿" prop="username">
<el-input v-model="form.username" placeholder="璇疯緭鍏ョ櫥褰曡处鍙�" :maxlength="20" v-trim/>
@@ -46,8 +46,8 @@
</el-select>
</el-form-item>
<div style="display: flex; ">
- <el-form-item label="閫夋嫨鐪佸競鍖�" prop="provinceId">
- <el-select v-model="form.provinceId" placeholder="閫夋嫨鐪佷唤" clearable @change="selectProvince">
+ <el-form-item label="鐪佸競鍖�" prop="provinceId">
+ <el-select v-model="form.provinceId" style="width: 100px" placeholder="閫夋嫨鐪佷唤" clearable @change="selectProvince">
<el-option
v-for="item in provinces"
:key="item.id"
@@ -57,7 +57,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="cityId">
- <el-select v-model="form.cityId" placeholder="閫夋嫨鍩庡競" clearable @change="selectCity">
+ <el-select v-model="form.cityId" style="width: 100px" placeholder="閫夋嫨鍩庡競" clearable @change="selectCity">
<el-option
v-for="item in cities"
:key="item.id"
@@ -67,7 +67,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="areaId" >
- <el-select v-model="form.areaId" placeholder="閫夋嫨鍘垮尯" clearable>
+ <el-select v-model="form.areaId" style="width: 100px" placeholder="閫夋嫨鍘垮尯" clearable>
<el-option
v-for="item in areas"
:key="item.id"
diff --git a/admin/src/components/business/OperaVisiteStoreWindow.vue b/admin/src/components/business/OperaVisiteStoreWindow.vue
index 3deafce..2dc6036 100644
--- a/admin/src/components/business/OperaVisiteStoreWindow.vue
+++ b/admin/src/components/business/OperaVisiteStoreWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" inline>
+ <el-form :model="form" ref="form" label-width="130px" label-suffix="锛�" :rules="rules" >
<el-form-item label="鎺㈠簵鏍囬" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユ帰搴楁爣棰�" v-trim/>
</el-form-item>
@@ -114,7 +114,7 @@
import RichEditor from '@/components/common/RichEditor'
import UploadImage from '@/components/common/UploadImage'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
-import { fetchList as shopList } from '@/api/business/shop'
+import { fetchList as shopList } from '@/api/business/shop'
export default {
name: 'OperaActivityWindow',
@@ -135,7 +135,7 @@
folder: 'upload',
type: ''
},
-
+
isUploading: false,
searchLoading: false,
menuKey: 1,
@@ -189,7 +189,7 @@
this.form.imgurl = file.imgurl;
this.form.imgurlfull = file.imgurlfull;
},
-
+
remoteMethod(query) {
if (query !== '') {
this.searchLoading = true
diff --git a/admin/src/components/business/OperaWithdrawRecordWindow.vue b/admin/src/components/business/OperaWithdrawRecordWindow.vue
index 066af90..f55033e 100644
--- a/admin/src/components/business/OperaWithdrawRecordWindow.vue
+++ b/admin/src/components/business/OperaWithdrawRecordWindow.vue
@@ -76,7 +76,7 @@
</div>
<div v-if="form && form.status == 0">
<p class="tip-header" >鐢宠瀹℃壒</p>
- <el-form :model="checkForm" ref="checkForm" :rules="rules" label-width="110px" label-suffix="锛�" style="margin-left: 20px;width: 500px;" inline >
+ <el-form :model="checkForm" ref="checkForm" :rules="rules" label-width="110px" label-suffix="锛�" style="margin-left: 20px;width: 500px;" >
<el-form-item label="瀹℃牳缁撴灉" prop="status">
<el-radio-group v-model="checkForm.status" @change="changeStatuus">
<el-radio :label="1">閫氳繃</el-radio>
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 64971b8..c571548 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -33,7 +33,7 @@
props: {
width: {
type: String,
- default: '100%'
+ default: '60%'
},
// 鏄惁鍖呭惈搴曢儴鎿嶄綔
withFooter: {
diff --git a/admin/src/components/system/department/DepartmentUserWindow.vue b/admin/src/components/system/department/DepartmentUserWindow.vue
index 516b96a..7f4b72d 100644
--- a/admin/src/components/system/department/DepartmentUserWindow.vue
+++ b/admin/src/components/system/department/DepartmentUserWindow.vue
@@ -8,7 +8,7 @@
>
<TableLayout :with-breadcrumb="false">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" >
<el-form-item label="鐢ㄦ埛鍚�" prop="username">
<el-input v-model="searchForm.username" placeholder="璇疯緭鍏ョ敤鎴峰悕" v-trim @keypress.enter.native="search"/>
</el-form-item>
diff --git a/admin/src/components/system/position/PositionUserWindow.vue b/admin/src/components/system/position/PositionUserWindow.vue
index d2477db..eafcbfc 100644
--- a/admin/src/components/system/position/PositionUserWindow.vue
+++ b/admin/src/components/system/position/PositionUserWindow.vue
@@ -8,7 +8,7 @@
>
<TableLayout :with-breadcrumb="false">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" >
<el-form-item label="鐢ㄦ埛鍚�" prop="username">
<el-input v-model="searchForm.username" v-trim placeholder="璇疯緭鍏ョ敤鎴峰悕" @keypress.enter.native="search"/>
</el-form-item>
diff --git a/admin/src/views/business/activity.vue b/admin/src/views/business/activity.vue
index 46cceae..259eb4b 100644
--- a/admin/src/views/business/activity.vue
+++ b/admin/src/views/business/activity.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:activity:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="璧勮鏍囬" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヨ祫璁爣棰�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/article.vue b/admin/src/views/business/article.vue
index b6e95c3..fc82ebc 100644
--- a/admin/src/views/business/article.vue
+++ b/admin/src/views/business/article.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:article:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鏂囩珷鍚嶇О" prop="title">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ枃绔犲悕绉�" @keypress.enter.native="search"></el-input>
diff --git a/admin/src/views/business/articleLabels.vue b/admin/src/views/business/articleLabels.vue
index a668acd..e183fd7 100644
--- a/admin/src/views/business/articleLabels.vue
+++ b/admin/src/views/business/articleLabels.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:labels:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/bannerZhuanqu.vue b/admin/src/views/business/bannerZhuanqu.vue
index ff6fd92..22c9c34 100644
--- a/admin/src/views/business/bannerZhuanqu.vue
+++ b/admin/src/views/business/bannerZhuanqu.vue
@@ -70,15 +70,8 @@
return {
// 鎼滅储
searchForm: {
- position: '',
- type: '',
+ position: 3
},
- }
- },
- provide() {
- return {
- postions: () => this.postions,
- types: () => this.types,
}
},
created () {
diff --git a/admin/src/views/business/comment.vue b/admin/src/views/business/comment.vue
index b6bd8c6..667a689 100644
--- a/admin/src/views/business/comment.vue
+++ b/admin/src/views/business/comment.vue
@@ -1,8 +1,8 @@
<template>
<TableLayout :permissions="['business:comment:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
+
<el-form-item label="璇勮鍐呭" prop="content">
<el-input v-model="searchForm.content" placeholder="璇疯緭鍏ヨ瘎璁哄唴瀹�" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -37,7 +37,7 @@
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55"></el-table-column> -->
-
+
<el-table-column prop="nikeName" label="鐢ㄦ埛鏄电О" align="center" min-width="100px"></el-table-column>
<el-table-column prop="content" label="璇勮鍐呭" align="center" min-width="100px"></el-table-column>
<el-table-column label="璇勮绾у埆" align="center" min-width="100px">
diff --git a/admin/src/views/business/coupon.vue b/admin/src/views/business/coupon.vue
index f31ec01..65e5772 100644
--- a/admin/src/views/business/coupon.vue
+++ b/admin/src/views/business/coupon.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:coupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -20,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:coupon:create', 'business:coupon:delete']">
- <li><el-button type="primary" icon="el-icon-plus" @click="$refs.operaCouponWindow.open('鏂板缓', null, 1)" v-permissions="['business:coupon:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" icon="el-icon-plus" @click="$refs.operaCouponWindow.open('鏂板缓浼樻儬鍒�', null, 1)" v-permissions="['business:coupon:create']">鏂板缓</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:coupon:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
diff --git a/admin/src/views/business/creation.vue b/admin/src/views/business/creation.vue
index 1901c73..dd0b29c 100644
--- a/admin/src/views/business/creation.vue
+++ b/admin/src/views/business/creation.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:creation:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢ㄦ埛" prop="nickname">
<el-input v-model="searchForm.nickname" placeholder="璇疯緭鍏ユ樀绉�/鎵嬫満鍙�/濮撳悕" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/creationApply.vue b/admin/src/views/business/creationApply.vue
index 6c11298..6a79efe 100644
--- a/admin/src/views/business/creationApply.vue
+++ b/admin/src/views/business/creationApply.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:creationapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢宠浜烘樀绉�" prop="nikeName">
<el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敵璇蜂汉鏄电О" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/fund.vue b/admin/src/views/business/fund.vue
index 28a801e..bba4ca7 100644
--- a/admin/src/views/business/fund.vue
+++ b/admin/src/views/business/fund.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:fund:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鏀舵敮绫诲瀷" prop="type">
<el-select
v-model="searchForm.type"
diff --git a/admin/src/views/business/goodsBrand.vue b/admin/src/views/business/goodsBrand.vue
index 80b765c..8bef49b 100644
--- a/admin/src/views/business/goodsBrand.vue
+++ b/admin/src/views/business/goodsBrand.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:productlabel:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍝佺墝鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ搧鐗屽悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/goodsLabels.vue b/admin/src/views/business/goodsLabels.vue
index b738d43..abf22f2 100644
--- a/admin/src/views/business/goodsLabels.vue
+++ b/admin/src/views/business/goodsLabels.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:productlabel:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/goodsSku.vue b/admin/src/views/business/goodsSku.vue
index 491e1f3..4ff29e8 100644
--- a/admin/src/views/business/goodsSku.vue
+++ b/admin/src/views/business/goodsSku.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goodssku:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="涓婚敭" prop="id">
<el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index c01082a..d0a9573 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goodsorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<!-- 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
<el-tabs v-model="status" @tab-click="handleClick">
<el-tab-pane
diff --git a/admin/src/views/business/hotCity.vue b/admin/src/views/business/hotCity.vue
index 0506b69..b0b5679 100644
--- a/admin/src/views/business/hotCity.vue
+++ b/admin/src/views/business/hotCity.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:hotcity:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍩庡競鍚嶇О" prop="cityName">
<el-input v-model="searchForm.cityName" placeholder="璇疯緭鍏ュ煄甯傚悕绉�" @keypress.enter.native="search"></el-input>
diff --git a/admin/src/views/business/information.vue b/admin/src/views/business/information.vue
index a286f83..73d4e99 100644
--- a/admin/src/views/business/information.vue
+++ b/admin/src/views/business/information.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:activity:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鏍囬" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/integral.vue b/admin/src/views/business/integral.vue
index 97c4c1c..aaa3309 100644
--- a/admin/src/views/business/integral.vue
+++ b/admin/src/views/business/integral.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢ㄦ埛" prop="nickName">
<el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -26,7 +26,6 @@
<el-option :key="18" :value="18" label="绉垎杩囨湡"></el-option>
</el-select>
</el-form-item>
- <div class="date-style" style="display: inline">
<el-form-item label="鍙樺姩鏃堕棿" prop="starttime" >
<el-date-picker
style="width: 160px"
@@ -51,7 +50,6 @@
placeholder="鎴鏃堕棿"
></el-date-picker>
</el-form-item>
- </div>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<!--
diff --git a/admin/src/views/business/integralGoods.vue b/admin/src/views/business/integralGoods.vue
index 10f5324..0169b07 100644
--- a/admin/src/views/business/integralGoods.vue
+++ b/admin/src/views/business/integralGoods.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goods:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鍏ㄩ儴鍟嗗搧" name="first"></el-tab-pane>
<el-tab-pane label="宸插敭缃勫晢鍝�" name="second"></el-tab-pane>
diff --git a/admin/src/views/business/integralGoodsorder.vue b/admin/src/views/business/integralGoodsorder.vue
index fc56330..14713a3 100644
--- a/admin/src/views/business/integralGoodsorder.vue
+++ b/admin/src/views/business/integralGoodsorder.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goodsorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<!-- 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
<el-tabs v-model="status" @tab-click="handleClick">
<el-tab-pane label="鍏ㄩ儴璁㈠崟" name="10"></el-tab-pane>
@@ -88,7 +88,7 @@
<el-form-item label="鏀粯鏃堕棿" prop="payDate">
<el-date-picker v-model="searchForm.payDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ敮浠樻椂闂�" @change="search"/>
</el-form-item>
-
+
<el-form-item label="鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯" prop="payMethod">
<el-input v-model="searchForm.payMethod" placeholder="璇疯緭鍏ユ敮浠樻柟寮� 0寰俊鏀粯 1绾夸笅鏀粯" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -188,7 +188,7 @@
<div class="status-message right-border">
<!-- // 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
<div :class="[0,1,2,5].indexOf(item.status) != -1 ? 'underway' : 'complete'">
- {{
+ {{
item.status==0 ? '寰呮敮浠�'
: item.status==1 ? '寰呭彂璐�'
: item.status==2 ? '寰呮敹璐�'
@@ -214,7 +214,7 @@
:data="tableData.list"
stripe
>
-
+
<el-table-column
v-if="containPermissions(['business:goodsorder:update', 'business:goodsorder:delete'])"
label="鎿嶄綔"
@@ -316,14 +316,14 @@
linkphone: '18055151023',
linkaddr: '鍥涘窛鐪佹垚閮藉競閲戠墰鍖猴紝閲戞硥琛楅亾涓捣鍥介檯绀惧尯钃濆哺琛�98鍙锋閮′竴鏈�5-2-504',
price: '2333',
- status: 1,
+ status: 1,
kdCode: 'SF01021213',
kdDate: '2022-11-03 23:30:43',
kdId: 'KD21312',
kdInfo: '杩欐槸鍙戣揣澶囨敞',
kdName: '椤轰赴蹇��',
kdUser: '00190',
-
+
}
]
}
@@ -428,7 +428,7 @@
}
.member-message {
flex: 0.4;
-
+
font-size: 14px;
:last-child {
margin-top: 5px;
diff --git a/admin/src/views/business/inviteRecord.vue b/admin/src/views/business/inviteRecord.vue
index 008fa4a..e0cfb7c 100644
--- a/admin/src/views/business/inviteRecord.vue
+++ b/admin/src/views/business/inviteRecord.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:inviterecord:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="閭�璇蜂汉淇℃伅" prop="recName" >
<el-input v-model="searchForm.recName" placeholder="璇烽個璇蜂汉鏄电О/濮撳悕/鎵嬫満鍙� " clearable @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/labels.vue b/admin/src/views/business/labels.vue
index aff333c..b575e9a 100644
--- a/admin/src/views/business/labels.vue
+++ b/admin/src/views/business/labels.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:labels:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/labelsArea.vue b/admin/src/views/business/labelsArea.vue
index 4856058..b90b263 100644
--- a/admin/src/views/business/labelsArea.vue
+++ b/admin/src/views/business/labelsArea.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:labels:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍖哄煙鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/labelsKnowledge.vue b/admin/src/views/business/labelsKnowledge.vue
index 799733b..673059d 100644
--- a/admin/src/views/business/labelsKnowledge.vue
+++ b/admin/src/views/business/labelsKnowledge.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:labels:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/member.vue b/admin/src/views/business/member.vue
index 569025c..6beccc9 100644
--- a/admin/src/views/business/member.vue
+++ b/admin/src/views/business/member.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢ㄦ埛" prop="nickname">
<el-input v-model="searchForm.nickname" style="width: 160px" placeholder="鏄电О/鎵嬫満鍙�/鐪熷疄濮撳悕" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -15,7 +15,6 @@
<el-form-item label="鍏宠仈缁忛攢鍟�" prop="shopName">
<el-input v-model="searchForm.shopName" style="width: 160px" placeholder="缁忛攢鍟嗗悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <div class="date-style" style="display: inline">
<el-form-item label="鍒涘缓鏃堕棿" prop="starttime" >
<el-date-picker
style="width: 160px"
@@ -38,8 +37,6 @@
placeholder="鎴鏃堕棿"
></el-date-picker>
</el-form-item>
- </div>
-
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index a84dbeb..599eaf1 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:membercoupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢ㄦ埛" prop="nikeName" >
<el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎵嬫満鍙� " clearable @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/notice.vue b/admin/src/views/business/notice.vue
index eade598..5338eff 100644
--- a/admin/src/views/business/notice.vue
+++ b/admin/src/views/business/notice.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:notice:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鏍囬" prop="title">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/orderComment.vue b/admin/src/views/business/orderComment.vue
index 0d1b650..bad557d 100644
--- a/admin/src/views/business/orderComment.vue
+++ b/admin/src/views/business/orderComment.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:ordercomment:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="璇勮鍐呭" prop="content">
<el-input v-model="searchForm.content" placeholder="璇疯緭鍏ヨ瘎璁哄唴瀹�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/orgs.vue b/admin/src/views/business/orgs.vue
index 917a8c2..6c5f0fa 100644
--- a/admin/src/views/business/orgs.vue
+++ b/admin/src/views/business/orgs.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:orgs:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ満鏋勫悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/planGoods.vue b/admin/src/views/business/planGoods.vue
index 4e7a7bd..3f0d723 100644
--- a/admin/src/views/business/planGoods.vue
+++ b/admin/src/views/business/planGoods.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goods:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鍏ㄩ儴鍟嗗搧" name="first"></el-tab-pane>
<el-tab-pane label="宸插敭缃勫晢鍝�" name="second"></el-tab-pane>
diff --git a/admin/src/views/business/planGoodsorder.vue b/admin/src/views/business/planGoodsorder.vue
index 8fe68fc..45c65f4 100644
--- a/admin/src/views/business/planGoodsorder.vue
+++ b/admin/src/views/business/planGoodsorder.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goodsorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<!-- 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
<el-tabs v-model="status" @tab-click="handleClick">
<el-tab-pane label="鍏ㄩ儴璁㈠崟" name="10"></el-tab-pane>
@@ -88,7 +88,7 @@
<el-form-item label="鏀粯鏃堕棿" prop="payDate">
<el-date-picker v-model="searchForm.payDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ敮浠樻椂闂�" @change="search"/>
</el-form-item>
-
+
<el-form-item label="鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯" prop="payMethod">
<el-input v-model="searchForm.payMethod" placeholder="璇疯緭鍏ユ敮浠樻柟寮� 0寰俊鏀粯 1绾夸笅鏀粯" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -188,7 +188,7 @@
<div class="status-message right-border">
<!-- // 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
<div :class="[0,1,2,5].indexOf(item.status) != -1 ? 'underway' : 'complete'">
- {{
+ {{
item.status==0 ? '寰呮敮浠�'
: item.status==1 ? '宸叉敮浠�'
: item.status==2 ? '寰呮敹璐�'
@@ -214,7 +214,7 @@
:data="tableData.list"
stripe
>
-
+
<el-table-column
v-if="containPermissions(['business:goodsorder:update', 'business:goodsorder:delete'])"
label="鎿嶄綔"
@@ -316,14 +316,14 @@
linkphone: '18055151023',
linkaddr: '鍥涘窛鐪佹垚閮藉競閲戠墰鍖猴紝閲戞硥琛楅亾涓捣鍥介檯绀惧尯钃濆哺琛�98鍙锋閮′竴鏈�5-2-504',
price: '2333',
- status: 1,
+ status: 1,
kdCode: 'SF01021213',
kdDate: '2022-11-03 23:30:43',
kdId: 'KD21312',
kdInfo: '杩欐槸鍙戣揣澶囨敞',
kdName: '椤轰赴蹇��',
kdUser: '00190',
-
+
}
]
}
@@ -428,7 +428,7 @@
}
.member-message {
flex: 0.4;
-
+
font-size: 14px;
:last-child {
margin-top: 5px;
diff --git a/admin/src/views/business/platformGoods.vue b/admin/src/views/business/platformGoods.vue
index aa8658a..032b0f2 100644
--- a/admin/src/views/business/platformGoods.vue
+++ b/admin/src/views/business/platformGoods.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goods:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/shop.vue b/admin/src/views/business/shop.vue
index 8a7ad1c..c8eb8c4 100644
--- a/admin/src/views/business/shop.vue
+++ b/admin/src/views/business/shop.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:shop:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/shopApply.vue b/admin/src/views/business/shopApply.vue
index 15ecc55..b790087 100644
--- a/admin/src/views/business/shopApply.vue
+++ b/admin/src/views/business/shopApply.vue
@@ -1,14 +1,14 @@
<template>
<TableLayout :permissions="['business:shopapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢宠浜烘樀绉�" prop="nikeName">
<el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敵璇蜂汉鏄电О" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="搴楅摵鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ簵閾烘樀绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
-
+
<el-form-item label="瀹℃牳鐘舵��" prop="status">
<el-select
v-model="searchForm.type"
diff --git a/admin/src/views/business/shopComment.vue b/admin/src/views/business/shopComment.vue
index 1bec30e..1a6f944 100644
--- a/admin/src/views/business/shopComment.vue
+++ b/admin/src/views/business/shopComment.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:shopcomment:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="璇勮鍐呭" prop="content">
<el-input v-model="searchForm.content" placeholder="璇疯緭鍏ヨ瘎璁哄唴瀹�" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -43,7 +43,7 @@
></el-image>
</template>
</el-table-column>
-
+
<el-table-column prop="score" label="闂ㄥ簵璇勫垎" align="center" min-width="100px"></el-table-column>
<el-table-column prop="envScore" label="搴楀唴鐜" align="center" min-width="100px"></el-table-column>
<el-table-column prop="serviceScore" label="鏈嶅姟鎬佸害" align="center" min-width="100px"></el-table-column>
diff --git a/admin/src/views/business/shopLabels.vue b/admin/src/views/business/shopLabels.vue
index 213a701..e1b5af2 100644
--- a/admin/src/views/business/shopLabels.vue
+++ b/admin/src/views/business/shopLabels.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:labels:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/shopMoney.vue b/admin/src/views/business/shopMoney.vue
index d755f8b..3292f9a 100644
--- a/admin/src/views/business/shopMoney.vue
+++ b/admin/src/views/business/shopMoney.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="缁忛攢鍟嗗悕绉�" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/visiteStore.vue b/admin/src/views/business/visiteStore.vue
index 8dd3b35..afa0561 100644
--- a/admin/src/views/business/visiteStore.vue
+++ b/admin/src/views/business/visiteStore.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:activity:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鎺㈠簵鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帰搴楀悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/business/withdrawRecord.vue b/admin/src/views/business/withdrawRecord.vue
index 3e37802..45d9fe7 100644
--- a/admin/src/views/business/withdrawRecord.vue
+++ b/admin/src/views/business/withdrawRecord.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:withdrawrecord:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="缁忛攢鍟�" prop="shopName">
<el-input v-model="searchForm.shopName" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/system/data-permission.vue b/admin/src/views/system/data-permission.vue
index 9d68d0a..74dc26c 100644
--- a/admin/src/views/system/data-permission.vue
+++ b/admin/src/views/system/data-permission.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:datapermission:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="涓氬姟妯″潡" prop="businessCode">
<DataPermModuleSelect v-model="searchForm.businessCode" clearable @change="search"/>
</el-form-item>
diff --git a/admin/src/views/system/dict.vue b/admin/src/views/system/dict.vue
index bdea152..4686691 100644
--- a/admin/src/views/system/dict.vue
+++ b/admin/src/views/system/dict.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:dict:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="瀛楀吀缂栫爜" prop="code">
<el-input v-model="searchForm.code" v-trim placeholder="璇疯緭鍏ュ瓧鍏哥紪鐮�" @keypress.enter.native="search"/>
</el-form-item>
diff --git a/admin/src/views/system/loginLog.vue b/admin/src/views/system/loginLog.vue
index 358eb77..0c2a57b 100644
--- a/admin/src/views/system/loginLog.vue
+++ b/admin/src/views/system/loginLog.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:loginLog:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐧诲綍鐢ㄦ埛鍚�" prop="loginUsername">
<el-input v-model="searchForm.loginUsername" placeholder="璇疯緭鍏ョ櫥褰曠敤鎴峰悕" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/system/permission.vue b/admin/src/views/system/permission.vue
index 15a59dd..0360c36 100644
--- a/admin/src/views/system/permission.vue
+++ b/admin/src/views/system/permission.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:permission:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鏉冮檺缂栫爜" prop="code">
<el-input v-model="searchForm.code" v-trim placeholder="璇疯緭鍏ユ潈闄愮紪鐮�" @keypress.enter.native="search"/>
</el-form-item>
diff --git a/admin/src/views/system/role.vue b/admin/src/views/system/role.vue
index 7b91aa0..06f0ba3 100644
--- a/admin/src/views/system/role.vue
+++ b/admin/src/views/system/role.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:role:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="瑙掕壊缂栫爜" prop="code">
<el-input v-model="searchForm.code" v-trim placeholder="璇疯緭鍏ヨ鑹茬紪鐮�" @keypress.enter.native="search"/>
</el-form-item>
diff --git a/admin/src/views/system/traceLog.vue b/admin/src/views/system/traceLog.vue
index 50509b2..b16c0b1 100644
--- a/admin/src/views/system/traceLog.vue
+++ b/admin/src/views/system/traceLog.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:traceLog:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鐢ㄦ埛濮撳悕" prop="userRealname">
<el-input v-model="searchForm.userRealname" placeholder="璇疯緭鍏ュ浐鍖栫敤鎴峰鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index a6592f7..dc5a2d0 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['system:user:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" >
<el-form-item label="鐢ㄦ埛鍚�" prop="username">
<el-input v-model="searchForm.username" v-trim placeholder="璇疯緭鍏ョ敤鎴峰悕" @keypress.enter.native="search"/>
</el-form-item>
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Banner.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Banner.java
index cc24bb9..d42c413 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Banner.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Banner.java
@@ -73,8 +73,8 @@
@ExcelColumn(name="璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼 2娲诲姩 3鍟嗗")
private Integer type;
- @ApiModelProperty(value = "浣嶇疆 0棣栭〉 1鎺ㄨ崘搴楅摵 2鍟嗗煄棣栭〉", example = "1")
- @ExcelColumn(name="浣嶇疆 0棣栭〉 1鎺ㄨ崘搴楅摵 2鍟嗗煄棣栭〉")
+ @ApiModelProperty(value = "浣嶇疆 0棣栭〉 1鎺ㄨ崘搴楅摵 2鍟嗗煄棣栭〉 3棣栭〉涓撳尯", example = "1")
+ @ExcelColumn(name="浣嶇疆 0棣栭〉 1鎺ㄨ崘搴楅摵 2鍟嗗煄棣栭〉3棣栭〉涓撳尯")
private Integer position;
@ApiModelProperty(value = "鎵�灞炲煄甯傜紪鐮侊紙鍏宠仈areas)", example = "1")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index 1335c8a..c427c62 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -212,6 +212,9 @@
@ApiModelProperty(value = "shopId" )
@TableField(exist = false)
private Integer shopId;
+ @ApiModelProperty(value = "涓撳尯缂栫爜" )
+ @TableField(exist = false)
+ private Integer zhuanquId;
@ApiModelProperty(value = "鍟嗗渚涜揣浠�" )
@TableField(exist = false)
private BigDecimal shopPrice;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
index 6621694..201cab7 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
@@ -119,5 +119,8 @@
@ApiModelProperty(value = "鍒嗙被锛氫竴绾у垎绫�0锛屼簩绾у垎绫�1")
@TableField(exist = false)
private Integer typeLevel;
+ @ApiModelProperty(value = "鍟嗗搧闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> applyIdList;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 05486e9..9801ba2 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -841,8 +841,9 @@
public List<Goods> findList(Goods goods) {
QueryWrapper<Goods> wrapper = new QueryWrapper<>(goods);
wrapper.lambda()
- .in(goods.getIdList() != null && goods.getIdList().size()>0, Goods::getId, goods.getIdList())
- .eq( Goods::getIsdeleted, Constants.ZERO);
+ .in(goods.getIdList() != null && goods.getIdList().size()>0, Goods::getId, goods.getIdList())
+ .like(goods.getZhuanquId()!=null,Goods::getZhuanquIds,"["+goods.getZhuanquId()+"]")
+ .eq( Goods::getIsdeleted, Constants.ZERO);
return goodsMapper.selectList(wrapper);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index 5e1f2c8..358916f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -10,6 +10,8 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.AreasMapper;
+import com.doumee.dao.business.GoodsMapper;
+import com.doumee.dao.business.GoodsorderMapper;
import com.doumee.dao.business.LabelsMapper;
import com.doumee.dao.business.join.GoodsAdminJoinMapper;
import com.doumee.dao.business.join.LabelsJoinMapper;
@@ -62,7 +64,7 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private GoodsAdminJoinMapper goodsAdminJoinMapper;
+ private GoodsMapper goodsMapper;
@Override
@Transactional
@@ -91,6 +93,18 @@
.in(Constants.equalsInteger(labels.getType(),Constants.LabelsType.YUN_FEE.getKey()),Areas::getId,labels.getAreaIdList())
.in(Constants.equalsInteger(labels.getType(),Constants.LabelsType.BIG_AREA.getKey()),Areas::getId,labels.getAreaIdList()));
areasService.cacheData();
+ }
+ if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.HOMEZHUANQU.getKey())){
+ String ids = "["+labels.getId()+"],";
+// goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
+// .setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
+ if( labels.getApplyIdList()!=null){
+ labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
+// List<Goods> goods = goodsMapper.selectList(new QueryWrapper<Goods>().lambda().in(Goods::getId,labels.getApplyIdList() ));
+ goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
+ .setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
+ .in(Goods::getId,labels.getApplyIdList() ));
+ }
}
return labels.getId();
}
@@ -205,6 +219,17 @@
areasService.cacheData();
}
}
+ if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.HOMEZHUANQU.getKey())){
+ String ids = "["+labels.getId()+"],";
+ goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
+ .setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
+ if( labels.getApplyIdList()!=null){
+ labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
+ goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
+ .setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
+ .in(Goods::getId,labels.getApplyIdList() ));
+ }
+ }
}
--
Gitblit v1.9.3