From 4e80ba6e9674b61ea8692d8aaa5215ffd620ec2a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 1 Feb 2024 17:01:46 +0800
Subject: [PATCH] uu

---
 pages.json                      |   7 +-
 pages/deliveryDeal/shipping.vue | 188 ++++++++++++++++++++++++++++++++
 pages/tabBar/deal/deal.vue      |   1 +
 3 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 pages/deliveryDeal/shipping.vue

diff --git a/pages.json b/pages.json
index 8690d23..5916dfd 100644
--- a/pages.json
+++ b/pages.json
@@ -153,7 +153,12 @@
 				"navigationBarTitleText": "入库"
 			}
 		},
-		
+		{
+			"path": "pages/deliveryDeal/shipping",
+			"style": {
+				"navigationBarTitleText": "装柜扫描"
+			}
+		},
 		{
 			"path": "pages/warehousing/detail",
 			"style": {
diff --git a/pages/deliveryDeal/shipping.vue b/pages/deliveryDeal/shipping.vue
new file mode 100644
index 0000000..1500b99
--- /dev/null
+++ b/pages/deliveryDeal/shipping.vue
@@ -0,0 +1,188 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+				<view class="blcok-white">
+					<u-row justify="between">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.yundanhao"></tpx-scan-input>
+						</view>
+						<view class="pl-10">
+							<u-button custom-style="height: 74rpx;">确定</u-button>
+						</view>
+						
+					</u-row>
+				</view>
+				
+				<view class="mt-30" @click="handleDialogClick(orderDetailModal)">
+					<u-row justify="space-between">
+						<view class="com-section">进仓单号：TWO291929</view>
+						<view>
+							<button size="mini">订单详情</button>
+						</view>
+					</u-row>
+				</view>
+				
+				<view class="blcok-white">
+					<u-row justify="between">
+						<view class="font-30 font-weight">缅甸</view>
+						<view class="font-30 font-weight">缅甸特快</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;" justify="between">
+						<view >
+							<text class="clr-sub">寄件人：</text>
+							<text>李先生</text>
+						</view>
+						<view >
+							<text class="clr-sub">手机号：</text>
+							<text>18627068352</text>
+						</view>
+					</u-row>
+				</view>
+			
+				
+				<view class="com-section mt-30">托寄货物描述</view>
+				<view class="blcok-white">
+					<view class="">
+						<bpe-gooditem-edit-tmp :value="submitParam"></bpe-gooditem-edit-tmp>
+					</view>
+				</view>
+				
+				<view class="blcok-white" style="padding-top: 2rpx;">
+					<bpe-goodsize-tmp :value="submitParam"></bpe-goodsize-tmp>
+					<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="备注"
+								maxlength="50" count></u-textarea>
+						</view>
+					</u-row>
+				</view>
+				
+				<view class="blcok-white" style="padding-bottom: 0;">
+					<bpe-goodphoto-tmp title="货物照片" :value="submitParam" filedName="phName"></bpe-goodphoto-tmp>
+				</view>
+				
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+				<u-row>
+					<u-button size="large" shape="circle" @click="goto(`warehousing/detail`)"
+						custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">进仓登记</u-button>
+						
+					<u-button size="large" shape="circle"
+						custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary">货齐开单</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+	
+	<tpx-dialog v-model:show="orderDetailModal.show" title="订单详情" contentStyle="padding:0;">
+		<bo-detail-tmp v-model:value="submitParam"></bo-detail-tmp>
+	</tpx-dialog>
+	
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
+	import { goto } from "@/common/untool"
+	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"
+	import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp"
+	import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
+	
+	export default {
+		components: { BpeGooditemEditTmp, BpeGoodphotoTmp, BoDetailTmp, BpeGoodKuaidiTmp, BpeGoodsizeTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+
+		},
+		data() {
+			return {
+				kehuList: [{title: '李先生', val: '11'}],
+				...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
+				tipsList: [
+					
+				],
+				orderDetailModal: {
+					show: false
+				},
+				submitParam: {
+					yundanhao: '',
+					stockRoomId: '',
+					countryId: '',
+					wayId: '',
+					type: sendTypeList[0].val,
+					paytype: '',
+					otherDes: '',
+					prodId: 1,
+					tips: [],
+					revtime: '',
+					gdList: [{},{}]
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+			goto,
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			
+			handleAgree() {
+				this.agreePrivateRule = !this.agreePrivateRule
+			},
+			handleDialogClick(curModal){
+				curModal.show = true
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yunf-item {
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+		background: #F6F6F6;
+		border-radius: 20rpx;
+		border: 2rpx solid transparent;
+		&.active {
+			border-color: $uni-color-primary;
+		}
+	}
+	
+	.yunf-input-item{
+		padding: 26rpx 0;
+		border-bottom: 2rpx solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index da6bec4..422fafd 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -64,6 +64,7 @@
 					{  title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: '' },
 					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: '' },
 					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
+					{  title: '装柜扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'deliveryDeal/shipping' },
 					{  title: '发件清单', subTitle: "", icon: getCdnUrl(`home/fjqingdan.png`), url: 'deliveryDeal/sendList' },
 					{  title: '拆包扫描', subTitle: "", icon: getCdnUrl(`home/chaibsm.png`), url: '' },
 					{  title: '报关扫描', subTitle: "", icon: getCdnUrl(`home/baogsm.png`), url: '' },