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 @@
-
+
@@ -347,7 +347,7 @@
-
+
@@ -360,6 +360,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -391,6 +412,9 @@
>
+
+
+
-
-
@@ -414,6 +436,9 @@
>
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
{
+ if (!valid) {
+ return this.$message.error('请补充必要数据')
+ }
+ this.postQuery.rlIds.splice(0);
+ this.postQuery.rlIds.push(selectData.id);
+ this.postQuery.price = this.repEditQuery.price;
+ this.allExport();
+ })
+
+
},
allExport() {
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index e121722..b854dc6 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -256,6 +256,26 @@
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-->
+
+
+
-
-
-
+
+
@@ -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