From e2b0358e75fd9acbffa417c46dbf39cff60ab3c5 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 22 Dec 2024 11:18:02 +0800
Subject: [PATCH] uu

---
 .../bpe-gooditem-edit-tmp.vue                 |  2 +-
 .../bpe-goodsize-tmp.vue                      |  2 +-
 .../bpe-goodstatic-tmp.vue                    |  6 +++---
 pages/post/model.js                           |  3 ---
 pages/post/post.vue                           | 20 +++++++++----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
index f3086d3..26dfc18 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -25,7 +25,7 @@
 	</view>
 	
 	<view class="edm-input-item mt-20">
-		<tpx-text-item :required="true" label="包裹重量" >
+		<tpx-text-item :required="true" label="实际重量" >
 			<template #right>
 				<tpx-input v-model:value="modelInfo.billWeight" placeholder="" :customStyle="`${comInSty}`" inputAlign="right" suffix="kg" _digit="4"></tpx-input>
 			</template>
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index 143fc6e..38641c0 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -10,7 +10,7 @@
 		</view>
 		<view class="jsfm-item">
 			<u-row justify="between">
-				<text class="font-28 font-weight">包裹重量</text>
+				<text class="font-28 font-weight">实际重量</text>
 				<view>
 					<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="4"></tpx-input>
 				</view>
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 0b3c2ce..bfd48e6 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="pb-20">
-		<u-row>
+		<view>
 			<view class="clr-sub pr-10">货物名称</view> 
-			<view class="text-1-line" style="flex: 1;">
+			<view v-if="modelInfo.goodsInfo" class="pt-10" style="word-wrap: break-word;">
 				{{modelInfo.goodsInfo}}
 			</view>
-		</u-row>
+		</view>
 		<!-- <view class="pt-10">
 			<text class="clr-sub pr-10">货物大类</text> {{modelInfo.goodsType}}
 		</view> -->
diff --git a/pages/post/model.js b/pages/post/model.js
index 213a929..e38328f 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -223,8 +223,5 @@ export const checkSubmitParams = (params = {})=> {
 	if(!params._agreePrivacy) {
 		errMsg.push('请同意《快件运单契约条款》')
 	}
-	if(params.cargoList.length == 0) {
-		errMsg.push('请添加货物信息')
-	}
 	return { bl: errMsg.length == 0, errMsg }
 }
\ No newline at end of file
diff --git a/pages/post/post.vue b/pages/post/post.vue
index 5adc7f5..d68713b 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -43,13 +43,6 @@
 						
 						<view>
 							<view v-if="submitParam.pickupMethod == 1">
-								<view class="yunf-input-item">
-									<tpx-select v-model:value="submitParam.salesmen" v-model:text="submitParam.salesmen" v-model:resObject="salemanRes" :getListFun="getSalemanList" :transKeyVal="{valKey: 'empName',titleKey: 'empName'}"
-										placeholder="请选择销售联系人" 
-									>
-										<tpx-text-item :required="true" label="销售联系人" :value="submitParam.salesmen"></tpx-text-item>
-									</tpx-select> 
-								</view>
 								
 								<view class="yunf-input-item">
 									<tpx-select v-model:value="submitParam.intoWarehouseCode" v-model:text="submitParam.intoWarehouseName" v-model:resObject="wareRes" 
@@ -109,6 +102,13 @@
 								>
 									<tpx-text-item :required="true" label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
 								</tpx-select>
+							</view>
+							<view v-if="submitParam.pickupMethod == 1 && !isShowYueJie" class="yunf-input-item">
+								<tpx-select v-model:value="submitParam.salesmen" v-model:text="submitParam.salesmen" v-model:resObject="salemanRes" :getListFun="getSalemanList" :transKeyVal="{valKey: 'empName',titleKey: 'empName'}"
+									placeholder="请选择销售联系人" 
+								>
+									<tpx-text-item :required="true" label="销售联系人" :value="submitParam.salesmen"></tpx-text-item>
+								</tpx-select> 
 							</view>
 							<template v-if="isShowYueJie">
 								<view class="yunf-input-item">
@@ -170,13 +170,13 @@
 							
 						</u-row>
 					</view>
-					<view class="blcok-white" @click="handleDialogClick(goodChooseModal)">
-						<u-row custom-style="padding-bottom: 10rpx;" >
+					<view class="blcok-white pos-rlt" @click="handleDialogClick(goodChooseModal)">
+						<view style="position: absolute;right: 20rpx;top: 20rpx;">
 							<u-row>
 								<u-icon name="edit-pen" size="42"></u-icon>
 								<span class="font-28 pl-10 clr-prm">编辑</span>
 							</u-row>
-						</u-row>
+						</view>
 						
 						<bpe-goodstatic-tmp v-model:value="submitParam"></bpe-goodstatic-tmp>
 					</view>