From 24eb9d89423613c7322da715f2a445b4466ffcf4 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 11 九月 2023 18:16:04 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages/OutOperation/OutOperation.vue | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/minipro_standard/pages/OutOperation/OutOperation.vue b/minipro_standard/pages/OutOperation/OutOperation.vue
index bf9c0d5..01809b9 100644
--- a/minipro_standard/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages/OutOperation/OutOperation.vue
@@ -244,7 +244,6 @@
infoAction = wTransferForInOut
data.wTransferType = '0'
}
- console.log('------');
infoAction(data).then(res => {
if (this.isZKD) {
this.info = res.data.wtransfer
@@ -272,29 +271,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 +352,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.info.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)
@@ -365,7 +374,7 @@
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}`
--
Gitblit v1.9.3