From 07093aa4f476088139d9e46ce6f1d9c6c6e1dcb7 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 23 May 2019 13:33:07 +0800
Subject: [PATCH] fixed bug

---
 config/index.js                                |  4 ++--
 .../PurchaseSituationSearch.js                 |  4 ++--
 .../CreateInquirySheet/index.vue               | 18 +++++++++++++-----
 .../PurchasingCenter/OfflineContract/index.vue | 18 +++++++++++++-----
 .../PurchaseSituationSearch/index.vue          | 18 ++++++++----------
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/config/index.js b/config/index.js
index 6427159f..7609b831 100644
--- a/config/index.js
+++ b/config/index.js
@@ -7,8 +7,8 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-const ip = '127.0.0.1'
+const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+// const ip = '127.0.0.1'
 module.exports = {
   dev: {
     // Paths
diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js
index b5ab8829..29d56ee3 100644
--- a/src/api/PurchasingCenter/PurchaseSituationSearch.js
+++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js
@@ -30,7 +30,7 @@ export function searchTable1(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_分配后',
+      name: '采购管理_采购部采购_查询物料_分配后_加供应商',
       param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
       Pagination: params[4] + '&' + params[5]
     }
@@ -43,7 +43,7 @@ export function searchTable2(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
       param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
       Pagination: params[4] + '&' + params[5]
     }
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 5a2ee8b8..dd175825 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -812,16 +812,24 @@ export default {
         },
         {
           value: 1,
-          label: '未询价'
-        }, {
+          label: '未分配'
+        },
+        {
           value: 2,
-          label: '已询价',
+          label: '已分配',
           children: [{
             value: 3,
-            label: '未采购'
+            label: '未询价'
           }, {
             value: 4,
-            label: '已采购'
+            label: '已询价',
+            children: [{
+              value: 5,
+              label: '未采购'
+            }, {
+              value: 6,
+              label: '已采购'
+            }]
           }]
         }
       ], // 物料状态
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 33b077d9..93edb067 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -659,16 +659,24 @@ export default {
         },
         {
           value: 1,
-          label: '未询价'
-        }, {
+          label: '未分配'
+        },
+        {
           value: 2,
-          label: '已询价',
+          label: '已分配',
           children: [{
             value: 3,
-            label: '未采购'
+            label: '未询价'
           }, {
             value: 4,
-            label: '已采购'
+            label: '已询价',
+            children: [{
+              value: 5,
+              label: '未采购'
+            }, {
+              value: 6,
+              label: '已采购'
+            }]
           }]
         }
       ], // 物料状态
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 853ca85e..89742547 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -28,11 +28,10 @@
         <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.是否未通过" type="info" size="small">已作废</el-tag>
-              <el-tag v-else-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
           <el-table-column align="center" label="机床图号" width="100px">
@@ -107,11 +106,10 @@
         <el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.是否未通过" type="info" size="small">已作废</el-tag>
-              <el-tag v-else-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-              <el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
           <el-table-column align="center" label="机床图号" width="100px">