diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue
index 94fa911..4204305 100644
--- a/pages/outbound/produce-out-store-2nd.vue
+++ b/pages/outbound/produce-out-store-2nd.vue
@@ -19,25 +19,26 @@
出库单据编号
-
+
+ {{editValue.toString()}}
-
-
- 可选物料数
-
-
- {{selectedNum !== null ? (9 - selectedNum) : null}}
-
+
已选物料数
- {{selectedNum}}
+ {{selectedNum}}
+
+
+ 可选物料数
+
+
+ {{selectedNum !== null ? (9 - selectedNum) : null}}
@@ -53,19 +54,23 @@
| 数量 |
单位 |
单据编码 |
+ 载具号 |
批次号 |
- |
- |
+
+
+
+ |
{{e.material_name}} |
{{e.material_code}} |
{{e.material_status}} |
{{e.qty}} |
{{e.unit_name}} |
{{e.prd_ppbom_no}} |
+ {{e.vehicle_code}} |
{{e.pcsn}} |
@@ -94,6 +99,7 @@
title: '',
val1: '',
val2: '',
+ editValue: [], // 出库单据编号集合
selectedNum: null, // 已选物料数
dataList: [],
disabled: false,
@@ -109,23 +115,37 @@
},
// 产线站点编码验证
async _queryTargetPoint (e) {
- let res = await queryTargetPoint(e)
- if (res.code === '200') {
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
- this.val1 = res.site_code
- } else {
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
+ try {
+ let res = await queryTargetPoint(e)
+ if (res.code === '200') {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ this.val1 = res.site_code
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ this.val1 = ''
+ }
+ } catch (e) {
this.val1 = ''
}
},
handleChange2 (e) {
- this._getCtuOrderList(e)
+ if (this.editValue.indexOf(e) === -1) {
+ this._getCtuOrderList(e)
+ } else {
+ uni.showToast({
+ title: '出库单据编号已存在',
+ icon: 'none'
+ })
+ }
+ setTimeout(() => {
+ this.val2 = null
+ }, 300)
},
async _getCtuOrderList (e) {
try {
@@ -143,6 +163,9 @@
this.dataList = [...this.dataList, ...res.content]
let arr = this.dataList.filter(el => el.checked === true)
this.checkData = arr
+ if (res.data !== null) {
+ this.editValue.push(res.data)
+ }
} else {
uni.showToast({
title: res.msg,
@@ -173,6 +196,7 @@
this.dataList = []
this.disabled = false
this.checkData = []
+ this.editValue = []
},
async _ctuOutConfirm () {
this.disabled = true
@@ -181,7 +205,7 @@
return
}
try {
- let res = await ctuOutConfirm(this.val1, this.val2, this.checkData)
+ let res = await ctuOutConfirm(this.val1, this.editValue.toString(), this.checkData)
if (res.code === '200') {
this.clearUp()
}
diff --git a/pages/outbound/shelf-bind-2nd.vue b/pages/outbound/shelf-bind-2nd.vue
index 3ccb145..1a91d04 100644
--- a/pages/outbound/shelf-bind-2nd.vue
+++ b/pages/outbound/shelf-bind-2nd.vue
@@ -51,9 +51,8 @@
-
-
-
+
+
@@ -87,6 +86,7 @@
},
async _getPointStatus (e) {
let res = await getPointStatus(e)
+ this.dataList = []
this.dataList.push(res)
},
toEmpty () {
diff --git a/utils/mork2.js b/utils/mork2.js
index 12a20cb..36cfd85 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -240,6 +240,7 @@ export const structattrPage = () => {
export const getCtuOrderList = () => {
let res = {
"code": "200",
+ data: '3',
content: [{material_name: '1', status: '1'}, {material_name: '2', status: '1'}, {material_name: '3', status: '1'}, {material_name: '4', status: '1'}, {material_name: '5', status: '1'}, {material_name: '6', status: '1'}, {material_name: '7', status: '1'}, {material_name: '8', status: '1'}, {material_name: '9', status: '0'}, {material_name: '10', status: '1'}]
}
return res
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index cc4275c..d0c82f2 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,6 +1,6 @@
import * as types from '../types'
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.49:8099' : 'http://192.168.10.49:8099'
const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
const state = {
baseUrl: uni.getStorageSync('baseUrl') || baseUrl,