From fbe488209947467e3cc16c042947b496e738af26 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Feb 2019 19:44:29 +0800
Subject: [PATCH] a
---
src/utils/request.js | 2 +-
src/views/Inventory/PartOut/index.vue | 41 +++++++++++++++------------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index c4edcdbc..f2e82b1c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.106: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/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index d4df1b65..2b5d6148 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -45,6 +45,11 @@
align="center"
type="index"
width="50"/>
+
+
+ {{ scope.row.零件图号 }}
+
+
{{ scope.row.项目名称 }}
@@ -87,8 +92,8 @@
- 异常
- 出库
+ 异常
+ 出库
@@ -286,15 +291,13 @@ export default {
this.listLoading = false
})
},
- // 查询交换单
- searchExchange() {
- ExchangeOut(this.pickingListNumberx).then(response => {
- const data = response.data
- for (let i = 0; i < data.length; i++) {
- data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
- }
- this.tableDataExchange = data
- })
+ // 选择领料单
+ chooseListinfor(row) {
+ this.pickingListNumberx = row.领料单流水号
+ this.getpicikingPeople = row.领料人流水号
+ console.log(this.pickingListNumberx, 223344)
+ this.searchListDetailt()
+ this.searchExchange()
},
// 查询领料单明细
searchListDetailt() {
@@ -309,13 +312,15 @@ export default {
this.listLoading1 = false
})
},
- // 选择领料单
- chooseListinfor(row) {
- this.pickingListNumberx = row.领料单流水号
- this.getpicikingPeople = row.领料人流水号
- console.log(this.pickingListNumberx, 223344)
- this.searchListDetailt()
- this.searchExchange()
+ // 查询交换单
+ searchExchange() {
+ ExchangeOut(this.pickingListNumberx).then(response => {
+ const data = response.data
+ for (let i = 0; i < data.length; i++) {
+ data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
+ }
+ this.tableDataExchange = data
+ })
},
// 出库
partOut(row) {