From 785a76e857634d6673dc4787adc3f65f0b675b61 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 17:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B=E5=B9=B3?=
 =?UTF-8?q?=E8=A1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionCapacityBalance.js              |  4 +--
 .../ProductionCapacityBalance/index.vue       | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
index 560946b5..65c9d804 100644
--- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js
+++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
@@ -18,8 +18,8 @@ export function getToolNum(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '=int&是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index cad79f87..38eba64d 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -4,26 +4,20 @@
     <el-card>
       <div style="margin-top: -10px;">
         <el-row>
-          <span>项目名称:</span>
-          <el-select v-model="entryNameValue" size="small" filterable clearable placeholder="项目名称" @change="typeChange()">
-            <el-option
-              v-for="item in entryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-
           <span>机床号:</span>
-          <el-select v-model="toolNumValue" size="small" filterable clearable placeholder="机床号" @change="typeChange1()" >
+          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
             <el-option
               v-for="item in toolNum"
               :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="NumValue" size="small" filterable clearable placeholder="机床组号">
+          <span>分组:</span>
+          <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
               v-for="item in Num"
               :key="item.value"
@@ -727,7 +721,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.Selection1()
     this.getTable()
   },
@@ -990,7 +984,8 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })