From 21c7a5cf169657835b45668fee59ddf50ca13e67 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 16:17:29 +0800
Subject: [PATCH] 经销商管理
---
admin/src/views/business/bannerZhuanqu.vue | 2 +-
admin/src/components/business/OperaCreationApproveWindow.vue | 7 +++----
admin/src/components/business/OperaShopApproveWindow.vue | 7 +++----
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 9 +++++++++
admin/src/components/business/OperaPlatformGoodsSkuWindow.vue | 9 ++++-----
admin/src/views/business/platformGoods.vue | 9 +++++----
admin/src/components/business/OperaCreationWindow.vue | 1 -
admin/src/views/business/creationApply.vue | 5 ++---
admin/src/components/business/OperaBannerZhuanquWindow.vue | 1 -
9 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/admin/src/components/business/OperaBannerZhuanquWindow.vue b/admin/src/components/business/OperaBannerZhuanquWindow.vue
index 732677b..a607185 100644
--- a/admin/src/components/business/OperaBannerZhuanquWindow.vue
+++ b/admin/src/components/business/OperaBannerZhuanquWindow.vue
@@ -70,7 +70,6 @@
components: { GlobalAlertWindow, UploadAvatarImage },
data () {
let positionRule = (rule, value, callBack) => {
- debugger
if (!value) {
callBack(new Error(rule.message))
} else {
diff --git a/admin/src/components/business/OperaCreationApproveWindow.vue b/admin/src/components/business/OperaCreationApproveWindow.vue
index 68abd6d..33c19f4 100644
--- a/admin/src/components/business/OperaCreationApproveWindow.vue
+++ b/admin/src/components/business/OperaCreationApproveWindow.vue
@@ -15,7 +15,7 @@
v-trim
/>
</el-form-item>
-
+
</el-form>
</GlobalAlertWindow>
</template>
@@ -29,7 +29,6 @@
components: { GlobalAlertWindow },
data () {
let rule = (rule, value, callBack) => {
- debugger
console.log(rule, value);
callBack()
}
@@ -39,10 +38,10 @@
id: null,
mark: '',
},
-
+
// 楠岃瘉瑙勫垯
rules: {
-
+
mark: [
{ required: true, message: '璇疯緭鍏ュ唴瀹�', tigger: 'blur' }
]
diff --git a/admin/src/components/business/OperaCreationWindow.vue b/admin/src/components/business/OperaCreationWindow.vue
index e71c871..465d0cf 100644
--- a/admin/src/components/business/OperaCreationWindow.vue
+++ b/admin/src/components/business/OperaCreationWindow.vue
@@ -176,7 +176,6 @@
},
methods: {
open (title, target) {
- debugger
this.title = title
this.visible = true
this.cities = []
diff --git a/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue b/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
index 0601932..a349d59 100644
--- a/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
+++ b/admin/src/components/business/OperaPlatformGoodsSkuWindow.vue
@@ -5,6 +5,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
+ <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
<div class="title-style"><div>SKU閰嶇疆</div><div class="btn" @click="addSku">娣诲姞瑙勬牸</div></div>
<el-table
:data="skiuList"
@@ -32,7 +33,7 @@
<template slot-scope="scope">
<!-- skiuList.splice(scope.$index, 1) -->
<el-button slot="append" @click="deleteSku(scope.$index)">X</el-button>
-
+
</template>
</el-table-column>
</el-table>
@@ -75,6 +76,7 @@
</template>
</el-table-column>
</el-table>
+ </el-form>
</GlobalWindow>
</template>
@@ -181,7 +183,6 @@
}
return newItem
})
- debugger
} else {
let tempAttr = [...attr]
attr = []
@@ -202,10 +203,8 @@
}
}
}
-
this.skuAttr = attr
},
-
uploadSuccess(file, row) {
row.imgurlfull=file.imgurlfull
row.imgurl=file.imgurl
@@ -219,7 +218,7 @@
font-weight: 500;
font-size: 20px;
height: 20px;
-
+
line-height: 20px;
vertical-align: middle;
margin-bottom: 20px;
diff --git a/admin/src/components/business/OperaShopApproveWindow.vue b/admin/src/components/business/OperaShopApproveWindow.vue
index ad9a044..ea76fab 100644
--- a/admin/src/components/business/OperaShopApproveWindow.vue
+++ b/admin/src/components/business/OperaShopApproveWindow.vue
@@ -15,7 +15,7 @@
v-trim
/>
</el-form-item>
-
+
</el-form>
</GlobalAlertWindow>
</template>
@@ -30,7 +30,6 @@
components: { GlobalAlertWindow },
data () {
let rule = (rule, value, callBack) => {
- debugger
console.log(rule, value);
callBack()
}
@@ -42,10 +41,10 @@
mark: '',
},
-
+
// 楠岃瘉瑙勫垯
rules: {
-
+
mark: [
{ required: true, message: '璇疯緭鍏ュ唴瀹�', tigger: 'blur' }
]
diff --git a/admin/src/views/business/bannerZhuanqu.vue b/admin/src/views/business/bannerZhuanqu.vue
index ce79151..bb08784 100644
--- a/admin/src/views/business/bannerZhuanqu.vue
+++ b/admin/src/views/business/bannerZhuanqu.vue
@@ -19,7 +19,7 @@
</template>
</el-table-column>
<el-table-column prop="parentName" label="涓撳尯鍚嶇О" align="center" min-width="140px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="goodsName" label="鍏宠仈浜у搧" align="center" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="goodsNum" label="鍏宠仈浜у搧鏁�" align="center" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
<el-table-column
diff --git a/admin/src/views/business/creationApply.vue b/admin/src/views/business/creationApply.vue
index 3e655cb..6c11298 100644
--- a/admin/src/views/business/creationApply.vue
+++ b/admin/src/views/business/creationApply.vue
@@ -5,7 +5,7 @@
<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="status">
<el-select
v-model="searchForm.type"
@@ -15,7 +15,7 @@
<el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.label"></el-option>
</el-select>
</el-form-item>
-
+
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -148,7 +148,6 @@
approveAgree(id) {
this.$dialog.messageApprove('纭畾閫氳繃瀹℃牳锛�')
.then(() => {
- debugger
})
},
approveRefuse(id) {
diff --git a/admin/src/views/business/platformGoods.vue b/admin/src/views/business/platformGoods.vue
index 17c21ec..d425ab0 100644
--- a/admin/src/views/business/platformGoods.vue
+++ b/admin/src/views/business/platformGoods.vue
@@ -87,6 +87,8 @@
<template slot-scope="{row}">
<el-switch
v-model="row.status"
+ :active-value="1"
+ :inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
@change="statusChange(row)"
@@ -98,7 +100,6 @@
<el-table-column prop="labels" label="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑" min-width="100px"></el-table-column> -->
<!-- v-if="containPermissions(['business:goods:update', 'business:goods:delete'])" -->
<el-table-column
-
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -189,7 +190,7 @@
'field.main': 'id'
})
this.search()
-
+
labelList({
capacity: 999,
model: {
@@ -214,7 +215,7 @@
},
/**
- *
+ *
* @param {涓婁笅鐘舵�亇 status 0涓婃灦 1涓嬫灦
*/
issued(status) {
@@ -228,7 +229,7 @@
})
},
-
+
statusChange(row) {
updateById(row)
.then(() => {
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 c3ed94b..240d1c2 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
@@ -113,6 +113,15 @@
@ApiModelProperty(value = "鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@ExcelColumn(name="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
private String labels;
+ @ApiModelProperty(value = "鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+ private String zhuanquIds;
+ @ApiModelProperty(value = "閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+ private String brandIds;
+ @ApiModelProperty(value = "閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+ private String serialIds;
@ApiModelProperty(value = "涓�绾у垎绫�")
@ExcelColumn(name="涓�绾у垎绫�")
--
Gitblit v1.9.3