From c860cbba364ec623f3f02a37688a9c4c820f33ed Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 1 Sep 2024 20:02:28 +0800
Subject: [PATCH] uu

---
 common/api/order.js            |  12 ++--
 common/api/url.js              |   2 +-
 pages/deliveryDeal/storage.vue |   2 +-
 pages/warehousing/detail.vue   | 107 +++++++++++++++------------------
 4 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index dfbce6e..9c5f24c 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -208,12 +208,12 @@ export const getWarehouseInList = (data = {})=> {
 	return coreRequest(url.getWarehouseInList, data, {}, "GET")
 }
 
-// 进仓单登记-列表
-export const getWarehouseBatchInList = (data = {})=> {
-	return coreRequest(url.getWarehouseBatchInList, data, {}, "GET")
-}
-
 // 进仓单PDF下载连接
 export const exportWarehouseInTpl = (data = {})=> {
 	return coreRequest(url.exportWarehouseInTpl, data, {})
-} 
\ No newline at end of file
+} 
+
+// 确认进仓单
+export const cusConfirmWsIn = (data = {})=> {
+	return coreRequest(url.cusConfirmWsIn, data, {})
+}
diff --git a/common/api/url.js b/common/api/url.js
index a019235..362b3af 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -64,7 +64,7 @@ export default {
   getWarehouseInInfo: `/emis/emisWarehouseIn/getWarehouseInInfo`, // 获取进仓单详情
   registerWarehouseInInfo: `/emis/emisWarehouseInBatch/registerWarehouseInInfo`, // 收货入仓登记
   getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
-  getWarehouseBatchInList: `/emis/emisWarehouseIn/getWarehouseBatchInList`, // 进仓单登记-列表
   exportWarehouseInTpl: `/emis/emisWarehouseIn/exportWarehouseInTpl`, // 进仓单PDF下载连接
+  cusConfirmWsIn: `/emis/emisWarehouseIn/cusConfirmWsIn`, // 确认进仓单
 }
 
diff --git a/pages/deliveryDeal/storage.vue b/pages/deliveryDeal/storage.vue
index d310587..af0ca42 100644
--- a/pages/deliveryDeal/storage.vue
+++ b/pages/deliveryDeal/storage.vue
@@ -157,7 +157,7 @@
 				let params = JSON.parse(JSON.stringify(this.submitParam));
 				params.picUrl = params?.picUrl?.join?.(",")
 				params._loading = true
-				await apiService.registerWarehouseInInfo({params, _loading: true})
+				await apiService.registerWarehouseInInfo({...params, _loading: true})
 				this.showToast('操作成功')
 				this.resetForm()
 			},
diff --git a/pages/warehousing/detail.vue b/pages/warehousing/detail.vue
index 321f600..0fa92a3 100644
--- a/pages/warehousing/detail.vue
+++ b/pages/warehousing/detail.vue
@@ -18,7 +18,7 @@
 				</view>
 				
 				<view class="dt-block">
-					<view class="dt-tle" @click="setClipboardData(postInfo.intoWarehousePhone)">
+					<view class="dt-tle" @click="handleCopyWareHouse()">
 						<view class="t1">{{postInfo.intoWarehouseName}}联系信息</view>
 						<view class="t2">
 							<u-icon name="file-text" size="38" custom-style=""></u-icon>
@@ -50,7 +50,7 @@
 					<view class="dt-item font-28">
 						<view>
 							<text class="pr-20 clr-sub">总重量:</text>
-							<text class="">{{billInfo.billWeight}} kg</text>
+							<text class="">{{billInfo. totalWeight }} kg</text>
 						</view>
 						<view>
 							<text class="pr-20 clr-sub">总体积:</text>
@@ -58,40 +58,14 @@
 						</view>
 						<view>
 							<text class="pr-20 clr-sub">总件数:</text>
-							<text class="">{{billInfo.parcelQty}}</text>
+							<text class="">{{billInfo.totalParcelQty}}</text>
 						</view>
 					</view>
