From 6fa449bd9812dfa946cccd4cf2186261dcea4847 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 23 May 2023 15:14:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 10 ++++++++-- .../paichanguanli/cheliangpaichanEdit.vue | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index 83260557b2..e1630c1259 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -158,9 +158,10 @@ - + @@ -559,6 +560,11 @@ export default { this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' }) return } + if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') { + var aa = i + 1 + this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型含自卸或载货，则备注不能为空' }) + return + } } } this.getUrl() diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index fc9b94c07f..c09348f2ec 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -157,9 +157,10 @@ - + @@ -542,6 +543,11 @@ export default { this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' }) return } + if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') { + var aa = i + 1 + this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型含自卸或载货，则备注不能为空' }) + return + } } } this.getUrl() From 3c3588787628a6d531fad201415a5c75ad0c5a49 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 23 May 2023 15:29:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 2 +- .../paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index e1630c1259..8da37b9afb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -562,7 +562,7 @@ export default { } if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') { var aa = i + 1 - this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型含自卸或载货，则备注不能为空' }) + this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型为自卸或载货，则备注不能为空' }) return } } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index c09348f2ec..93dbb83dcd 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -545,7 +545,7 @@ export default { } if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') { var aa = i + 1 - this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型含自卸或载货，则备注不能为空' }) + this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型为自卸或载货，则备注不能为空' }) return } } From 926f4675da96240fcfd71a5434ec80ac101118cf Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 23 May 2023 15:40:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue index d7bacf52e8..111e83846f 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue @@ -43,10 +43,10 @@ - *注册地址 + 注册地址 - + @@ -59,7 +59,7 @@ - +