更新

src/views/Inventory/CreatePickingList/index.vue

@@ -406,9 +406,32 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="领料单备注" prop="领料单备注" label-width="100px">
-          <el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>
+        <el-form-item label="机床图号" prop="机床图号" label-width="100px">
+          <el-select v-model="form1.机床图号" filterable placeholder="选择机床图号" size="small" clearable @change="machineChange1()">
+            <el-option
+              v-for="item in machineNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+            </el-option>
+          </el-select>
         </el-form-item>
+        <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"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="领料单备注" prop="领料单备注" label-width="100px">-->
+        <!--&lt;!&ndash;<el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>&ndash;&gt;-->
+        <!--<span> {{ form1.领料单备注 }}</span>-->
+        <!--</el-form-item>-->
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1=false">取消</el-button>
@@ -482,7 +505,9 @@ export default {
       materialModel: '', // 物料型号
       form1: {
         领料人流水号: '',
-        领料单备注: ''
+        领料单备注: '',
+        机床图号: '',
+        组号: ''
       },
       rules1: {
         领料人流水号: [{ required: true, message: '请选择制单人' }]
@@ -512,6 +537,45 @@ export default {
     // this.startTime = [get90DAY(). getNowDAY()]
   },
   methods: {
+    sss() {
+      let obj_mac = {}
+      obj_mac = this.machineNumber.find((item) => {
+        return item.value === this.form1.机床图号
+      })
+      let obj_num = {}
+      obj_num = this.groupNumber.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, '')
+    },
+    // // 加载机床号
+    // initProject() {
+    //   initMachineProject().then(response => {
+    //     for (let i = 0; i < response.data.length; i++) {
+    //       this.machineNumber.push({
+    //         label: response.data[i].机床图号,
+    //         name: response.data[i].项目名称,
+    //         value: response.data[i].机床流水号
+    //       })
+    //     }
+    //   })
+    // },
+    // 组号
+    machineChange1() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.form1.机床图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+            // value: response.data[i].组号
+
+          })
+        }
+      })
+    },
     // 审批通过
     approvalPass(row) {
       this.$confirm('是否审批通过?', '提示', {
@@ -773,13 +837,14 @@ export default {
       this.form1.领料单备注 = ''
       this.createList_disable = false
       this.dialogFormVisible1 = true
+      this.groupNumber = []
     },
     // 提交创建领料单
     submitCreateList() {
       this.createList_disable = true
       let isElectrical
       Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
-      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
+      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical, this.form1.机床图号, this.form1.组号).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('创建成功')
           this.dialogFormVisible1 = false

src/views/Inventory/PickingListApproval/index.vue

@@ -172,7 +172,7 @@ export default {
         type: 'warning'
       }).then(() => {
         if (this.pickListTable2.length === 0) {
-          this.$message.error('空领料单，不能审批！')
+          this.$message.error('不能审批空领料单')
           return
         }
         const param = {