-					<!-- <bpe-goodstatic-tmp v-model:value="postInfo"></bpe-goodstatic-tmp> -->
-					<view v-for="(item) in billInfo.cargoSumList" class="yditem">
-						<view class="ydi-lab">
-							<text class="font-weight">女士针织棉上衣</text>
-							<text>预报: 300</text>
-						</view>
-						<view class="ydi-lab mt-10">
-							<text class="clr-sub">无 12L 中国内地</text>
-							<text>实入仓: 0</text>
-						</view>
-						<view class="ydi-lab mt-10">
-							<text class="clr-prm">12 CNY</text>
-						</view>
-					</view>
-					
-					<!-- <u-row justify="end">
-						<view style="display: inline-block;white-space: nowrap;" class="mt-10">
-							<u-row>
-								<u-button shape="circle" type="primary"
-									custom-style="height: 54rpx;margin-left: 20rpx;">进仓单</u-button>
-								<u-button shape="circle" type="primary" :plain="true"
-									custom-style="height: 54rpx;margin-left: 20rpx;">补单证资料</u-button>
-							</u-row>					
-						</view>
-					</u-row> -->
-					
 				</view>
 				
-				<view v-for="(item) in jcList" class="dt-block" style="padding-bottom: 2rpx;">
+				<view v-for="(item) in billInfo.stockInBatchList" class="dt-block" style="padding-bottom: 2rpx;">
 					<view class="dt-tle">
-						<view class="t1">进仓单号:TAN-102032138002</view>
+						<view class="t1">进仓单号:{{item.inNo}}</view>
 						<view class="t2">
 							<!-- <text class="clr-prm">{{'部分入仓'}}</text> -->
 						</view>
@@ -101,11 +75,11 @@
 					<view class="dt-item font-28">
 						<view>
 							<text class="pr-20 clr-sub">进仓时间:</text>
-							<text class="font-weight">2023-77-20 09:25</text>
+							<text class="font-weight">{{item.entryDate}}</text>
 						</view>
 						<view>
 							<text class="pr-20 clr-sub">操作员:</text>
-							<text class="font-weight">王小明</text>
+							<text class="font-weight">{{item.createByName}}</text>
 						</view>
 					</view>
 					
@@ -124,64 +98,62 @@
 						<view class="dt-item font-28">
 							<view>
 								<text class="pr-20 clr-sub">重量:</text>
-								<text class="">30 kg</text>
+								<text class="">{{item.totalWeight}} kg</text>
 							</view>
 							<view>
 								<text class="pr-20 clr-sub">体积:</text>
-								<text class="">30m</text>
+								<text class="">{{item.totalVolume}}m³</text>
 							</view>
 							<view>
 								<text class="pr-20 clr-sub">件数:</text>
-								<text class="">10</text>
+								<text class="">{{item.totalParcelQty}}</text>
 							</view>
 						</view>
 						
 						<view class="dt-item font-28">
-							<view>
+							<u-row>
 								<text class="pr-20 clr-sub">包装类型:</text>
-								<text class="">纸箱</text>
-							</view>
+								<tpx-text-dic :value="item.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
+							</u-row>
 							<view>
 								<text class="pr-20 clr-sub">供应商:</text>
-								<text class="">南京制衣有限公司</text>
+								<text class="">{{item.prepareInSupplier}}</text>
 							</view>
 						</view>
 						<view class="dt-item font-28">
 							<view>
 								<text class="pr-20 clr-sub">同行快:</text>
-								<text class="">顺丰</text>
+								<text class="">{{item.prepareInExpress}}</text>
 							</view>
 							<view>
 								<text class="pr-20 clr-sub">快递单号:</text>
-								<text class="">SF01023293239</text>
+								<text class="">{{item.prepareInBillCode}}</text>
 							</view>
 						</view>
-						<view class="dt-item font-28">
+						<view v-if="item.blPrepareInFreight == '1'" class="dt-item font-28">
 							<view>
 								<text class="pr-20 clr-sub">代垫运费:</text>
