From d9a8f124a1448a1ddbfb74de317fb17b1f69a34d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 20 Nov 2024 18:00:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/operation/claimstatement/claimstatement.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue b/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue index f4b3ed8d65..44da1281d5 100644 --- a/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue +++ b/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue @@ -339,7 +339,8 @@ export default { auditDateEnd: '', invoiceState: '', adjustState: '', - createBySid: '', + menuUrl: '', + userSid: '', orgPath: '' } }, @@ -426,7 +427,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.menuUrl = this.$route.path this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') req.listPage(this.listQuery).then((response) => { this.listLoading = false @@ -465,7 +467,8 @@ export default { auditDateEnd: '', invoiceState: '', adjustState: '', - createBySid: '', + menuUrl: '', + userSid: '', orgPath: '' } } From 36af5b2cb5e8e162f821ba944dcb4881355e1a4b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 20 Nov 2024 18:03:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/operation/repairbill/repairbillAdd.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index c6fe59a5ba..5267960dc4 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -47,8 +47,8 @@ -
索赔厂家及类型
- +
*索赔厂家及类型
+
@@ -636,6 +636,15 @@ export default { selectCustomer }, data() { + const claimManufacturerShClaimType = (rule, value, callback) => { + if (value === '' || value === null) { + callback(new Error('索赔厂家及类型不能为空')) + } else if ((this.formobj.claimManufacturer === '' || this.formobj.shClaimTypeValue === '') && this.formobj.subject === '保内') { + callback(new Error('索赔厂家及类型不能为空')) + } else { + callback() + } + } return { viewTitle: '', viewState: 1, @@ -821,6 +830,7 @@ export default { waitorName: [{ required: true, message: '服务顾问不能为空', trigger: 'change' }], isSpecialSign: [{ required: true, message: '特殊标志不能为空', trigger: 'change' }], customerName: [{ required: true, message: '客户信息不能为空', trigger: 'change' }], + claimManufacturerAndShClaimType: [{ required: true, validator: claimManufacturerShClaimType, trigger: 'change' }], 'settleVo.payerName': [{ required: true, message: '付款人姓名不能为空', trigger: 'blur' }], 'settleVo.settleValue': [{ required: true, message: '结算方式不能为空', trigger: 'change' }], 'settleVo.settleAmount': [{ required: true, message: '结算金额不能为空', trigger: 'blur' }], From 09f7a46c73eabd2fbdf8ed3f842a1a52430a967b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 21 Nov 2024 10:05:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/operation/claimbilling/claimbillingAdd.vue | 4 +++- .../src/views/operation/claimbilling/claimbillingInfo.vue | 3 ++- .../views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue | 3 ++- .../src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue | 4 +++- .../views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue index 6de0ddc052..31323c38ed 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue @@ -62,9 +62,10 @@ - + + @@ -314,6 +315,7 @@ export default { repairBillNo: e.billNo, vehMark: e.vehMark, vinNo: e.vinNo, + claimManufacturer: e.claimManufacturer, claimHourAmount: e.claimHourAmount, claimGoodsAmount: e.claimGoodsAmount, claimOutAmount: e.claimOutAmount, diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue index fa65b1316f..ab15c234f6 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue @@ -53,9 +53,10 @@ - + + diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue index ae3f0cadcd..8891a76753 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue @@ -56,9 +56,10 @@ - + + diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue index 181867a0e9..a9b599590e 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue @@ -61,9 +61,10 @@ - + + @@ -295,6 +296,7 @@ export default { repairBillNo: e.billNo, vehMark: e.vehMark, vinNo: e.vinNo, + claimManufacturer: e.claimManufacturer, claimHourAmount: e.claimHourAmount, claimGoodsAmount: e.claimGoodsAmount, claimOutAmount: e.claimOutAmount, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue index 54a13c46bd..4eaf082dbb 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue @@ -53,9 +53,10 @@ - + + From 301a042b2d11ebce24e6d04e06bba09082e71b27 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 21 Nov 2024 10:12:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue | 1 + .../src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue index 31323c38ed..b288a5db2d 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue @@ -320,6 +320,7 @@ export default { claimGoodsAmount: e.claimGoodsAmount, claimOutAmount: e.claimOutAmount, claimSubsidyAmount: e.claimSubsidyAmount, + claimRescueAmount: e.claimRescueAmount, claimOtherAmount: e.claimOtherAmount, remarks: '', isUnanimous: e.isUnanimous diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue index a9b599590e..39715e92dd 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue @@ -301,6 +301,7 @@ export default { claimGoodsAmount: e.claimGoodsAmount, claimOutAmount: e.claimOutAmount, claimSubsidyAmount: e.claimSubsidyAmount, + claimRescueAmount: e.claimRescueAmount, claimOtherAmount: e.claimOtherAmount, remarks: '', isUnanimous: e.isUnanimous From 9902baae43843a0536df5a673a8945285da3e16e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 21 Nov 2024 10:36:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=9D=E5=A4=96?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/workorderinvoicing/workorderinvoicingAdd.vue | 3 +++ .../operation/workorderinvoicing/workorderinvoicingInfo.vue | 2 ++ .../workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue | 2 ++ .../workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue | 3 +++ .../workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue | 2 ++ 5 files changed, 12 insertions(+) diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue index 339c540cdf..30ab95211c 100644 --- a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue +++ b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue @@ -65,6 +65,8 @@ + + @@ -214,6 +216,7 @@ export default { customerName: e.customerName, vehMark: e.vehMark, vinNo: e.vinNo, + taxItems: e.taxItems, settleTime: e.entryTime, hourAmount: e.hourAmount, goodsAmount: e.goodsAmount, diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue index 632ef412d8..4b69d19d18 100644 --- a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue +++ b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue @@ -55,6 +55,8 @@ + + diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue index 14aa6f302a..0e45b213b2 100644 --- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue @@ -59,6 +59,8 @@ + + diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue index 5a85ad851f..5d4cc0dca1 100644 --- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue @@ -64,6 +64,8 @@ + + @@ -211,6 +213,7 @@ export default { customerName: e.customerName, vehMark: e.vehMark, vinNo: e.vinNo, + taxItems: e.taxItems, settleTime: e.entryTime, hourAmount: e.hourAmount, goodsAmount: e.goodsAmount, diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue index 689296d9d1..b2ae485de2 100644 --- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue @@ -56,6 +56,8 @@ + + From 8f3d68b3724221193b415f7993c4dc38843eb888 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 21 Nov 2024 10:39:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/operation/claimbilling/claimbilling.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue index 192a62683c..a53d457704 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue @@ -168,7 +168,8 @@ export default { closeDateEnd: '', invoiceName: '', invoiceValue: '', - createBySid: '', + menuUrl: '', + userSid: '', orgPath: '' } } @@ -254,7 +255,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.menuUrl = this.$route.path this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') req.listPage(this.listQuery).then((response) => { this.listLoading = false @@ -289,7 +291,8 @@ export default { closeDateEnd: '', invoiceName: '', invoiceValue: '', - createBySid: '', + menuUrl: '', + userSid: '', orgPath: '' } }