From 93c421bb25860b60aed6a1a75f2927f8ac4789af Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 28 十月 2024 16:05:05 +0800
Subject: [PATCH] feat:库管修改细节问题

---
 subPages/addDailyPlan/addDailyPlan.vue |  156 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 144 insertions(+), 12 deletions(-)

diff --git a/subPages/addDailyPlan/addDailyPlan.vue b/subPages/addDailyPlan/addDailyPlan.vue
index 8ca893d..07489af 100644
--- a/subPages/addDailyPlan/addDailyPlan.vue
+++ b/subPages/addDailyPlan/addDailyPlan.vue
@@ -44,8 +44,28 @@
 						   class="customer-name_block-input"
 							placeholder="璇疯緭鍏ヨ溅鏁�"
 							border="surround"
+							:disabled="isNumOk"
 							v-model="value"
 						></u--input>
+				</view>
+			</view>
+				<!-- 瀹㈡埛鍚嶇О -->
+				<view class="customer-name">
+				<view class="customer-name_label" style="display: flex; align-items: center;">
+				   鍚堝崱璁㈠崟
+				   <view style="width: 50%;margin-left: 30rpx;"><u-button  text='閫夋嫨闇�瑕佸悎鍗¤鍗�'  	:disabled="!deptId" @click="todoUncoid"></u-button></view>
+				</view>
+				<view class="customer-name_block">
+						  <u-input
+						  @clear="clearInp"
+						  clearable
+						   class="customer-name_block-input"
+							placeholder="璇烽�夋嫨璁㈠崟"
+							border="surround"
+							v-model="activeName"
+							:disabled="!deptId"
+						
+						></u-input>
 				</view>
 			</view>
 				 <view class="table">
@@ -55,18 +75,24 @@
 			emptyText="鏆傛棤鏇村鏁版嵁">
 					<uni-tr>
 					    <uni-th align="center">浜у搧鍚嶇О</uni-th>
-						<uni-th align="center">绫诲瀷</uni-th>
-					    <uni-th align="center">浠撳簱</uni-th>
+						<uni-th align="center">瑙勬牸</uni-th>
+						<uni-th align="center" v-if="isNumOk">鏁伴噺</uni-th>
+						<uni-th align="center">璁㈠崟浣欓噺</uni-th>
 					</uni-tr>
 					<uni-tr v-for="(item, index) in subDataList" :key="index">
 						<uni-td align="center">
 							<view>{{   item.productName}}</view></uni-td>
-					<uni-td>
-						<view class="name">{{ item.orderType }}</view>
-					</uni-td>
-					
-				聽   <uni-td align="center">
-					<view>{{ item.bunkerName }}</view></uni-td>
+							<uni-td align="center">
+							<view>{{   item.productSpecs}}</view></uni-td>
+					聽   <uni-td align="center" v-if="isNumOk">
+						<view>
+							<u--input 
+							v-model="subDataList[index].nums"
+							border="surround"
+							placeholder="璇疯緭鍏ユ暟閲�" />
+								</view></uni-td>
+								<uni-td align="center">
+									<view>{{   item.surplusQuant}}</view></uni-td>
 				</uni-tr>
 				</uni-table>
 		 </view>
@@ -103,7 +129,7 @@
 							v-for="item in customerNameList"
 							@click="selectCustomer(item)">
 							<view class="item-image">
-								<image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png"
+								<image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/address.png"
 									mode="widthFix"
 									style="width: 18px;"></image>
 							</view>
@@ -135,27 +161,53 @@
 			this.sendDate = this.sendDateStart = dayjs().format('YYYY-MM-DD')
 			this.sendDateEnd = dayjs().add(7, 'day').format('YYYY-MM-DD')
 		},
