Merge branch 'main' of https://www.sanduolantoyoga.com/xiezuo001/palletApp

components/psDetail.vue

@@ -212,18 +212,18 @@
 		      <!-- 装盘明细 -->
 		      <view class="section">
 		        <view class="section-header">
-		          <text class="section-title">装盘明细（{{pallet&&pallet.instdetailList?pallet.instdetailList.length:0}}）</text>
+		          <text class="section-title">装盘明细（{{pallet?pallet.loadQty:0}}）</text>
 		        </view>
 		        <view class="list-container" v-if="pallet&&pallet.instdetailList">
 		          <view v-for="(item, index) in pallet.instdetailList" :key="index" class="list-item">
 					  
 					<view class="item-header" @click="gotocxDetail(item.instno,item.project)">
-						<text class="item-tip">{{ item.groupDesc }} ({{ item.qty?parseFloat(item.qty).toFixed(2):'0.00'}})</text>
+						<text class="item-tip">{{ item.groupDesc }} ({{ item.qty?parseInt(item.qty):'0'}})</text>
 					</view>
 					
 					<view v-for="(row, ii) in item.items"> 
 		            <view class="item-header" @click="toggleDetail(ii)">
-		              <text class="item-title">{{ row.assemcode }} ({{ row.qty?parseFloat(row.qty).toFixed(2):'0.00' }})</text>
+		              <text class="item-title">{{ row.assemcode }} ({{ row.qty?parseInt(row.qty):'0' }})</text>
 		              <uni-icons :type="expandedIndex === ii ? 'arrowup' : 'arrowdown'" size="16" color="#999"></uni-icons>
 		            </view>
 		            <view v-if="expandedIndex === ii" class="item-content">
@@ -477,7 +477,6 @@
 									cell["qty"]=this.getQty(cell.items);
 									this.$forceUpdate();
 								});
-								
 								// this.pallet["instdetailList"]=res.data;
 								this.$forceUpdate(); 
 							} 

pages.json

@@ -63,7 +63,7 @@
 	  "path": "pages/pallet/js",
 	  "style": {
 	    "navigationBarBackground Color": "#3690ff",
-	    "navigationBarTitleText": "转运接收"
+	    "navigationBarTitleText": "托盘接收"
 	  }
 	},
 	{
@@ -98,7 +98,7 @@
 	  "path": "pages/pallet/ck",
 	  "style": {
 	    "navigationBarBackground Color": "#3690ff",
-	    "navigationBarTitleText": "托盘详情查询",
+	    "navigationBarTitleText": "工装托盘查询",
 		"app-plus": {
 			"titleNView": {
 				"buttons": [

pages/index/index.vue

@@ -82,7 +82,7 @@
 						ifshow: false
 					},
 					{
-						name:"转运接收",
+						name:"托盘接收",
 						key:"js",
 						src:"../../static/image/js.png",
 						remark:"扫码工装托盘二维码接收",
@@ -188,7 +188,7 @@
 						name:"我的地址",
 						key:"my",
 						src:"../../static/image/my.png",
-						remark:"查看常用地址信息",
+						remark:"管理常用地址信息",
 						url:"/pages/me/index",
 						opentype:"1",
 						ifshow: true

pages/pallet/ps.vue

@@ -152,7 +152,7 @@
 				<template v-slot:title>
 					<view class="pallet-info">
 					  <text class="pallet-number" @click="openPalletDetail(pallet)">
-						{{index+1}}. [ {{ pallet.palletNo?pallet.palletNo:'无工装托盘'}} ] ( {{ pallet.children?pallet.children.length:'0'}} )
+						{{index+1}}. [ {{ pallet.palletNo?pallet.palletNo:'无工装托盘'}} ] ( {{ pallet.qty}} )
 					  </text>
 					  <view class="sright">
 					  	<u-checkbox shape="square" :iconSize="30" :size="40" v-model="pallet.checked" @change="checkboxChange($event,index)">
@@ -165,7 +165,7 @@
 					<view class="pallet-info">
 					  <text class="pallet-number">
 					  {{ pl.assemcode}}
-					   <text style="color: #888; margin-left: 20rpx;">({{ pl.qty?parseFloat(pl.qty).toFixed(2):'0.00' }})</text></text>
+					   <text style="color: #888; margin-left: 20rpx;">({{ pl.qty?parseInt(pl.qty):'0.00' }})</text></text>
 					  <view class="sright">
 					  	<u-checkbox shape="square" :iconSize="30" :size="40" 
 						v-model="pl.checked" @change="childcheckboxChange($event,index,idx)"></u-checkbox>
@@ -953,7 +953,9 @@ export default {
 					var pallets = res.data;
 					var palletDetails = pallets.palletDetails?pallets.palletDetails:[];
 					this.palletData=[]; 
+					let _qty=0
 					palletDetails.forEach((item,index)=>{
+						_qty+=parseInt(item.qty||'0')
 						item["checked"]=true;
 						var findx = this.palletData.findIndex(cell => item.palletNo === cell.palletNo);
 						// 新增
@@ -971,7 +973,8 @@ export default {
 								files:files,
 								isOpen: true,
 								checked:true,
-								children:[item]
+								children:[item],
+								qty:parseInt(item.qty||'0')
 							}
 							this.palletData.push(pallet);
 							this.$forceUpdate();
@@ -979,16 +982,16 @@ export default {
 						else{
 							// 添加到此托盘明细列表
 							this.palletData[findx].children.push(item);
+							this.palletData[findx].qty+=parseInt(item.qty||'0')
 							this.$forceUpdate();
 						}
 					});
 					
 					// 无托盘
 					var noPalletDetails = pallets.noPalletDetails?pallets.noPalletDetails:[];
-					//配送单配送管件数量
-					this.itemList.qty=palletDetails.length+noPalletDetails.length
 					
 					noPalletDetails.forEach((item,index)=>{
+						_qty+=parseInt(item.qty||'0')
 						item["checked"]=true;
 						var findx = this.palletData.findIndex(cell => item.palletNo === cell.palletNo);
 						// 新增
@@ -1006,7 +1009,8 @@ export default {
 								files:files,
 								isOpen: true,
 								checked:true,
-								children:[item]
+								children:[item],
+								qty:parseInt(item.qty||'0')
 							}
 							this.palletData.push(pallet);
 							this.$forceUpdate();
@@ -1014,11 +1018,15 @@ export default {
 						else{
 							// 添加到此托盘明细列表
 							this.palletData[findx].children.push(item);
+							this.palletData[findx].qty+=parseInt(item.qty||'0')
 							this.$forceUpdate();
 						}
 					});
 					
+					console.log(this.palletData);
 					
+					//配送单配送管件数量
+					this.itemList.qty=_qty
 					this.palletAll=res.data;
 					this.pallet=res.data.palletDetails;
 					// 配送单号deliveryNo、工程编号project、制作图号dwgno、托盘表号instno、数量qty（合计）、