From 8aded8654948f13095576d354a1b0150612945a0 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 21 May 2019 16:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                        |  2 +-
 .../PartWorkCraftSelect_rdlc/index.vue              | 10 ++++++++++
 .../ProcessQuotaEstablishment/index.vue             | 13 +++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ab9634e9..c97b16c1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@xkeshi/vue-barcode": "^1.0.0",
     "axios": "0.18.0",
     "echarts": "^4.2.0-rc.2",
-    "element-ui": "2.4.6",
+    "element-ui": "2.8.2",
     "file-saver": "^1.3.8",
     "html2canvas": "^1.0.0-alpha.12",
     "jquery": "^3.3.1",
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 20f76a6e..f34f2e1b 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -51,6 +51,16 @@
         border
         highlight-current-row
         @row-click="click">
+        <el-table-column label="机床号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index e6225803..03fdcf68 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>工艺员:</span>
-      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();searchParts()">
+      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -10,16 +10,16 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchDetail()">
+      <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>
+      <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"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">
-        查询
-      </el-button>
       <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">在制零件工艺调整
       </el-button>
@@ -554,6 +554,7 @@ export default {
   },
   data() {
     return {
+      partNumber: '',
       options: [],
       weight: '',
       dialogMateria2: false,
@@ -1080,7 +1081,7 @@ export default {
         this.isShow1 = true
         this.isShow2 = false
         this.checked1 = true
-        getPartnames1(this.CraftmenValue, this.partNumValue).then(response => {
+        getPartnames1(this.CraftmenValue, this.partNumber).then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.partNum.push({
               label: response.data[i].零件图号,