机床查询、使用滞货

src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue

@@ -22,20 +22,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>项目名称:</span>
-      <el-select
-        v-model="projectNameValue"
-        placeholder="项目名称"
-        size="small"
-        style="width:100px"
-        clearable
-        @change="searchMachine()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
       <el-select
         v-model="machineValue"
@@ -48,7 +34,10 @@
           v-for="item in Machine"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :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>
       <span>组号:</span>
       <el-select
@@ -230,23 +219,7 @@
     <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="项目名称">
-              <el-select
-                v-model="projectNameValue1"
-                placeholder="项目名称"
-                size="small"
-                style="width:150px"
-                @change="searchMachine1()">
-                <el-option
-                  v-for="item in projectName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="机床名称">
               <el-select
                 v-model="machineValue1"
@@ -258,16 +231,14 @@
                   v-for="item in Machine1"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value"/>
+                  :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-col>
-          <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="组号">
               <el-select
                 v-model="groupNumberValue1"
@@ -283,7 +254,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="图号/名称">
               <el-input
                 v-model="partNum1"
@@ -294,7 +267,8 @@
                 @dblclick.native="searchParts1"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="12">
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
             <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
           </el-col>
         </el-row>
@@ -524,7 +498,6 @@ import '@/icon/iconfont.css'
 import {
   initCraftmen,
   getProject,
-  getMachine,
   getGroup,
   getPartnames1,
   getProcedure,
@@ -553,16 +526,12 @@ export default {
   },
   data() {
     return {
-      projectNameValue: '',
-      projectName: [],
       machineValue: '',
       Machine: [],
       groupNumberValue: '',
       groupNumber: [],
       groupNum: '',
       groupType: '',
-      projectNameValue1: '',
-      projectName1: [],
       machineValue1: '',
       Machine1: [],
       groupNumberValue1: '',
@@ -644,11 +613,12 @@ export default {
           })
         }
       })
-      getProject(0).then(response => { // 初始化项目
+      getProject(0).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -675,18 +645,15 @@ export default {
         this.isShow2 = false
       }
       this.checked = false
-      this.projectNameValue = ''
-      this.projectName = []
-      getProject(this.radio).then(response => { // 初始化项目
+      getProject(this.radio).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
-      this.machineValue = ''
-      this.Machine = []
       this.groupNumberValue = ''
       this.groupNumber = []
       this.partNum = ''
@@ -724,21 +691,6 @@ export default {
         })
       }
     },
-    searchMachine() {
-      this.clear()
-      this.machineValue = ''
-      this.Machine = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      getMachine(this.radio, this.projectNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup() {
       this.clear()
       this.groupNumberValue = ''
@@ -824,20 +776,6 @@ export default {
         }
       })
     },
-    searchMachine1() {
-      this.machineValue1 = ''
-      this.Machine1 = []
-      this.groupNumberValue1 = ''
-      this.groupNumber1 = []
-      getMachine(1, this.projectNameValue1).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine1.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup1() {
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
@@ -993,18 +931,17 @@ export default {
     WYbtn() { // 完艺按钮
       this.tableData4 = []
       this.dialogFormVisible1 = true
-      this.projectNameValue1 = ''
-      this.projectName1 = []
       this.machineValue1 = ''
       this.Machine1 = []
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
       this.partNum1 = ''
-      getProject(1).then(response => { // 初始化项目
+      getProject(1).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName1.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine1.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })