From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/warehouse/pallettransports/index.vue | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index bcdbd21..681e61a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -382,30 +382,6 @@
...mapGetters(['permissions'])
},
watch:{
- // palletTransportsMaterialMultipleSelection(newVal){
- // if(newVal.length>0){
- // this.palletTransportsMaterialSelectionChange(newVal)
- // }else{
- // this.palletTransportsDetailData = []
- // }
- // }
- // palletTransportsChange(val){
- // console.log("=====");
- // if(val){
- // console.log(val);
- // console.log(this.command,"11111")
- // }else{
- // console.log("--");
- // }
- // }
- command: {
- handler(newVal) {
- if (newVal != '') {
- // 褰� aa 涓虹┖瀛楃涓叉椂瑙﹀彂鐨勬搷浣�
- console.log('aa is now empty');
- }
- },
- }
},
created() {
if(this.permissions.warehouse_pallettransports_edit){
@@ -432,7 +408,6 @@
palletTransportsMaterialSelectionChange() {
if(this.cid){
selectAll({transportsId:this.cid}).then((res)=>{
- console.log(res.data.data);
this.palletTransportsDetailData = res.data.data.map(el =>{
return{
part_no:el.partNo,
@@ -700,7 +675,6 @@
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
let transportsDetails =[]
- console.log(this.palletTransportsMaterialMultipleSelection,"----+");
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
partNo:el.partNo,
@@ -803,14 +777,10 @@
},
//鏀瑰彉
moveLocation(val){
- console.log(val,"---->");
let num = Number(val.transfer_quantity)
this.palletTransportsDetailMultipleSelection.forEach(el =>{
- console.log(el.transfer_quantity);
- el.transfer_quantity = num
+ el.transfer_quantity = num
})
- console.log(this.palletTransportsDetailMultipleSelection,"--->123");
-
},
updateStockFun(){
let data = []
@@ -875,7 +845,6 @@
this.showDetailStock = true
},
palletTransportsDetailSelectionChange(val) {
- console.log(val,"-=-=-=");
this.palletTransportsDetailMultipleSelection = val
},
getOptasks() {
--
Gitblit v1.9.3