From 4bf0efbaa83919a7b3b84888a22f55e406125971 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 12 Jan 2019 15:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessingStatusEdit.js                   |  6 ++--
 .../ProcessingStatusEdit/index.vue            | 36 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index ab5fd66c..539d1ef1 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -11,14 +11,14 @@ export function getNames() {
   })
 }
 
-export function getMachines(gongyi) {
+export function getMachines() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + gongyi + '=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 6a326aa4..fc808831 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -3,21 +3,16 @@
 
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="project" size="small" filterable clearable placeholder="项目名称" @change="getMachine">
-          <el-option
-            v-for="item in projects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床号:</span>
-        <el-select v-model="Machine" size="small" clearable placeholder="机床号" @change="getGroup">
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
           <el-option
             v-for="item in Machines"
             :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.value2 }}</div>
+          </el-option>
         </el-select>
         <span>组号:</span>
         <el-select v-model="Group" size="small" clearable placeholder="组号">
@@ -435,7 +430,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getMachine()
     this.fetchData3()
     this.getTableData()
   },
@@ -483,16 +478,15 @@ export default {
       this.Machines = []
       this.Group = ''
       this.Groups = []
-      if (this.project !== '') {
-        getMachines(this.project).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
     },
     getGroup() {
       this.Group = ''