Merge branch 'dev' into 'master'

修改bug，新增字段

See merge request new-business/drp-web!13

src/components/PopDialog/drug.vue

@@ -26,6 +26,7 @@
                   :props="defaultProps"
                   node-key="id"
                   highlight-current
+                  check-on-click-node
                   @node-click="clickTree"
                   :filter-node-method="filterNode"
                   ref="tree">
@@ -73,7 +74,9 @@ export default {
       // 判断是否为最末级节点
       // isLast: false,
       // 选中的节点
-      choosePoint: {}
+      choosePoint: {},
+      // 多选数组
+      chooseArr: []
     };
   },
   props: {},
@@ -102,17 +105,21 @@ export default {
     },
     clickTree(data) {
       console.log('树形节点信息：',data)
+      console.log('选择的数组：', this.$refs.tree.getCheckedNodes())
       this.choosePoint = data
+      this.chooseArr = this.$refs.tree.getCheckedNodes()
     },
     filterNode(value, data) {
-      console.log('value', value)
-      console.log('data', data)
+      // console.log('value', value)
+      // console.log('data', data)
         if (!value) return true;
-        return data.name.indexOf(value) !== -1;
+        return data.name.indexOf(value) !== -1 || data.code.indexOf(value) !== -1
     },
     doSubmit() {
       console.log('子组件选择的数据',this.choosePoint)
       this.$emit("doSubmit", this.choosePoint);
+      // console.log('子组件选择的数据',this.chooseArr)
+      // this.$emit("doSubmit", this.chooseArr);
       this.visible = false;
     },
   },

src/views/material/requisition/add.vue

@@ -243,6 +243,51 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
+              <el-form-item label="序列号管理" prop="serialNoManager">
+                <el-select
+                    v-model="basicForm.serialNoManager"
+                    placeholder="序列号管理"
+                    clearable
+                    @change="stockControl"
+                    :disabled="disable"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="税类编码" prop="rateCode">
+                <el-input :disabled="disable" v-model="basicForm.rateCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="中包装单位" prop="mediumPackageUnitId">
+                <el-select
+                    ref="midpacks"
+                    v-model="basicForm.mediumPackageUnitId"
+                    placeholder="请选择"
+                    clearable
+                    :disabled="disable"
+                    @focus="chooseMidpack"
+                  >
+                    <el-option
+                      v-for="item in midPackOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                </el-select>
+                <!-- <el-input :disabled="disable" v-model="basicForm.mediumPackageUnitId"></el-input> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
               <el-form-item label="效期管理" prop="expiryDateManagerment">
                 <el-select
                     v-model="basicForm.expiryDateManagerment"
@@ -576,31 +621,6 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="税类编码" prop="rateCode">
-                <el-input :disabled="disable" v-model="basicForm.rateCode"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="中包装单位" prop="mediumPackageUnitId">
-                <el-select
-                    ref="midpacks"
-                    v-model="basicForm.mediumPackageUnitId"
-                    placeholder="请选择"
-                    clearable
-                    :disabled="disable"
-                    @focus="chooseMidpack"
-                  >
-                    <el-option
-                      v-for="item in midPackOptions"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-                </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.mediumPackageUnitId"></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>
@@ -1012,6 +1032,7 @@ export default {
         isB2c: '2',
         assembly: '2',
         isInventoryStatus: '0',
+        serialNoManager: '2',
         expiryDateManagerment: '0',
         nearOnsetManagerment: '0',
         usefulLife: '',