Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/product/detail.vue

@@ -55,7 +55,12 @@
 
           <el-col :span="8">
             <el-form-item label="生产类型" prop="produceType">
-              <el-select v-model="form.produceType" filterable multiple>
+              <el-select
+                style="width: 100%"
+                v-model="form.produceType"
+                filterable
+                multiple
+              >
                 <el-option
                   v-for="item in dictList"
                   :key="item.value"
@@ -81,7 +86,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="批准文号" prop="approvalNumber">
+              <el-input v-model="form.approvalNumber" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="牌号" prop="brandNum">
               <el-input v-model="form.brandNum" />
@@ -99,6 +108,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="包装规格" prop="packingSpecification">
+              <el-input v-model="form.packingSpecification" />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="计量单位" prop="measuringUnit">
               <DictSelection
@@ -377,7 +392,7 @@
           ...info.category
         };
         let productType_ = this.form.produceType;
-        if(productType_ != undefined && productType_ != null){
+        if (productType_ != undefined && productType_ != null) {
           let intproductType = [];
           for (const [index, value] of productType_.entries()) {
             intproductType.push(value.toString());
@@ -482,7 +497,6 @@
             label: item[values[0]]
           };
         });
-     
       },
 
       openCategory() {