Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/material/requisition/add.vue

@@ -55,7 +55,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="DI" prop="diCode">
-                <el-input :disabled="disable" v-model="basicForm.diCode"></el-input>
+                <el-input :disabled="disable" v-model.trim="basicForm.diCode"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -621,6 +621,28 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
+              <el-form-item label="进口产品生产厂家" prop="importsManufacturer">
+                <el-input :disabled="disable" v-model="basicForm.importsManufacturer"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="服务类" prop="serviceClass">
+                <el-input disabled v-model="basicForm.serviceClass"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="内包装单位" prop="innerPackingUnit">
+                <el-input :disabled="disable" v-model="basicForm.innerPackingUnit"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="内包装数" prop="innerPackingQty">
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.innerPackingQty"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="备注" prop="remark">
                 <el-input :disabled="disable" v-model="basicForm.remark"></el-input>
               </el-form-item>
@@ -1068,6 +1090,10 @@ export default {
         // 新增业务部门
         businessDepartment: '',
         isEnable: '0',
+        importsManufacturer: '',
+        serviceClass: '',
+        innerPackingUnit: '',
+        innerPackingQty: '',
         safeStock: '',
         mediumPackageUnitId: '',
         remark: '',