From f9afa032a030a3e32a34de3946ba029f1f3eddef Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 29 May 2019 11:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProcessAdjustQuery.js |  2 +-
 src/api/PurchasingCenter/OfflineContract.js   |  2 +-
 .../ProcessAdjustQuery/index.vue              | 19 +++++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessAdjustQuery.js b/src/api/ManufacturingCenter/ProcessAdjustQuery.js
index 151b6d6d..ae7575dd 100644
--- a/src/api/ManufacturingCenter/ProcessAdjustQuery.js
+++ b/src/api/ManufacturingCenter/ProcessAdjustQuery.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=20'
     }
   })
 }
diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index a47cae3e..0cd9792f 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询库存数
+// 询价状态修改
 export function changeInquiryStatus(num) {
   return request({
     url: '',
diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
index 372a510d..1a2f5e0f 100644
--- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
@@ -10,14 +10,13 @@
           :value="item.value"/>
       </el-select>
       <span>零件图号:</span>
-      <el-select v-model="partNumValue" filterable placeholder="零件图号" style="margin-right: 10px" size="small" clearable @clear="returnDate = ''">
+      <el-select v-model="partNumValue" filterable placeholder="零件图号" style="margin-right: 10px" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchData()">查询</el-button>
       <span>打回时间:</span>
       <el-date-picker v-model="returnDate" :clearable="false" type="datetime" placeholder="打回时间" size="small" readonly/>
     </el-card>
@@ -219,15 +218,11 @@ export default {
     tableRowClassName2({ row }) {
       for (let i = 0; i < this.tableData1.length; i++) {
         row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号
-        if (this.tableData1[i].工序流水号 === row.工序流水号 && this.tableData1[i].工艺编号 !== null) {
+        if (this.tableData1[i].工序顺序 === row.工序顺序) {
           if (this.tableData1[i].工艺编号 !== row.工艺编号 || this.tableData1[i].工艺要求 !== row.工艺要求 || this.tableData1[i].工艺难度等级 !== row.工艺难度等级) {
             return 'change'
           } else {
-            if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) {
-              return 'change'
-            } else {
-              return ''
-            }
+            return ''
           }
         }
       }
@@ -235,15 +230,11 @@ export default {
     tableRowClassName1({ row }) {
       for (let i = 0; i < this.tableData2.length; i++) {
         row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号
-        if (this.tableData2[i].工序流水号 === row.工序流水号 && this.tableData2[i].工艺编号 !== null) {
+        if (this.tableData2[i].工序顺序 === row.工序顺序) {
           if (this.tableData2[i].工艺编号 !== row.工艺编号 || this.tableData2[i].工艺要求 !== row.工艺要求 || this.tableData2[i].工艺难度等级 !== row.工艺难度等级) {
             return 'change'
           } else {
-            if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) {
-              return 'change'
-            } else {
-              return ''
-            }
+            return ''
           }
         }
       }