From d60a51e8bffc5f521e5acff4dca944b782522469 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Fri, 6 Dec 2024 14:40:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/repair/tickets/Components/TicketItem.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/repair/tickets/Components/TicketItem.vue b/src/views/repair/tickets/Components/TicketItem.vue index a9f5052..84c6529 100644 --- a/src/views/repair/tickets/Components/TicketItem.vue +++ b/src/views/repair/tickets/Components/TicketItem.vue @@ -75,12 +75,12 @@ {{ scope.row.sale ? scope.row.sale.name : scope.row.sale }} - - - - - - + +
+ + {{ scope.row.type }} +
+ From 255e34123fb25dd5f45577a2e5a4047dc6a9e920 Mon Sep 17 00:00:00 2001 From: PQZ Date: Mon, 9 Dec 2024 17:17:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/cont/form/ContTempForm.vue | 14 +++++++++----- src/views/base/cont/index.vue | 2 +- .../company/property/position/PropertyPosForm.vue | 2 -- src/views/company/property/position/index.vue | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/views/base/cont/form/ContTempForm.vue b/src/views/base/cont/form/ContTempForm.vue index df719b6..dcad81c 100644 --- a/src/views/base/cont/form/ContTempForm.vue +++ b/src/views/base/cont/form/ContTempForm.vue @@ -88,7 +88,9 @@ export default { }, methods: { close(){ - this.$router.go(-1); + this.$router.push({ + name: "BaseContTemp", + }); }, /** 打开弹窗 */ async open(id) { @@ -106,7 +108,6 @@ export default { }, /** 提交按钮 */ async submitForm() { - debugger // 校验主表 await this.$refs["formRef"].validate(); this.formLoading = true; @@ -116,13 +117,17 @@ export default { if (data.id) { await ContTempApi.updateContTemp(data); this.$modal.msgSuccess("修改成功"); - this.$router.go(-1); + await this.$router.push({ + name: "BaseContTemp", + }); return; } // 添加的提交 await ContTempApi.createContTemp(data); this.$modal.msgSuccess("新增成功"); - this.$router.go(-1); + await this.$router.push({ + name: "BaseContTemp", + }); } finally { this.formLoading = false; } @@ -139,7 +144,6 @@ export default { status: undefined, tempContent: undefined, }; - debugger this.resetForm("formRef"); } } diff --git a/src/views/base/cont/index.vue b/src/views/base/cont/index.vue index 75a5d4c..4633ef7 100644 --- a/src/views/base/cont/index.vue +++ b/src/views/base/cont/index.vue @@ -91,7 +91,7 @@ import * as ContTempApi from '@/api/base/cont'; export default { - name: "ContTemp", + name: "BaseContTemp", components: { }, data() { diff --git a/src/views/company/property/position/PropertyPosForm.vue b/src/views/company/property/position/PropertyPosForm.vue index 0c41a20..f0b8c64 100644 --- a/src/views/company/property/position/PropertyPosForm.vue +++ b/src/views/company/property/position/PropertyPosForm.vue @@ -67,8 +67,6 @@ export default { formRules: { posName: [{ required: true, message: '存放地名称不能为空', trigger: 'blur' }], depositType: [{ required: true, message: '存放类型不能为空', trigger: 'blur' }], - area: [{ required: true, message: '面积不能为空', trigger: 'blur' }], - address: [{ required: true, message: '存放地地址不能为空', trigger: 'blur' }], }, }; }, diff --git a/src/views/company/property/position/index.vue b/src/views/company/property/position/index.vue index 0d9f077..1230d8b 100644 --- a/src/views/company/property/position/index.vue +++ b/src/views/company/property/position/index.vue @@ -36,7 +36,7 @@ }} - + From 106983e8a2fcd7e331e87644e63645028ade2918 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Wed, 11 Dec 2024 12:00:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/partner/workOrder.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue index 61de544..7708537 100644 --- a/src/views/partner/workOrder.vue +++ b/src/views/partner/workOrder.vue @@ -314,7 +314,7 @@ - + @@ -350,6 +350,9 @@ > + + + Date: Fri, 13 Dec 2024 18:13:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A5=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectionGoods/index.vue | 2 +- .../shopadministration/shopadministration.vue | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/inspection/inspectionGoods/index.vue b/src/views/inspection/inspectionGoods/index.vue index e55854b..6508576 100644 --- a/src/views/inspection/inspectionGoods/index.vue +++ b/src/views/inspection/inspectionGoods/index.vue @@ -432,7 +432,7 @@ listInspectionGoods(this.queryParams).then(response => { this.inspectionGoodsList = response.data.records; this.inspectionGoodsList.price=this.inspectionGoodsList.price / 100 - this.total = response.total; + this.total = response.data.total; this.loading = false; }); listMallPartners(this.hzsarr).then(response => { diff --git a/src/views/partner/shopadministration/shopadministration.vue b/src/views/partner/shopadministration/shopadministration.vue index c112288..9002cb5 100644 --- a/src/views/partner/shopadministration/shopadministration.vue +++ b/src/views/partner/shopadministration/shopadministration.vue @@ -206,7 +206,13 @@ - + { this.categoryList = res.data; + this.typeLoading = false }) - // listMallPartners(this.hzsarr).then(response => { // this.mallPartnersList = response.rows; // console.log('查询合作商管理列表 ',this.mallPartnersList) @@ -532,6 +539,7 @@ }, /** 重置按钮操作 */ resetQuery() { + this.queryParams.isListing = null this.resetForm("queryForm"); this.handleQuery(); },