-								<text class="font-weight clr-prm">￥30</text>
+								<text class="font-weight clr-prm">￥{{item.prepareInEstFee}}</text>
 							</view>
 						</view>
 						
 						<view class="dt-item font-28">
 							<view>
 								<text class="pr-20 clr-sub">发货备注:</text>
-								<text class=" ">需要检查下产品规格型号是否一致，请拍照</text>
+								<text class=" ">{{item.prepareInRemark}}</text>
 							</view>
 						</view>
 						
 						<view class="dt-item font-28" style="margin-bottom: 10rpx;">
 							<view>
 								<text class="pr-20 clr-sub">仓库收货备注:</text>
-								<text class=" ">发现有异常，见拍照图片</text>
+								<text class=" ">{{item.remark}}</text>
 							</view>
 						</view>
 						<view class="mb-20">
 							<u-row>
-								<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
-									custom-style="margin: 20rpx 20rpx 0 0;"
-								></u-image>
-								<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
+								<u-image v-for="(sImgUrl, simIndex) in item.picUrl"
+									@click="handlePreviewImgs(item.picUrl, simIndex)" :src="sImgUrl" width="100" height="50" mode="aspectFill"
 									custom-style="margin: 20rpx 20rpx 0 0;"
 								></u-image>
 							</u-row>
@@ -192,7 +164,7 @@
 							<u-row>
 								<u-button @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
 									custom-style="height: 54rpx;margin-left: 20rpx;">反馈异常</u-button>
-								<u-button shape="circle" type="primary" 
+								<u-button @click="confirmJinCang(item.inNo)" shape="circle" type="primary" 
 									custom-style="height: 54rpx;margin-left: 20rpx;">进仓确认</u-button>
 							</u-row>					
 						</view>
@@ -206,7 +178,7 @@
 						<u-button @click="handleDownloadPdf()" :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
 						>下载PDF
 						</u-button>
-						<u-button type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						<u-button @click="confirmJinCang()" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
 						>已确认可发货
 						</u-button>
 					</u-row>
@@ -238,6 +210,9 @@
 			// }
 		},
 		computed: {
+			dicData() {
+			  return this.$store.getters.dicData
+			},
 		},
 		data() {
 			return {
@@ -276,29 +251,45 @@
 					this.showToast("进仓单号数据不存在")
 				}
 				let data = res.data || {}
+				data?.stockInBatchList?.map?.(t=> {
+					t.picUrl && (t.picUrl = t.picUrl.split(","))
+				})
 				this.billInfo = data
 				if(data.billCode) {
 					let ores = await apiService.getOrderDetail({ billCode: data.billCode })
 					this.postInfo = ores.data
-					let baListRes = await apiService.getWarehouseBatchInList({...params})
-					debugger
 				}
 				this.pageLoading = false
 			},
 			handleDialogClick(curModal){
 				curModal.show = !curModal.show
 			},
-			handlePreviewDiDan() {
+			handleCopyWareHouse(){
+				let { intoWarehouseName, intoWarehouseContact,intoWarehousePhone, intoWarehouseAddress } = this.postInfo
+				let text = `仓库名称:${intoWarehouseName}\n仓库联系人:${intoWarehouseContact}\n仓库联系人电话：${intoWarehousePhone}\n仓库地址:${intoWarehouseAddress}`
+				this.setClipboardData(text)
+			},
+			handlePreviewImgs(list = [], index) {
 				uni.previewImage({
-					urls: [
-						this.getCdnUrl(`mine/kjcha.png`)
-					]
+					current: index,
+					urls: list
 				})
 			},
 			async handleDownloadPdf(){
 				let res = await apiService.exportWarehouseInTpl({ orderSn: this.postInfo.orderSn })
 				debugger
 			},
+			async confirmJinCang(inNo) {
+				// "confirmStatus": "1-确认 2-部分确认"
+				let confirmStatus = '2'
+				if(!inNo) {
+					confirmStatus = '1'
+					inNo = this.billInfo.inNo
+				}
+				let res = await apiService.cusConfirmWsIn({ inNo, _loading: true })
+				debugger
+				this.initData()
+			},
 		}
 	}
 </script>