+		onShow(){
+			uni.$on('updateData',(data)=>{
+				console.log('鐩戝惉鍒颁簨浠舵潵鑷� updateData 锛屾惡甯﹀弬鏁颁负锛�' + JSON.parse( JSON.stringify(data)) , JSON.parse(data) .id );
+				const params = JSON.parse(data);
+				// this.checkList2 = params.map(item=>{
+				// 	item.text = item.orderCode + '/' + item.customerName;
+				// 	return item;
+				// });
+				// let temp = this.checkList2;
+				// this.closeOrderIds = temp.map(item=>item.id).join(',')
+				this.activeName = params.orderCode  +'/' + params.customerName;
+				this.closeOrderId = params.id;
+
+
+			})
+		},
 		data() {
 			return {
 				selfDeliverShow: false,
 				deptId: '',
 				checkList:[],
 				deptName: '',
+				mapProductNum:'',
+				activeName:'',
+				isNumOk:false,
+				isNumData:[],
+				checkList2:[],
 				deptList: [],
+				uncoidCard:'',
 				productName: '',
 				productNameList: [],
 				filedId: '',
 				filedName: '',
+				unionParams:{},
 				filedNameList: [],
 				sendDate: '',
 				sendDateStart: '',
 				sendDateEnd: '',
 				customerId: '',
+				closeOrderIds:'',
 				value:'',
 				customerName: '',
 				customerNameList: [],
 				buildLoading: false,
 				subDataList:[],
+				isWeighing:'',
+				orderType:'',
 			}
 		},
 		computed: {
@@ -202,16 +254,64 @@
 								this.deptId = this.customerNameList[0].value; //閫夋嫨褰撳墠 
 								// if(this.deptId){
 								// 	this.deptChange(this.deptId);
-								// }
+								// } 
+								this.unionParams = {
+									orderId:this.customerNameList[0].id,
+									deptId:this.customerNameList[0].deptId,
+									customerId:this.customerNameList[0].customerId,
+									productId:this.customerNameList[0].productId
+								}
+								    
 							}else{
 								this.deptId = '';
 							}
 				
 							if(this.deptId){
 						this.subDataList = this.customerNameList.filter(item=>item.id === e).length ? 
+						
 		  			    this.customerNameList.filter(item=>item.id === e)[0].tmOrderList  : []; 
+						this.subDataList.map(item=>{
+							item.nums = item.surplusQuant
+							return item
+						})
+						console.log(this.subDataList,'subDataList')
+						const tempArr = this.customerNameList.filter(item=>item.id === e);
+						if(tempArr.length){
+							this.unionParams = {
+									orderId:tempArr[0].id,
+									deptId:tempArr[0].deptId,
+									customerId:tempArr[0].customerId,
+									productId:tempArr[0].productId
+								}
+						}else{
+							this.unionParams = {
+									orderId:'',
+									deptId:'',
+									customerId:'',
+									productId:'',
+								}
+						}
 							}else{
 								this.subDataList = [];
+							}
+							//鏌ョ湅鏄笉鏄噰璐殑璁℃暟
+							if(this.subDataList.find(item=>item.isWeight === 0)){
+								this.isNumOk = true;
+								this.value = 1;
+							} else{
+								this.isNumOk = false;
+							}
+							if(this.isNumOk){
+								let tempArr = [];
+								this.subDataList.forEach(item=>{
+								tempArr.push(item.productId + ':' + item.surplusQuant);
+								this.isWeighing = item.isWeight;
+								this.orderType = item.orderType;
+								})
+								
+								this.mapProductNum = tempArr.join(",")
+							}else{
+								this.mapProductNum = '';
 							}
 						}
 					})
@@ -219,12 +319,33 @@
 				
 			},
 			confirmBuild() {
+				let tempArr = [];
+					this.subDataList.forEach(item=>{
+						this.checkList.forEach(val=>{
+							if(item.id === val){
+								tempArr.push(item.productId + ':' + item.nums);
+							}
+						
+						})
+						
+						})
+					this.mapProductNum = tempArr.join(","); 
+					if(   this.subDataList.find(item=>Number(item.nums) > Number(item.surplusQuant))){
+						this.$u.toast('璇锋鏌ユ墍閫夋嫨鐨勪骇鍝佽緭鍏ョ殑鏁伴噺鏄惁灏忎簬璁㈠崟浣欓噺')
+						return;
+					}
+				;
 				let form = {
 				  orderId:this.deptId,
 				  carNum:this.value,
 				  sendDate:this.sendDate,
 				  sendSign:0,
-				  itemIds:this.checkList.join(",") + ','
+				  itemIds:this.checkList.join(",") + ',',
+				  closeOrderId:this.closeOrderId,
+				  mapProductNum:this.mapProductNum,
+				  orderType:this.orderType,
+				  isWeighing:this.isWeighing
+
 				}
 				this.buildLoading = true
 				this.$reqPost('addDeliveryPlan', form, 'json').then(res => {
@@ -253,7 +374,18 @@
 				  })
 					console.log(this.checkList,'checkList')
 			 	}
-			}
+			},
+			todoUncoid(){
+				console.log('todoUncoid');
+				uni.navigateTo({
+				url: `/subPages/unionCard/unionCard?unionParams=${JSON.stringify(this.unionParams)}&checkArray=${JSON.stringify(this.checkList2) }`
+				});
+
+			},
+			clearInp(){
+				this.closeOrderId = '';
+				this.activeName = '';
+			},
 		},
 	}
 </script>

--
Gitblit v1.9.1