From 9cf7491e8c5bca1b986efe447451952272827e4f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 6 Jun 2024 15:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E5=8C=85?= =?UTF-8?q?=E5=8F=8A=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/allocation/allocationList.vue | 14 +- src/views/materialPackage/materialPackage.vue | 57 ++++--- src/views/members/memberDetails.vue | 146 +++++++++++------- 3 files changed, 135 insertions(+), 82 deletions(-) diff --git a/src/views/allocation/allocationList.vue b/src/views/allocation/allocationList.vue index 3ab6e3c..7ca052e 100644 --- a/src/views/allocation/allocationList.vue +++ b/src/views/allocation/allocationList.vue @@ -318,8 +318,7 @@
请选择服务类型：
- - +
@@ -628,7 +627,7 @@ export default { latitude: '', //经度 address: '', serverList: [], - serverValue: "中医推拿", + serverValue: "", ruleForm: { id: "", grade: "", @@ -666,9 +665,7 @@ export default { 'limit': 100, 'parentId': 22, }) - }).then(({ - data - }) => { + }).then(({ data }) => { if (data && data.code === 0) { this.serverList = data.page.list; } @@ -760,10 +757,13 @@ export default { this.tableDataLoading = true; console.log(this.condition, "12312hhh"); console.log(this.serverValue); + // if(!this.serverValue){ + // this.serverValue = '91' + // } this.tableData = []; this.$http({ // type服务类型 1精油2中医推拿 - url: this.$http.adornUrl(`common/fcmx/` + (this.serverValue == "中医推拿" ? 95 : 91)), + url: this.$http.adornUrl(`common/fcmx/` + (this.serverValue?this.serverValue:'91')), method: 'get', }).then(({ data diff --git a/src/views/materialPackage/materialPackage.vue b/src/views/materialPackage/materialPackage.vue index 548182a..74d81a5 100644 --- a/src/views/materialPackage/materialPackage.vue +++ b/src/views/materialPackage/materialPackage.vue @@ -22,11 +22,11 @@ >  
- 项目名称： + 物料包名称： { - if (data.data.code == 0) { + console.log(`🚀 ~ deleteMaterialPackage ~ data:`, data) + + if (data.code == 0) { this.$message({ message: "删除成功", type: "success", @@ -485,12 +479,29 @@ export default { this.$notify({ title: "提示", duration: 1800, - message: data.data.msg, + message: data.msg, type: "warning", }); } }); }, + + getDictOptions() { + this.$http({ + url: this.$http.adornUrl('sys/dict/list'), + method: 'get', + params: this.$http.adornParams({ + 'page': 1, + 'limit': 100, + 'parentId': 22, + }) + }).then(({ data }) => { + console.log(`🚀 ~ getDictOptions ~ data:`, data) + if (data && data.code === 0) { + this.materialPackageType = data.page.list; + } + }) + }, closeTag() { this.addMaterialPackageTag.goodsName = ""; this.addMaterialPackageTag.goodsId = ""; @@ -532,15 +543,15 @@ export default { }); return; } - if (!this.addMaterialPackageTag.goodsId) { - this.$notify({ - title: "提示", - duration: 1800, - message: "请选择商城商品", - type: "warning", - }); - return; - } + // if (!this.addMaterialPackageTag.goodsId) { + // this.$notify({ + // title: "提示", + // duration: 1800, + // message: "请选择商城商品", + // type: "warning", + // }); + // return; + // } this.$http({ url: this.$http.adornUrl( this.submitStatus == 0 ? "material/insert" : "material/update" @@ -613,6 +624,7 @@ export default { resetSearch() { this.classifyId = null; this.projectName = ""; + this.searchDataList(); }, searchDataList() { this.getMaterialPackageDataList(); @@ -840,6 +852,7 @@ export default { if (userId) this.userId = userId; this.getMaterialPackageDataList(); this.getShopDataList(); + this.getDictOptions(); }, }; diff --git a/src/views/members/memberDetails.vue b/src/views/members/memberDetails.vue index 23d2faa..ca6f072 100644 --- a/src/views/members/memberDetails.vue +++ b/src/views/members/memberDetails.vue @@ -9,19 +9,30 @@ + + + + + + + + - - -