From 0f0d62f85d0e44c03161ef6d3043a4d70fe553dd Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 30 十一月 2023 15:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/warehouse/pallettransports/index.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index af65c10..78fcdff 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -205,6 +205,7 @@
export default {
data() {
return {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -347,6 +348,15 @@
},
computed: {
...mapGetters(['permissions'])
+ },
+ watch:{
+ palletTransportsMaterialMultipleSelection(newVal){
+ if(newVal.length>0){
+ this.palletTransportsMaterialSelectionChange(newVal)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
},
created() { },
methods: {
@@ -549,8 +559,8 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ // console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ // console.log("閫変腑鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
@@ -567,17 +577,27 @@
}})
// this.palletTransportsDetailData = transportsDetails
if (transportsDetails.length > 0) {
+ let selectionList = this.palletTransportsMaterialMultipleSelection
saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
const resData = response.data
if (resData.code === 0) {
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
- this.MobileLibrary()
- this.$emit('refreshDataList')
+ let materialRow = selectionList[selectionList.length - 1]
+ console.log("materialRow-----",materialRow);
+ this.palletTransportsMaterialData.forEach(ele=>{
+ if(ele.id==materialRow.id){
+ console.log("ele-------",ele);
+ ele.transferQuantity = materialRow.surplusQuantity
+ ele.surplusQuantity = 0
+ }
+ })
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
+ // this.getPalletTransportsMaterialData()
+ this.palletTransportsMaterialSelectionChange(selectionList)
})
// .catch(() => {
// })
@@ -585,12 +605,6 @@
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -706,26 +720,26 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- let ids =[]
- this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
- let pId = ids[ids.length - 1];
- console.log(pId);
- this.palletTransportsDetailData = []
- this.datalistAPI = pId
- this.MobileLibrary()
- },
- MobileLibrary(){
- if(this.datalistAPI){
- selectAll({
- transportsId:this.currPalletTransportsRow.id,
- transportsMaterialId: this.datalistAPI
- }).then((res) =>{
- console.log(res);
- if(res.data.data){
- this.palletTransportsDetailData.push(res.data.data)
- }
- })
- }
+ console.log(this.palletTransportsMaterialMultipleSelection);
+ if(val && val.length>0){
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids[ids.length - 1];
+ console.log(pId);
+ if(pId!=null){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: pId
+ }).then((res) =>{
+ this.palletTransportsDetailData = []
+ if(res.data.data){
+ this.palletTransportsDetailData.push(res.data.data)
+ }
+ })
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -742,7 +756,6 @@
})
},
optaskRowClick(row, column) {
- console.log(row,222222222222222);
this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
--
Gitblit v1.9.3