diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 687e89cd..d2e98a7a 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -250,6 +250,26 @@
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
@@ -339,7 +356,13 @@
-
+
+
+
+
+
+
+
+
@@ -357,9 +383,6 @@
-
-
-
@@ -369,6 +392,10 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
+
@@ -421,7 +438,13 @@
-
+
+
+
+
+
+
+
+
-
-
-
@@ -447,6 +470,7 @@
+
@@ -793,6 +817,9 @@ export default {
useLevel: [
{required: true, message: '请选择计量单位', trigger: 'blur'}
],
+ detailSort: [
+ {required: true, message: '请选择明细分类', trigger: 'blur'}
+ ],
// useMaxLevel: [
// {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
// ],
@@ -1007,18 +1034,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,
@@ -1055,8 +1085,8 @@ export default {
addDrugLevel() {
this.detailList.push({
nameCode: '',
- packLevel: null,
- bhxjsl: null,
+ packLevel: 0,
+ bhxjsl: 0,
isDisabled: false,
rowDisabled: false,
isUpDisabled: true