From 041c81a20c93a6b8238e810fe9a1adfee9c9d86f Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 12 九月 2023 19:45:30 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages/OutOperation/OutOperation.vue | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/minipro_standard/pages/OutOperation/OutOperation.vue b/minipro_standard/pages/OutOperation/OutOperation.vue
index bf9c0d5..61bd5e1 100644
--- a/minipro_standard/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages/OutOperation/OutOperation.vue
@@ -195,7 +195,8 @@
show: false,
info: {
- },
+ },
+ mainOrder: '',
warehouseId: '',
ids: [],
warehouseList: [{
@@ -244,9 +245,9 @@
infoAction = wTransferForInOut
data.wTransferType = '0'
}
- console.log('------');
- infoAction(data).then(res => {
- if (this.isZKD) {
+ infoAction(data).then(res => {
+ this.mainOrder = res.data.id
+ if (this.isZKD) {
this.info = res.data.wtransfer
this.warehouseList = res.data.wtransferWarehouseList
this.warehouseId = this.warehouseList[0].warehouseId
@@ -272,29 +273,36 @@
selectMaterail(v) {
let tempList = this.warehouseList[0].wtransferDetailList
let materials = v.materials
-
- materials.forEach(materail => {
- tempList.forEach(item => {
- if (materail.materialId == item.materialId && materail.procedureId == item
- .procedureId && materail.qualityType == item.qualityType && materail.batch ==
- item.batch) {
- let isExist = false
- this.outboundList.forEach(selected => {
- if (selected.newId == materail.id) {
- isExist = true
- return
- }
- })
- if (isExist) {
- uni.$u.toast('璇ョ墿鏂欐壒娆″凡瀛樺湪')
- return
- }
- let obj = JSON.parse(JSON.stringify(materail))
- obj.newId = item.id
- this.outboundList.push(obj)
- }
+
+ materials.forEach(materail => {
+
+ tempList.forEach(item => {
+ item.wstockExtListVOList.forEach(hw => {
+ if (materail.materialId == hw.materialId && materail.procedureId == hw
+ .procedureId && materail.qualityType == hw.qualityType && materail.batch ==
+ hw.batch) {
+ let isExist = false
+ this.outboundList.forEach(selected => {
+ if (selected.newId == materail.id) {
+ isExist = true
+ return
+ }
+ })
+ if (isExist) {
+ uni.$u.toast('璇ョ墿鏂欐壒娆″凡瀛樺湪')
+ return
+ }
+ let obj = JSON.parse(JSON.stringify(materail))
+ obj.newId = item.id
+ this.outboundList.push(obj)
+ }
+ })
+
})
})
+ },
+ dele(index) {
+ this.outboundList.splice(index, 1)
},
submit() {
if (this.type == QRCodeType.ZKD) {
@@ -346,11 +354,14 @@
wtransferId: this.id
}).then(res => {
if (res.code === 200) {
- this.$store.dispatch.dispatch('getUpcomingNum')
+ this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
uni.redirectTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
- })
+ url: `/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
+ })
+ // uni.redirectTo({
+ // url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
+ // })
// setTimeout(() => {
// router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })
// }, 2000)
@@ -361,14 +372,14 @@
}
} else if (this.type === QRCodeType.CKD) {
wOutBoundForUpload({
- id: info.value.woutbound.id,
+ id: this.id,
wOutboundType: 0
}).then(res => {
if (res.code === 200) {
- this.$store.dispatch.dispatch('getUpcomingNum')
+ this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
uni.redirectTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}`
+ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
})
// setTimeout(() => {
// // router.go(-1)
--
Gitblit v1.9.3