From 08b06cee4f10c7dd6b197d558899526fa4e83ac0 Mon Sep 17 00:00:00 2001
From: liulujia <759670076@qq.com>
Date: Sun, 26 Apr 2020 15:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A0=BC=E5=BC=8F=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                         | 2 +-
 src/views/PurchasingCenter/PurchaseSituationSearch/index.vue | 4 ++--
 src/views/PurchasingCenter/ReceiveCheck/index.vue            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 0e7d73f1..f79d7a47 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -27,7 +27,7 @@ export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFil
 export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+  baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index b2803a67..2568d28c 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -335,10 +335,10 @@
               {{ scope.row.零件数量 || '—' }}
             </template>
           </el-table-column>
-              <el-table-column align="center" label="采购数量" width="100px">
+          <el-table-column align="center" label="采购数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.采购数量 }}
-              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
+              <!--{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}-->
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数量" width="100px">
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index ec99731e..26a544fe 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -326,7 +326,7 @@ export default {
       param[6] = ['机床号物料名称_check', check4]
       param[7] = ['机床号物料名称', this.machinenum]
       param[8] = ['合计', this.totalPrice]
-      param[9] = ['表名', '采购核算']
+      param[9] = ['表名', '领用核算']
       var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
       this.exportExcel_NPOI(Data)
     }