From f0107b2a6ce68a03c8c7d3fa9541c540552ed9bb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 12 Nov 2024 17:15:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?11/12=20=E9=80=89=E5=85=A5=E8=8D=AF?= =?UTF-8?q?=E5=93=81=E5=B1=82=E7=BA=A7=E5=A2=9E=E5=8A=A0=E6=89=B9=E5=87=86?= =?UTF-8?q?=E6=96=87=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/drug/drugAdd.vue | 1 + src/views/supplier/companyDrug/basicCompanyproductEdit.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue index 589967b..897923d 100644 --- a/src/views/basic/product/drug/drugAdd.vue +++ b/src/views/basic/product/drug/drugAdd.vue @@ -534,6 +534,7 @@ + diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue index d7d893f..690a0e3 100644 --- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue +++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue @@ -709,6 +709,7 @@ + From 7ee5482b9606936f379b05c63d9b3e12fbdf2e55 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 12 Nov 2024 17:47:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E7=9A=84=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BB=B4=E6=8A=A4=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/drug/drugAdd.vue | 107 +++++++++++------- .../basicCompanyProductsImport.vue | 78 ++++++++++--- .../companyDrug/basicCompanyproductEdit.vue | 104 +++++++++++------ 3 files changed, 199 insertions(+), 90 deletions(-) diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue index f1126c0..06faba2 100644 --- a/src/views/basic/product/drug/drugAdd.vue +++ b/src/views/basic/product/drug/drugAdd.vue @@ -256,6 +256,26 @@

基本信息

+ + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + + - - + + + - - --> + + + - - - + + + @@ -363,9 +390,6 @@ - - - @@ -375,6 +399,10 @@ + + + + - - - - - - - - - + @@ -427,7 +445,13 @@ - + + + + + + + + - - - @@ -708,6 +732,9 @@ export default { useLevel: [ {required: true, message: '请选择计量单位', trigger: 'blur'} ], + detailSort: [ + {required: true, message: '请选择明细分类', trigger: 'blur'} + ], // useMaxLevel: [ // {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'} // ], @@ -904,19 +931,21 @@ export default { this.$message.error('层级标识不能为空') return } - if (isBlank(row.packLevel)) { - this.$message.error('包装级别不能为空') + if (isBlank(row.bhxjsl)) { + row.bhxjsl = 0 + } + if (isNaN(row.packLevel)) { + row.packLevel = 0 + } + if(this.newProductData.detailSort > 9 && row.packLevel == '0' ){ + this.$message.error('包装级别必须大于0') return + } if (isBlank(row.packUnit)) { this.$message.error('层级单位不能为空') return } - - if (isBlank(row.bhxjsl)) { - this.$message.error('请填写下级数量') - return - } let editQuery = { nameCode: row.nameCode, packLevel: row.packLevel, @@ -1036,8 +1065,8 @@ export default { addDrugLevel() { this.detailList.push({ nameCode: '', - packLevel: null, - bhxjsl: null, + packLevel: 0, + bhxjsl: 0, isDisabled: false, rowDisabled: false, isUpDisabled: true diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue index e5568c3..d6e071f 100644 --- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue +++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + + - - + + + - - --> + + + - - - + + @@ -364,8 +390,6 @@ - - @@ -375,6 +399,10 @@ + + + + - - - - - - - - - + @@ -427,7 +445,13 @@ - + + + + + + + + - - - @@ -875,7 +899,10 @@ export default { ], useMaxLevel: [ { required: true, message: '请选择允许采集的最大层级', trigger: 'blur' } - ] + ], + detailSort: [ + {required: true, message: '请选择明细分类', trigger: 'blur'} + ], }, detailList: [ // 初始化一个空对象或包含默认值的对象 @@ -1070,13 +1097,22 @@ export default { //层级保存 levelSave(row) { + if (isBlank(row.nameCode)) { this.$message.error('层级标识不能为空') return } - if (isBlank(row.packLevel)) { - this.$message.error('包装级别不能为空') + if (isBlank(row.bhxjsl) ) { + row.bhxjsl = 0 + } + + if (isNaN(row.packLevel)) { + row.packLevel = 0 + } + if(this.newProductData.detailSort > 9 && row.packLevel == '0' ){ + this.$message.error('包装级别必须大于0') return + } if (isBlank(row.packUnit)) { this.$message.error('层级单位不能为空') @@ -1201,8 +1237,8 @@ export default { addDrugLevel() { this.detailList.push({ nameCode: '', - packLevel: null, - bhxjsl: null, + packLevel: 0, + bhxjsl: 0, isDisabled: false, rowDisabled: false, isUpDisabled: true From 3350e1f6a62c6af5a800d28120f0ad0290f1228b Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 12 Nov 2024 17:49:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E7=9A=84=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BB=B4=E6=8A=A4=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB=E9=80=BB=E8=BE=91=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8D=AF=E5=93=81=E5=B1=82=E7=BA=A7=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=94=B9=20=E9=80=89=E5=85=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/drug/drugAdd.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue index 37bcaeb..60813c0 100644 --- a/src/views/basic/product/drug/drugAdd.vue +++ b/src/views/basic/product/drug/drugAdd.vue @@ -928,6 +928,7 @@ export default { //层级保存 levelSave(row) { + this.editRowSwitch = false if (isBlank(row.nameCode)) { this.$message.error('层级标识不能为空') From e9d527c0639fe5a6738f2c2c20f4d599308a06a9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 12 Nov 2024 18:15:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?11/12=20=E7=95=8C=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/drug/drugAdd.vue | 154 ++++++++++-------- .../companyDrug/basicCompanyproductEdit.vue | 19 +++ 2 files changed, 105 insertions(+), 68 deletions(-) diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue index 60813c0..7009415 100644 --- a/src/views/basic/product/drug/drugAdd.vue +++ b/src/views/basic/product/drug/drugAdd.vue @@ -66,7 +66,8 @@