From 775d4ce03c03ddd9a1cc6fc1b59a2be98f1a260d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 29 Sep 2019 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8C=BA=E4=BA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                               |  2 +-
 .../MaterialArrivalManagement/index.vue            | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 92890169..400de537 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,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.102:8005/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 30e4a4c3..adb5e357 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -68,7 +68,7 @@
     <el-card>
       <span>零件图号:</span>
       <el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="外购备料确认" placement="top">
+      <el-tooltip :open-delay="1200" effect="dark" content="外购备料查询" placement="top">
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
       </el-tooltip>
       <el-tooltip :open-delay="1200" effect="dark" content="外购备料完成" placement="top">
@@ -120,7 +120,8 @@
   </div>
 </template>
 
-<script>import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+<script>
+import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
 export default {
@@ -172,10 +173,11 @@ export default {
       }
     }
   },
-  // created() {
-  //   this.searchTable()
-  //   this.searchTable2()
-  // },
+  created() {
+    this.getMachine()
+    this.searchTable()
+    this.searchTable2()
+  },
   methods: {
     handleSelectionChange2(val) {
       this.arrest2 = val