Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/Inventory/CreatePickingList/index.vue

@@ -407,7 +407,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="机床图号" prop="机床图号" label-width="100px">
-          <el-select v-model="form1.机床图号" filterable placeholder="选择机床图号" size="small" clearable @change="machineChange1()">
+          <el-select v-model="form1.机床图号" filterable placeholder="选择机床图号" size="small" clearable @change="machineChange2()">
             <el-option
               v-for="item in machineNumber"
               :key="item.value"
@@ -421,7 +421,7 @@
         <el-form-item label="组号" prop="组号" label-width="100px">
           <el-select v-model="form1.组号" filterable placeholder="选择组号" size="small" clearable @change="sss()">
             <el-option
-              v-for="item in groupNumber"
+              v-for="item in groupNumber2"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -475,6 +475,7 @@ export default {
       gridData: [],
       groupNumberValue: '',
       groupNumber: [],
+      groupNumber2: [],
       tableData0: [],
       tableData1: [],
       tableData2: [],
@@ -543,12 +544,27 @@ export default {
         return item.value === this.form1.机床图号
       })
       let obj_num = {}
-      obj_num = this.groupNumber.find((item2) => {
+      obj_num = this.groupNumber2.find((item2) => {
         return item2.value === this.form1.组号
       })
       console.log(obj_mac.label, obj_num.label)
       this.form1.领料单备注 = obj_mac.label + '-' + obj_num.label.replace(/\s*/g, '')
     },
+    // 组号 表单中
+    machineChange2() {
+      // this.groupNumberValue = ''
+      this.groupNumber2 = []
+      searchgroup(this.form1.机床图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber2.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+            // value: response.data[i].组号
+
+          })
+        }
+      })
+    },
     // // 加载机床号
     // initProject() {
     //   initMachineProject().then(response => {