uu

common/api/order.js

@@ -96,11 +96,6 @@ export const calcVolumeWeight = (data = {})=> {
 }
 
  
-// 下单-进仓列表
-export const warehouseInList = (data = {})=> {
-	return coreRequest(url.warehouseInList, data, {}, "GET")
-}
- 
 // 订单列表
 export const getOrderList = (data = {})=> {
 	return coreRequest(url.getOrderList, data, {}, "GET")
@@ -209,11 +204,16 @@ export const registerWarehouseInInfo = (data = {})=> {
 }
 
 // 进仓单列表
-export const queryWarehouseList = (data = {})=> {
+export const getWarehouseInList = (data = {})=> {
-	return coreRequest(url.queryWarehouseList, data, {}, "GET")
+	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, {})
+} 

common/api/url.js

@@ -36,7 +36,7 @@ export default {
   calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费
   calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量
   calcVolumeWeight: `/emis/emisWaybill/calcVolumeWeight`, // 体积重量计算 
-  warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表
+  
   getOrderList: `/emis/emisWaybill/listSimple`, // 订单列表
   getWaybillStatMap: `/emis/emisWaybill/getWaybillStatMap`, // 运单统计数据
   getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情
@@ -63,8 +63,8 @@ export default {
   
   getWarehouseInInfo: `/emis/emisWarehouseIn/getWarehouseInInfo`, // 获取进仓单详情
   registerWarehouseInInfo: `/emis/emisWarehouseInBatch/registerWarehouseInInfo`, // 收货入仓登记
-  queryWarehouseList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
+  getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
   getWarehouseBatchInList: `/emis/emisWarehouseIn/getWarehouseBatchInList`, // 进仓单登记-列表
-  
+  exportWarehouseInTpl: `/emis/emisWarehouseIn/exportWarehouseInTpl`, // 进仓单PDF下载连接
 }
 

pages/post/openorder.vue

@@ -398,7 +398,7 @@
 			getRSDStaffList: apiService.getRSDStaffList,
 			getMonthpayAccountList: apiService.getMonthpayAccountList,
 			getDestPositionList: apiService.getDestPositionList,
-			getWarehouseInList: apiService.warehouseInList,
+			getWarehouseInList: apiService.getWarehouseInList,
 			getPayeeList: apiService.getPayeeList,
 			getSalemanList: apiService.getSalemanList,
 			async initData() { // 初始化

pages/tabBar/order/order.vue

@@ -72,7 +72,7 @@
 										<u-row>
 											<u-button v-if="item.pickupMethod == 1 && item.intoWarehouseBillCode"
 												@click="handleDealItem(item, { type: 6 })" shape="circle" type="primary"
-												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">入仓扫描</u-button>
+												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">进仓单</u-button>
 
 											<template v-if="item.orderStatus == 0">
 												<u-button @click="handleDealItem(item, { type: 1 })" shape="circle"
@@ -285,8 +285,8 @@
 					case 5: // 签收扫描
 						this.goto(`deliveryDeal/signedScanning${itemQuery}`)
 						break;
-					case 6: // 入仓扫描
+					case 6: // 进仓单详情
-						this.goto(`deliveryDeal/storage${itemQuery}&inNo=${item.intoWarehouseBillCode}`)
+						this.goto(`warehousing/detail${itemQuery}&inNo=${item.intoWarehouseBillCode}`)
 						break;
 
 					default:

pages/warehousing/detail.vue

@@ -1,24 +1,25 @@
 <template>
+	<tpx-page>
 		<tpx-layout>
 			<template v-slot:header></template>
 			<template v-slot:body>
 				<view class="dt-block">
 					<view class="dt-tle">
-					<view class="t1">订单号: Tw891823727001</view>
+						<view class="t1">订单号: {{postInfo.billCode}}</view>
 						<view class="t2">
-						<text class="clr-prm">{{'待遗收'}}</text>
+							<text class="clr-prm"></text>
 						</view>
 					</view>
 					<u-line margin="20rpx 0 20rpx"></u-line>
 					<view>
-					<bpe-addressjiami-tmp v-model:value="submitParam"></bpe-addressjiami-tmp>
+						<bpe-addressjiami-tmp v-model:value="postInfo"></bpe-addressjiami-tmp>
 					</view>
 					
 				</view>
 				
 				<view class="dt-block">
-				<view class="dt-tle" @click="setClipboardData('xxxxxxx')">
+					<view class="dt-tle" @click="setClipboardData(postInfo.intoWarehousePhone)">
-					<view class="t1">柯桥仓库联系信息</view>
+						<view class="t1">{{postInfo.intoWarehouseName}}联系信息</view>
 						<view class="t2">
 							<u-icon name="file-text" size="38" custom-style=""></u-icon>
 						</view>
@@ -26,10 +27,10 @@
 					<u-line margin="20rpx 0 20rpx"></u-line>
 					<view>
 						<view>
-						<text class="font-weight font-28 pr-20">李先生</text>
+							<text class="font-weight font-28 pr-20">{{postInfo.intoWarehouseContact}}</text>
-						<text class="clr-sub font-28">18627068352</text>
+							<text class="clr-sub font-28">{{postInfo.intoWarehousePhone}}</text>
 						</view>
-					<u-text :text="'上海市大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界'"
+						<u-text :text="postInfo.intoWarehouseAddress"
 							size="24" margin="20rpx 0 0 0" color="#999" 
 						></u-text>
 					</view>
@@ -39,25 +40,29 @@
 					<view class="dt-tle">
 						<view class="t1">进仓货物总览</view>
 						<view class="t2">
-						<text class="clr-prm">{{'部分入仓'}}</text>
+							<tetx v-if="billInfo.status == 0">未入仓</tetx>
+							<tetx v-if="billInfo.status == 1">已入仓</tetx>
+							<tetx v-if="billInfo.status == 2">部分入仓</tetx>
+							<tetx v-if="billInfo.status == 3">全部入仓</tetx>
 						</view>
 					</view>
 					<u-line margin="20rpx 0 20rpx"></u-line>
 					<view class="dt-item font-28">
 						<view>
 							<text class="pr-20 clr-sub">总重量:</text>
-						<text class="">30 kg</text>
+							<text class="">{{billInfo.billWeight}} kg</text>
 						</view>
 						<view>
 							<text class="pr-20 clr-sub">总体积:</text>
-						<text class="">30m</text>
+							<text class="">{{billInfo.totalVolume}}m³</text>
 						</view>
 						<view>
 							<text class="pr-20 clr-sub">总件数:</text>
-						<text class="">10</text>
+							<text class="">{{billInfo.parcelQty}}</text>
 						</view>
 					</view>
-				<view v-for="(item) in ydList" class="yditem">
+					<!-- <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>
@@ -71,7 +76,6 @@
 						</view>
 					</view>
 					
-				
 					<!-- <u-row justify="end">
 						<view style="display: inline-block;white-space: nowrap;" class="mt-10">
 							<u-row>
@@ -186,7 +190,7 @@
 					<u-row justify="end">
 						<view style="display: inline-block;white-space: nowrap;" class="mt-10 pb-30">
 							<u-row>
-							<u-button @click="handleFeedSwitch" shape="circle" :plain="true"
+								<u-button @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
 									custom-style="height: 54rpx;margin-left: 20rpx;">反馈异常</u-button>
 								<u-button shape="circle" type="primary" 
 									custom-style="height: 54rpx;margin-left: 20rpx;">进仓确认</u-button>
@@ -199,7 +203,7 @@
 			<template v-slot:footer>
 				<view class="blcok-white-noradius">
 					<u-row justify="space-around">
-					<u-button @click="goto(`warehousing/pdfPreview?id=${112}`)" :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						<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;"
@@ -216,16 +220,18 @@
 				<u-input placeholder="请输入" custom-style="height: 56rpx;font-size: 28rpx;"></u-input>
 			</template>
 		</tpx-com-dialog>
-	
+	</tpx-page>
 </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"
 	
 	export default {
-		components: { BpeAddressjiamiTmp },
+		components: { BpeAddressjiamiTmp, BpeGoodstaticTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -235,13 +241,12 @@
 		},
 		data() {
 			return {
-				submitParam: {},
+				pageLoading: true,
-				ydList: [
+				queryOption: {
-					{}
+					inNo: '', // 进仓单号
-				],
+				},
-				jcList: [
+				billInfo: {},
-					{},{},{}
+				postInfo: {},
-				],
 				feedModal: {
 					show: false
 				}
@@ -253,24 +258,35 @@
 				// path: 'TODO'
 			}
 		},
-		onLoad(queryOption) {
+		onLoad(option) {
-			this.queryOption = queryOption
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
+		
 		},
 		methods: {
-			setClipboardData,
+			initData() {
-			goto,
+				this.inNo = this.queryOption.inNo
-			getCdnUrl,
+				this.inNo && (this.queryOrderDetail(this.queryOption))
-			initData(){
-				// showLoading()
 			},
-			handleFeedSwitch() {
+			async queryOrderDetail(params) {
-				this.feedModal.show = true
+				let res = await apiService.getWarehouseInInfo({...params, _loading: true})
+				if(!res.data) {
+					this.showToast("进仓单号数据不存在")
+				}
+				let data = res.data || {}
+				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
 			},
-			handleSubmitFeed() {
+			handleDialogClick(curModal){
-				this.feedModal.show = false
+				curModal.show = !curModal.show
 			},
 			handlePreviewDiDan() {
 				uni.previewImage({
@@ -279,6 +295,10 @@
 					]
 				})
 			},
+			async handleDownloadPdf(){
+				let res = await apiService.exportWarehouseInTpl({ orderSn: this.postInfo.orderSn })
+				debugger
+			},
 		}
 	}
 </script>