From 0713f0f364875f7221a0a3e97d3a040cffd89639 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Sat, 5 Jan 2019 09:03:27 +0800
Subject: [PATCH] xl

---
 src/utils/request.js                      | 2 +-
 src/views/Inventory/PickingList/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index cdf4a490..491b6cb5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,7 @@ const service = axios.create({
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 8ab14017..a3241d84 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -296,7 +296,7 @@
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.入库备注 }}
+            {{ scope.row.备注 }}
           </template>
         </el-table-column>
         <el-table-column label="零件类型" align="center" min-width="80">