From d1547f23181815adb90e38a163093561605e0241 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 31 Dec 2019 17:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=BF=B0=E5=8A=A0=E5=B7=A5=E5=9B=BD?=
 =?UTF-8?q?=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 .../InitialProduction/index.vue               | 31 ++++++++++++-------
 .../ProcessingStatusNew/index.vue             |  7 +++--
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..fc41e22d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 46c70e4d..ac84aea2 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -422,14 +422,22 @@ export default {
   },
   watch: {
     // 如果路由有变化，会再次执行该方法
-    '$route': {
-      handler(route) {
-        const _this = this
-        if (route.name === 'InitialProduction') {
-          _this.typeChange()
-        }
+    '$route'(to) {
+      const _this = this
+      console.log(to, 2222)
+      if (to.name === 'InitialProduction') {
+        _this.typeChange()
       }
     }
+    // '$route': {
+    //   handler(route) {
+    //     const _this = this
+    //     console.log(route.name)
+    //     if (route.name === 'InitialProduction') {
+    //       _this.typeChange()
+    //     }
+    //   }
+    // }
   },
   created() {
     // this.typeChange()
@@ -503,10 +511,12 @@ export default {
       })
     },
     typeChange() {
+      console.log(Cookie.get('machineValue'), 1111111)
+      this.toolNumValue = ''
+      this.toolNum = []
+      this.NumValue = ''
+      this.Num = []
       if (Cookie.get('machineValue') !== undefined) {
-        this.toolNumValue = ''
-        this.NumValue = ''
-        this.Num = []
         getToolNum().then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.toolNum.push({
@@ -524,9 +534,6 @@ export default {
           Cookie.remove('group')
         })
       } else {
-        this.toolNumValue = ''
-        this.NumValue = ''
-        this.Num = []
         getToolNum().then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.toolNum.push({
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 8b409fe0..ed3ac8d7 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -90,12 +90,12 @@
                 {{ scope.row.跟单号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="180">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="280">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="80">
+            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="200">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
@@ -346,6 +346,7 @@ export default {
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
               工艺计划流水号: response.data.rows[i].工艺计划流水号,
+              考核状态: response.data.rows[i].考核状态,
               序号: response.data.rows[i].序号,
               跟单号: response.data.rows[i].跟单号,
               零件图号: response.data.rows[i].零件图号,
@@ -448,7 +449,7 @@ export default {
     // 完成日期变色
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
-      if (row.完成日期 !== '') {
+      if (parseInt(row.考核状态) > 6) {
         return 'CompleteColor'
       }
     }, // 重置表单