工艺改进

src/api/ManufacturingCenter/ProcessQuotaEstablishment.js

@@ -1,5 +1,17 @@
 import request from '@/utils/request'
 
+// 查询零件（包含借用件）
+export function getPartnames3(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查',
+      param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
+    }
+  })
+}
 // 典艺查询<高精原有数据>
 export function searchProcess11(num) {
   return request({

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -9,16 +9,24 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>零件号:</span>
+      <!--<span>零件号:</span>
       <el-input v-model="partNumber" clearable placeholder="零件号" size="small" style="width:200px">
         <el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
+      </el-input>-->
+      <span>机床-分组 或 零件号:</span>
+      <el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
+        <el-button slot="append" icon="el-icon-right" @click="searchPartsByMachineGroup();partNumValue=''"/>
       </el-input>
       <el-select v-model="partNumValue" placeholder="选择零件编制工艺定额" size="small" @clear="clearDetail" @change="searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <b style="float: left">{{ item.label }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">-{{ item.group }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
+        </el-option>
       </el-select>
       <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
       <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
@@ -42,7 +50,7 @@
       </div>
       <div>
         <el-row>
-          <el-col :span="4">
+          <el-col style="width:210px">
             <span>物料类型:</span>
             <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
               <el-option
@@ -543,7 +551,8 @@ import {
   singleChange,
   readyChange,
   TableAddLi1,
-  TableAddLi
+  TableAddLi,
+  getPartnames3
 } from '@/api/ManufacturingCenter/ProcessQuotaEstablishment'
 import elInput from 'element-ui/packages/input'
 import { mapGetters } from 'vuex'
@@ -554,6 +563,7 @@ export default {
   },
   data() {
     return {
+      machine_Group_part: '',
       partNumber: '',
       options: [],
       weight: '',
@@ -1073,6 +1083,25 @@ export default {
         this.tableMaterial = response.data.rows
       })
     },
+    // 根据机床号-组号查询零件（包含借用件）
+    searchPartsByMachineGroup() {
+      this.tableData = []
+      this.partNum = []
+      this.disabled = false
+      this.isShow1 = true
+      this.isShow2 = false
+      this.checked1 = true
+      getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partNum.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].工艺计划流水号,
+            machine: response.data[i].机床图号,
+            group: response.data[i].组号
+          })
+        }
+      })
+    },
     searchParts() { // 根据条件查零件号
       this.tableData = []
       this.partNum = []
@@ -1457,6 +1486,7 @@ export default {
                   this.spec = ''
                   this.newNum = ''
                   this.searchParts()
+                  this.searchPartsByMachineGroup()
                   this.$message.success('保存成功')
                 })
               }