uu

common/api/order.js

@@ -98,7 +98,7 @@ export const verifyBindMonthPayCode = (data = {})=> {
 
 // 下载进仓单PDF
 export const exportWarehouseInTpl = (data = {})=> {
-	return coreRequest(url.exportWarehouseInTpl, data, {})
+	return coreRequest(url.exportWarehouseInTpl, data, {}, "GET")
 }
 
 // 确认进仓单

pages/post/post.vue

@@ -398,6 +398,7 @@
 				params.goodsPics = params.goodsPics.join(",")
 				params.totalVolume = params.totalVolume || 0
 				setBindTsm(params)
+				params._loading = true
 				await saveServerHand(params)
 				await this.saveSuccessBack()
 			},

pages/user/monthCardList.vue

@@ -21,7 +21,7 @@
 							<!-- 列表数据 -->
 							 <!--  -->
 							<view>
-								<view v-for="(item) in dataList" class="blcok-white radius-20 mb-20" style="margin-top: 0;"
+								<view v-for="(item) in resData.list" class="blcok-white radius-20 mb-20" style="margin-top: 0;"
 									@click="handleTODetail(item)"
 								>
 									<view>
@@ -29,12 +29,12 @@
 											<u-row @click="handleItemClick(item)">
 												<u-avatar size="100" shape="square"></u-avatar>
 												<view class="pl-10">
-													<u-text :text="'月结账号 TANO2500123'" size="30" :bold="true" lines="1"></u-text>
+													<u-text :text="`月结账号 ${item.custNo}`" size="30" :bold="true" lines="1"></u-text>
-													<u-text margin="10rpx 0 0 0" :text="'平湖华盛进出口有限公司'" size="28" color="#999"></u-text>
+													<u-text margin="10rpx 0 0 0" :text="item.custName" size="28" color="#999"></u-text>
 												</view>
 											</u-row>
 											<u-row justify="end" align="top" custom-style="width: 100rpx;height:100rpx;"
-												@click="setClipboardData('xxxxxxx' + item.id)"
+												@click="setClipboardData(item.custNo)"
 											>
 												<u-icon name="file-text" size="38"></u-icon>
 											</u-row>
@@ -149,6 +149,7 @@
 			},
 			async handleConfirmBind(){
 				let res = await apiService.verifyBindMonthPayCode({ ...this.bindModal.data, _loading: true })
+				this.bindModal.show = false
 				this.showToast('绑定成功')
 				this.triggerListReload()
 			}

pages/warehousing/detail.vue

@@ -5,7 +5,7 @@
 			<template v-slot:body>
 				<view class="dt-block">
 					<view class="dt-tle">
-						<view class="t1">订单号: {{postInfo.billCode}}</view>
+						<view @click="setClipboardData(postInfo.billCode)" class="t1">订单号: {{postInfo.billCode}}</view>
 						<view class="t2">
 							<text class="clr-prm"></text>
 						</view>
@@ -83,14 +83,14 @@
 						</view>
 					</view>
 					
-					<view v-for="(clItem) in [{}, {}, {}]" class="yditem">
+					<view v-for="(gdItem) in item.cargoList" class="yditem">
 						<view class="ydi-lab">
-							<text class="font-weight">塑料拉链</text>
+							<text class="font-weight">{{gdItem.goodsName}}</text>
-							<text>破损:1</text>
+							<text>异常:{{gdItem.abnormalQty}}</text>
 						</view>
 						<view class="ydi-lab mt-10">
-							<text class="clr-sub">品牌 规格 原产地</text>
+							<text class="clr-sub">{{gdItem.brand}} - {{gdItem.nationArea}}</text>
-							<text class="clr-prm">实入:10</text>
+							<text class="clr-prm">实入:{{gdItem.cargoQty}}</text>
 						</view>
 					</view>
 					
@@ -164,8 +164,11 @@
 							<u-row>
 								<u-button @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
 									custom-style="height: 54rpx;margin-left: 20rpx;">反馈异常</u-button>
-								<u-button @click="confirmJinCang(item.inNo)" shape="circle" type="primary" 
+								
-									custom-style="height: 54rpx;margin-left: 20rpx;">进仓确认</u-button>
+								<u-button :disabled="item.confirmStatus==2" @click="confirmJinCang(item.inNo)" shape="circle" type="primary" 
+									custom-style="height: 54rpx;margin-left: 20rpx;">
+									{{item.confirmStatus==2?'已确认进仓':'进仓确认'}}
+								</u-button>
 							</u-row>					
 						</view>
 					</u-row>
@@ -178,8 +181,8 @@
 						<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 @click="confirmJinCang()" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						<u-button :disabled="billInfo.confirmStatus==2" @click="confirmJinCang()" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-						>已确认可发货
+						>{{billInfo.confirmStatus==2?'已确认进仓':'确认可发货'}}
 						</u-button>
 					</u-row>
 				</view>
@@ -196,8 +199,6 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
 	import BpeAddressjiamiTmp from "@/components/buns-post-edit-templates/bpe-addressjiami-tmp"
 	import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
 	import * as apiService from "@/common/api"
@@ -286,8 +287,7 @@
 					confirmStatus = '1'
 					inNo = this.billInfo.inNo
 				}
-				let res = await apiService.cusConfirmWsIn({ inNo, _loading: true })
+				let res = await apiService.cusConfirmWsIn({ inNo, confirmStatus, _loading: true })
-				debugger
 				this.initData()
 			},
 		}

pages/warehousing/list.vue

@@ -64,8 +64,8 @@
 							<!-- 列表数据 -->
 							<view v-for="(item) in resData.list" class="ord-list-item">
 								<u-row justify="between">
-									<text>进仓单号:{{item.inNo}}</text>
+									<text @click="setClipboardData(item.inNo)">进仓单号:{{item.inNo}}</text>
-									<view class="com-tag-grey font-26">
+									<view class="com-tag-grey font-26" style="min-width: 120rpx;text-align: center;white-space: nowrap;">
 										<tetx v-if="item.status == 0">未入仓</tetx>
 										<tetx v-if="item.status == 1">已入仓</tetx>
 										<tetx v-if="item.status == 2">部分入仓</tetx>