uu

components/buns-post-edit-templates/bpe-goodsize-tmp.vue

@@ -84,6 +84,9 @@
 		methods: {
 			calcuOther({ totalVolume }) {
 				this.modelInfo.totalVolume = totalVolume
+				this.modelInfo.volumeWeight = (this.modelInfo.totalVolume ) * (1000000 / this.modelInfo.meterRate)
+				let maxVal = Math.max(this.modelInfo.volumeWeight, this.modelInfo.billWeight)
+				this.modelInfo.settlementWeight = this.modelInfo.totalWeight = maxVal
 			}
 		}
 	}

components/tpx-select/tpx-select.vue

@@ -136,11 +136,11 @@
 			}
 		},
 		created() {
-			document.addEventListener('click', this.handleDocumentClick)
+			// document.addEventListener('click', this.handleDocumentClick)
 		},
 		
 		unmounted() {
-			document.removeEventListener('click', this.handleDocumentClick)
+			// document.removeEventListener('click', this.handleDocumentClick)
 		},
 
 		methods: {

components/tpx-text-item/tpx-text-item.vue

@@ -23,7 +23,9 @@
 			title() {
 				let title = this.value
 				!this.value && this.list && (title = '请选择');
-				this.value && this.list && (title = this.list.filter(t=> t.val == this.value)[0].title);
+				if(this.value && this.list) {
+					title = this.list.filter(t=> t.val == this.value || this.value.indexOf(t.val) > -1).map(t=> t.title).join(",")
+				}
 				return title
 			}
 		},

pages/post/model.js

@@ -57,7 +57,7 @@ export const getOrderModels = () => {
 		"totalVolume": undefined, // 总体积
 		"parcelQty": undefined, // 总件数
 		"billWeight": undefined, // 实际重量
-		"volumeWeight": undefined, // 体积重量
+		"volumeWeight": undefined, // 体积重量 = 实际体积(立方厘米)*(1000000/泡重比) （长宽高都是按 cm 来计量的 ）
 		"currency": undefined,
 		"settlementWeight": undefined, // 结算重量
 		"feeWeight": undefined,
@@ -130,5 +130,7 @@ export const getOrderModels = () => {
 		"prepareInBillCode": undefined, // 快递单号
 		"prepareInRemark": undefined, // 预入仓自定义标识
 		"prepareInSupplier": undefined, // 预入仓供应商
+		"warehouseInNo": undefined, // 进仓单号
+		"meterRate": undefined, // 泡重比
 	}
 }

pages/post/openorder.vue

@@ -39,7 +39,7 @@
 						<template v-if="submitParam.reciever.country && submitParam.sender.country">
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :customInput="true" 
-									:searchParam="waySearchParam"
+									:searchParam="waySearchParam" @onChange="handleWayChange" 
 								>
 									<tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
 								</tpx-select>
@@ -140,10 +140,10 @@
 						</view>
 						
 						<view class="yunf-input-item">
-							<tpx-select v-model:value="submitParam.inNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" :customInput="true"
-								searchParam=""
+							<tpx-select v-model:value="submitParam.warehouseInNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" :customInput="true"
+								searchParam="" type="multiple"
 							>
-								<tpx-text-item label="进仓单" :value="submitParam.inNo" :list="wareRes.list"></tpx-text-item>
+								<tpx-text-item label="进仓单" :value="submitParam.warehouseInNo" :list="wareRes.list"></tpx-text-item>
 							</tpx-select>
 						</view>
 						
@@ -336,6 +336,10 @@
 				this.submitParam.salesmenName = item.salesmenName
 				this.submitParam.payeeName = item.payeeName
 			},
+			handleWayChange(val) {
+				const item = this.wayRes.list.filter(t=> t.val == val)[0]
+				this.submitParam.meterRate = item.meterRate
+			},
 			handleDialogClick(curModal){
 				curModal.show = true
 			}