From e28a0b08a50e9d17ad472b1a6bcba1943633b77a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 31 Aug 2024 11:54:14 +0800
Subject: [PATCH] uu

---
 pages/deliveryDeal/storage.vue | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pages/deliveryDeal/storage.vue b/pages/deliveryDeal/storage.vue
index 800c263..fdab96d 100644
--- a/pages/deliveryDeal/storage.vue
+++ b/pages/deliveryDeal/storage.vue
@@ -15,9 +15,9 @@
 						</u-row>
 					</view>
 					
-					<view class="mt-30" @click="goto(``)">
+					<view v-if="submitParam.inNo" class="mt-30" @click="goto(`post/detail?billCode=${billInfo.billCode}`)">
 						<u-row justify="space-between">
-							<view class="com-section">进仓单号：TWO291929</view>
+							<view class="com-section">进仓单号：{{submitParam.inNo || '-'}}</view>
 							<view>
 								<button size="mini">订单详情</button>
 							</view>
@@ -26,17 +26,17 @@
 					
 					<view class="blcok-white">
 						<u-row justify="between">
-							<view class="font-30 font-weight">缅甸</view>
-							<view class="font-30 font-weight">缅甸特快</view>
+							<view class="font-36 font-weight">{{billInfo.receiveCountryName || '-'}}</view>
+							<view class="font-30 font-weight">{{billInfo.productTypeName || '-'}}</view>
 						</u-row>
 						<u-row custom-style="margin-top:20rpx;" justify="between">
 							<view >
 								<text class="clr-sub">寄件人：</text>
-								<text>李先生</text>
+								<text>{{billInfo.sendName || '-'}}</text>
 							</view>
 							<view >
 								<text class="clr-sub">手机号：</text>
-								<text>18627068352</text>
+								<text>{{billInfo.sendMobile || '-'}}</text>
 							</view>
 						</u-row>
 					</view>
@@ -44,14 +44,14 @@
 					
 					<view class="com-section mt-30">托寄货物描述</view>
 					<view class="blcok-white">
-						<tpx-input placeholder="进仓后缀" :isWhite="true"></tpx-input>
+						<tpx-input placeholder="进仓后缀" v-model:value="submitParam.inBatchNo" :isWhite="true"></tpx-input>
 						<view class="mt-30">
 							<bpe-gooditem-edit-tmp :value="submitParam"></bpe-gooditem-edit-tmp>
 						</view>
 					</view>
 					
 					<view class="blcok-white">
-						<bpe-goodphoto-tmp title="货物照片" :value="submitParam" filedName="phName"></bpe-goodphoto-tmp>
+						<bpe-goodphoto-tmp title="货物照片" :value="submitParam" filedName="picUrl"></bpe-goodphoto-tmp>
 					</view>
 					
 					<view class="blcok-white">
@@ -63,7 +63,7 @@
 						<u-row justify="space-between" align="top" custom-style="margin-top:20rpx;">
 							<view >备注</view>
 							<view style="width: 70%;">
-								<u-textarea v-model="submitParam.otherDes" border="surround" height="120" placeholder="备注"
+								<u-textarea v-model="submitParam.remark" border="surround" height="120" placeholder="备注"
 									maxlength="300" count></u-textarea>
 							</view>
 						</u-row>
@@ -74,10 +74,10 @@
 			<template v-slot:footer>
 				<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
 					<u-row>
-						<u-button @click="handleJinCang" size="large" shape="circle" 
+						<u-button @click="handleJinCang" :disabled="!submitParam.inNo" size="large" shape="circle" 
 							custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">进仓登记</u-button>
 							
-						<u-button @click="goto(`todo/detail`)" size="large" shape="circle" 
+						<u-button @click="goto(`todo/detail`)" :disabled="!submitParam.inNo" size="large" shape="circle" 
 							custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary">货齐开单</u-button>
 					</u-row>
 				</view>
@@ -90,6 +90,7 @@
 
 <script>
 	import { debounce } from "@/common/util"
+	import dayjs from "dayjs"
 	import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
 	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
 	import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp"
@@ -114,7 +115,8 @@
 				},
 				submitParam: {
 					
-				}
+				},
+				billInfo: {}
 			}
 		},
 		onShareAppMessage() {
@@ -138,7 +140,12 @@
 				if(!res.data) {
 					this.showToast("进仓单号数据不存在")
 				}
-				this.submitParam = res.data || {}
+				let data = res.data || {}
+				this.submitParam = Object.assign({}, data, {
+					cargoList: [],
+					entryDate: dayjs().format("YYYY-MM-DD HH:mm:ss"),// 下单时间
+				})
+				this.billInfo = res?.data?.waybillDetail || []
 				this.pageLoading = false
 			},
 			handleScanValChange: debounce(function(){
@@ -155,6 +162,7 @@
 			},
 			resetForm() {
 				this.submitParam = {}
+				this.billInfo = {}
 				this.inNo = ''
 			}