From 305186058e51e654e109b227bcd3e0f9fbca47bb Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Mon, 19 Nov 2018 09:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PrintingAssemblyProcessCard/index.vue     |  4 ++--
 .../GroupMatching/index.vue                   | 22 +------------------
 .../ManufacturingCenter/StatusQuery/index.vue | 19 +---------------
 .../DepartmentBuyerRequestFund/index.vue      |  5 ++---
 .../ProcurementContractApproval/index.vue     |  2 +-
 .../ProcurementContractEnquiry/index.vue      |  2 +-
 .../PurchaseContractChange/index.vue          |  8 +++----
 7 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
index 08164f7a..cb92e4b8 100644
--- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
+++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
@@ -99,8 +99,8 @@
             <td colspan="6">{{ list.工艺内容及装配具体要求 }}</td>
             <td align="center">{{ list.质检 }}</td>
             <td>{{ list.工时 }}</td>
-            <td>{{ list.完成情况 }}</td>
-            <td>{{ list.检验情况 }}</td>
+            <td>{{ list.装配员 }}</td>
+            <td>{{ list.检验员 }}</td>
             <td width="100px">{{ list.备注 }}</td>
           </tr>
         </tbody>
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index aa1b7500..5058e5b8 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -4,13 +4,11 @@
       <span>项目名称:</span>
       <el-select
         v-model="entryNameValue"
-        :remote-method="remoteMethod"
         placeholder="项目名称"
         style="width:200px"
         size="small"
         clearable
         filterable
-        remote
         @change="empty">
         <el-option
           v-for="item in entryName"
@@ -242,7 +240,6 @@ export default {
       title: '',
       dialogFormVisible2: false,
       dialogFormVisible3: false,
-      List: [],
       check: null,
       check1: null,
       check2: null,
@@ -293,8 +290,6 @@ export default {
     }
   },
   created() {
-  },
-  mounted() {
     this.getList()
   },
   methods: {
@@ -350,30 +345,15 @@ export default {
       }
     },
     getList() { // 初始化项目名称
-      this.list = []
       initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.list.push({
+          this.entryName.push({
             label: response.data[i].项目名称,
             value: response.data[i].项目流水号
           })
         }
       })
     },
-    remoteMethod(query) {
-      if (query !== '') {
-        setTimeout(() => {
-          this.entryName = this.list.filter(item => {
-            if (item.label !== null) {
-              return item.label.toLowerCase()
-                .indexOf(query.toLowerCase()) > -1
-            }
-          })
-        }, 1000)
-      } else {
-        this.entryName = []
-      }
-    },
     empty() {
       this.machineToolNumber = ''
       this.groupNumber = ''
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 4cefe297..7182108a 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -5,13 +5,11 @@
       <span>项目名称:</span>
       <el-select
         v-model="entryNameValue"
-        :remote-method="remoteMethod"
         placeholder="项目名称"
         style="width:200px"
         size="small"
         clearable
         filterable
-        remote
         @change="empty">
         <el-option
           v-for="item in entryName"
@@ -306,8 +304,6 @@ export default {
   },
   created() {
     this.fetchData()
-  },
-  mounted() {
     this.getList()
   },
   methods: {
@@ -367,28 +363,15 @@ export default {
       })
     },
     getList() { // 初始化项目名称
-      this.list = []
       initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.list.push({
+          this.entryName.push({
             label: response.data[i].项目名称,
             value: response.data[i].项目流水号
           })
         }
       })
     },
-    remoteMethod(query) {
-      if (query !== '') {
-        setTimeout(() => {
-          this.entryName = this.list.filter(item => {
-            return item.label.toLowerCase()
-              .indexOf(query.toLowerCase()) > -1
-          })
-        }, 1000)
-      } else {
-        this.entryName = []
-      }
-    },
     empty() {
       this.machineToolNumber = ''
       this.groupNumber = ''
diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
index ffedafcf..ab86dbdb 100644
--- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
+++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
@@ -22,11 +22,10 @@
       <span>采购员:</span>
       <el-input
         v-model="buyerName"
-        placeholder="采购员"
+        placeholder="请双击选择"
         size="small"
-        readonly
         clearable
-        style="width:100px"
+        style="width:120px"
         @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 7d490c17..c2cfd8f3 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -23,7 +23,7 @@
         </el-option>
       </el-select>
       <span>采购员:</span>
-      <el-input v-model="buyerName" placeholder="请双击选择" size="small" readonly clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
+      <el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
       <el-button
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index fbadd2fd..f56e9031 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -23,7 +23,7 @@
         </el-option>
       </el-select>
       <span>采购员:</span>
-      <el-input v-model="buyerName" placeholder="采购员" size="small" readonly clearable style="width:100px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
+      <el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
       <span>审批情况:</span>
diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
index 875a0525..3cc52b00 100644
--- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
@@ -6,7 +6,7 @@
           <span>时间段:</span>
           <el-date-picker
             v-model="startEndDate"
-            style="width:250px"
+            style="width:240px"
             size="small"
             type="daterange"
             value-format="yyyy-MM-dd"
@@ -25,7 +25,7 @@
             </el-option>
           </el-select>
           <span>采购员:</span>
-          <el-input v-model="buyerName" placeholder="请双击选择" size="small" readonly clearable style="width:100px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;Buyer=0"/>
+          <el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;Buyer=0"/>
         </el-row>
         <el-row style="margin-top: 10px">
           <span>供应商:</span>
@@ -144,7 +144,7 @@
           <span>时间段:</span>
           <el-date-picker
             v-model="startEndDate"
-            style="width:250px"
+            style="width:240px"
             size="small"
             type="daterange"
             value-format="yyyy-MM-dd"
@@ -163,7 +163,7 @@
             </el-option>
           </el-select>
           <span>采购员:</span>
-          <el-input v-model="buyerName1" placeholder="请双击选择" size="small" readonly clearable style="width:100px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;buyer=1"/>
+          <el-input v-model="buyerName1" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;buyer=1"/>
         </el-row>
         <el-row style="margin-top: 10px">
           <span>供应商:</span>