From 859ffc8e27de73d3e077e14d9ff2b46b40ef1e9b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Feb 2019 09:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F=E5=92=8C?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=A0=B9=E6=8D=AE=E6=9C=BA=E5=BA=8A=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Outsourcing/InterBudgetaryBudgets.js  |  5 +--
 src/api/Outsourcing/PreorderAssociation.js    |  5 +--
 .../InterBudgetaryBudgets/index.vue           | 39 ++++++++++++-------
 .../Outsourcing/PreorderAssociation/index.vue | 37 +++++++++++-------
 4 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/api/Outsourcing/InterBudgetaryBudgets.js b/src/api/Outsourcing/InterBudgetaryBudgets.js
index 50046a4e..ee365243 100644
--- a/src/api/Outsourcing/InterBudgetaryBudgets.js
+++ b/src/api/Outsourcing/InterBudgetaryBudgets.js
@@ -10,14 +10,13 @@ export function machine() {
     }
   })
 }
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协预算机床查询'
     }
   })
 }
diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js
index f421df05..eabfa6ff 100644
--- a/src/api/Outsourcing/PreorderAssociation.js
+++ b/src/api/Outsourcing/PreorderAssociation.js
@@ -10,14 +10,13 @@ export function machine() {
     }
   })
 }
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协机床查询'
     }
   })
 }
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index f0c7bbee..a5ae2b45 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -3,26 +3,36 @@
 
     <el-card>
       <el-row>
-        <el-radio-group v-model="radio" style="margin: 10px;" @change="radioChange">
+        <el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange">
           <el-radio :label="1">未编制</el-radio>
           <el-radio :label="2">已编制</el-radio>
         </el-radio-group>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" 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="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" 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" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @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>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>分组:</span>
         <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
           <el-option
@@ -204,7 +214,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.searchPartNum()
   },
   methods: {
@@ -231,11 +241,12 @@ export default {
       this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         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].项目名称
           })
         }
       })
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 8ad46881..db9112cd 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -2,22 +2,32 @@
   <div>
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" 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="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" 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" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @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>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>分组:</span>
         <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
           <el-option
@@ -166,7 +176,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.searchTable()
   },
   methods: {
@@ -187,11 +197,12 @@ export default {
       this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         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].项目名称
           })
         }
       })