uu

common/custom.scss

@@ -64,6 +64,21 @@
 	-webkit-line-clamp: 1;
 	-webkit-box-orient: vertical;
 }
+.label-text{
+	position: relative;
+	display: inline-block;
+	margin-right: 20rpx;
+}
+.label-text-required{
+	&::after{
+		position: absolute;
+		font-size: 34rpx;
+		content: '*';
+		color: $uni-color-primary;
+		right: -16rpx;
+		top: 8%;
+	}
+}
 %blcok {
 	margin-top: 30rpx;
 	border-radius: 30rpx;

components/buns-edit-sheet/buns-edit-sheet.vue

@@ -56,7 +56,12 @@
 					return {
 					}
 				}
-			}
+			},
+			okCloseModal: {
+				default () {
+					return true
+				}
+			},
 		},
 		data() {
 			return {
@@ -80,7 +85,7 @@
 				const val = this.submitVals
 				this.$emit('onSure', val)
 				this.$emit('update:value', val)
-				this.handleCloseModal()
+				this.okCloseModal && this.handleCloseModal()
 			}
 		}
 	}

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

@@ -94,27 +94,27 @@
 		</view>
 	</view>
 	
-	<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure">
+	<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">
 		<u-row custom-style="gap: 20rpx;margin-top:10rpx;">
 			<u-row custom-style="flex: 1">
-				<text class="font-26 pr-10">首重费</text>
+				<text class="font-26 label-text">首重费</text>
 				<tpx-input v-model:value="tempObject.value.initialWeightFee" _digit="5"  :isWhite="true"
 					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
 			</u-row>
 			<u-row custom-style="flex: 1">
-				<text class="font-26 pr-10">续重单价</text>
+				<text class="font-26 label-text">续重单价</text>
 				<tpx-input v-model:value="tempObject.value.addWeightPrice"  _digit="5" :isWhite="true"
 					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
 			</u-row>
 		</u-row>
 		<u-row style="margin-top:30rpx;" justify="between">
 			<u-row custom-style="width:300rpx;">
-				<text class="pr-20">应收</text>
+				<text class="label-text">应收</text>
 				<tpx-input v-model:value="tempObject.value.fee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
 					suffix="CNY"></tpx-input>
 			</u-row>
 			<u-row custom-style="width:300rpx;">
-				<text class="font-26 pr-20">实收</text>
+				<text :class="`font-26 label-text ${tempObject.value.feeCode == '9999'?'label-text-required':''} `">实收</text>
 				<tpx-input v-model:value="tempObject.value.realFee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
 					suffix="CNY"></tpx-input>
 			</u-row>
@@ -248,8 +248,15 @@
 				})
 				this.modelInfo.freight = total
 			},
-			handleCostItemSure(data){
+			async handleCostItemSure(data){
+				if(data.feeCode == '9999')  {
+					if(!data.realFee) {
+						this.showToast("实收不能为空")
+						return false
+					}
+				}
 				this.modelInfo.feeItems.push({ ...data })
+				this.costModal.show = false
 				setTimeout(()=>{
 					this.calteFreight()
 				}, 500)

pages/post/freightCalculate.vue

@@ -62,7 +62,13 @@
 									<tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
 								</tpx-select>
 							</view>
-							
+							<view class="yunf-input-item">
+								<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" 
+									:searchParam="yuejieSearchParam" :minChecked="0" placeholder="请选择月结账户"
+								>
+									<tpx-text-item label="月结账户" :list="yuejieRes.list" :value="submitParam.custNo"></tpx-text-item>
+								</tpx-select>
+							</view>
 							<view class="yunf-input-item" >
 								<tpx-text-item label="重量">
 									<template v-slot:right>
@@ -150,9 +156,6 @@
 	export default {
 		components: { },
 		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
 		},
 		watch:{
 			submitParam: {
@@ -176,6 +179,10 @@
 				const { country } = this.submitParam.reciever
 				return { countryCode: country, regionType: 1 }
 			},
+			yuejieSearchParam(){
+				let { empName } = this.$store.getters.userInfo
+				return {  payee: empName, salesmen: empName }
+			},
 			dicData() {
 			  return this.$store.getters.dicData
 			},
@@ -211,6 +218,7 @@
 					countryRes: { list: [] }, 
 					provRes: { list: [] },
 					wayRes: { list: [] },
+					yuejieRes: { list: [] }, 
 					productType: '',
 					productTypeName: '',
 					submitParam: {
@@ -228,6 +236,7 @@
 						customsEclaration:"", // 清关方式
 						sendSiteCode: ownerSiteCode, // 发件站点
 						sendSiteName: ownerSiteName, // 发件站点名称
+						custNo: '', // 月结账号
 					}
 				}
 			},
@@ -235,6 +244,7 @@
 			getTransLineList: apiService.getTransLineList,
 			getEmisRegion: apiService.getEmisRegion,
 			getSendSiteList: apiService.getSendSiteList,
+			getMonthpayAccountList: apiService.getMonthpayAccountList,
 			async initData() { // 初始化
 				this.pageLoading = false
 			},