uu

common/api/order.js

@@ -48,4 +48,15 @@ export const getCaculteDestSite = (data = {})=> {
 	return coreRequest(url.getCaculteDestSite, data, {}, "GET")
 }
 
+// 计算运费
+export const calcWaybillFee = (data = {})=> {
+	return coreRequest(url.calcWaybillFee, data, {}, "GET")
+}
+
+// 下单-进仓列表
+export const warehouseInList = (data = {})=> {
+	return coreRequest(url.warehouseInList, data, {}, "GET")
+}
+ 
+
  

common/api/url.js

@@ -19,6 +19,8 @@ export default {
   getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
   getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表
   getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地
+  calcWaybillFee: `/emis/emisQuotePrice/calcWaybillFee`, // 计算运费
+  warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表
   
 }
 

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

@@ -56,7 +56,7 @@
 				}
 				if(totalVolume && totalVolume.toFixed) {
 					totalVolume = totalVolume.toFixed(2)
-					this.modelInfo.totalVolume = totalVolume
+					this.calcuOther({ totalVolume })
 				}
 				return totalVolume
 			}
@@ -82,7 +82,9 @@
 		},
 
 		methods: {
-			
+			calcuOther({ totalVolume }) {
+				this.modelInfo.totalVolume = totalVolume
+			}
 		}
 	}
 </script>

pages/post/openorder.vue

@@ -105,7 +105,7 @@
 							</view>
 						</view>
 						
-						<view class="yunf-input-item">
+						<view v-if="submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5" class="yunf-input-item">
 							<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true"
 								@onChange="handleYueJieSelect"
 							>
@@ -140,16 +140,10 @@
 						</view>
 						
 						<view class="yunf-input-item">
-							<tpx-select v-model:value="submitParam.type2" :list="[]"
-								mode="drop" customInput="true"
+							<tpx-select v-model:value="submitParam.inNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" :customInput="true"
+								searchParam=""
 							>
-								<u-row justify="between">
-									<text class="font-26 font-weight">进仓单</text>
-									<u-row justify="end" align="center">
-										<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
-										<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-									</u-row>
-								</u-row>
+								<tpx-text-item label="进仓单" :value="submitParam.inNo" :list="wareRes.list"></tpx-text-item>
 							</tpx-select>
 						</view>
 						
@@ -285,6 +279,7 @@
 				shoupaiRes: { list: [] },
 				yuejieRes: { list: [] },
 				destPostRes: { list: [] },
+				wareRes: { list: [] },
 				goodChooseModal: { 
 					show: false,
 				},
@@ -315,6 +310,8 @@
 			getMonthpayAccountList: apiService.getMonthpayAccountList,
 			getDestPositionList: apiService.getDestPositionList,
 			getCaculteDestSite: apiService.getCaculteDestSite,
+			getWarehouseInList: apiService.warehouseInList,
+			 
 			async initData() {
 				// uni.showLoading({
 				// 	title: '加载中'