From b42740b83b7cbe8e7a639e261cecc512d5e10b01 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Dec 2024 09:15:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fukuanshenqing/paymentAdd.vue | 29 ++++++++++++------- .../fukuanguanli/fukuanEdit.vue | 27 +++++++++++------ 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index 0cff867deb..0255349081 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -28,8 +28,8 @@ -
品牌
- +
*品牌
+ @@ -53,7 +53,7 @@
*是否涉及车辆
- + 是 否 @@ -63,8 +63,8 @@ -
付款单位
- +
*付款单位
+ @@ -78,7 +78,7 @@
*是否事业部领导审批
- + 是 否 @@ -313,7 +313,12 @@ export default { detailsList: [], vehicleList: [] }, - rules: {}, + rules: { + carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }], + isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }], + payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }], + isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }] + }, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏 paymentInformation: { // 关联付款信息列表 @@ -657,9 +662,13 @@ export default { }) }, submitVehicleApply() { - if (this.formobj.isVeh === '') { - this.$message({ showClose: true, type: 'error', message: '是否涉及车辆请选择是或否' }) - return + if (this.formobj.vehicleList.length > 0) { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } + } } this.$refs['form_obj'].validate((valid) => { if (valid) { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue index 2db504dda0..99063112d7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue @@ -28,7 +28,7 @@
品牌
- + @@ -52,7 +52,7 @@
*是否涉及车辆
- + 是 否 @@ -62,8 +62,8 @@ -
付款单位
- +
*付款单位
+ @@ -77,7 +77,7 @@
*是否事业部领导审批
- + 是 否 @@ -312,7 +312,12 @@ export default { detailsList: [], vehicleList: [] }, - rules: {}, + rules: { + carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }], + isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }], + payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }], + isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }] + }, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏 paymentInformation: { // 关联付款信息列表 @@ -655,9 +660,13 @@ export default { }) }, submitVehicleApply() { - if (this.formobj.isVeh === '') { - this.$message({ showClose: true, type: 'error', message: '是否涉及车辆请选择是或否' }) - return + if (this.formobj.vehicleList.length > 0) { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } + } } this.$refs['form_obj'].validate((valid) => { if (valid) { From f9dc84bab8c64c0cdc3662b54b2650234245bba6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Dec 2024 09:33:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fukuanshenqing/paymentAdd.vue | 32 ++++++++++++++++--- .../fukuanguanli/fukuanEdit.vue | 32 ++++++++++++++++--- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index 0255349081..b561430a19 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -645,6 +645,19 @@ export default { } }, saveOrUpdate() { + if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') { + if (this.formobj.vehicleList.length === 0) { + this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' }) + return + } else { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } + } + } + } this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -652,6 +665,8 @@ export default { if (resp.success) { this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -662,11 +677,16 @@ export default { }) }, submitVehicleApply() { - if (this.formobj.vehicleList.length > 0) { - for (var i = 0; i < this.formobj.vehicleList.length; i++) { - if (this.formobj.vehicleList[i].isSettle === '') { - this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) - return + if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') { + if (this.formobj.vehicleList.length === 0) { + this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' }) + return + } else { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } } } } @@ -677,6 +697,8 @@ export default { if (resp.success) { this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue index 99063112d7..432741862a 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue @@ -636,6 +636,19 @@ export default { } }, saveOrUpdate() { + if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') { + if (this.formobj.vehicleList.length === 0) { + this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' }) + return + } else { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } + } + } + } this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -650,6 +663,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -660,11 +675,16 @@ export default { }) }, submitVehicleApply() { - if (this.formobj.vehicleList.length > 0) { - for (var i = 0; i < this.formobj.vehicleList.length; i++) { - if (this.formobj.vehicleList[i].isSettle === '') { - this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) - return + if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') { + if (this.formobj.vehicleList.length === 0) { + this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' }) + return + } else { + for (var i = 0; i < this.formobj.vehicleList.length; i++) { + if (this.formobj.vehicleList[i].isSettle === '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' }) + return + } } } } @@ -682,6 +702,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false From d734bdec798e600dace8bfca7ae5389c428b0932 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Dec 2024 10:42:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/anruifinmanagement/fukuanshenqing/paymentAdd.vue | 6 +++--- .../fukuanshenqing/relation/paymentInformationAdd.vue | 4 ++-- .../workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue | 6 +++--- .../fukuanguanli/relation/paymentInformationAdd.vue | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index b561430a19..2e1c755aed 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -95,7 +95,7 @@ @@ -253,7 +253,7 @@