From 246a2d3d9feeecd2de12151f21f2756672171cbb Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 15 Jan 2026 14:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8C=BA=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                            |   3 +
 locale/id.json                            |   3 +
 locale/zh-Hans.json                       |   3 +
 pages.json                                |   8 ++
 pages/SecondPhase/XuniDelivery.vue        |   6 +-
 pages/SecondPhase/XuniDeliveryConfirm.vue | 138 ++++++++++++++++++++++
 6 files changed, 158 insertions(+), 3 deletions(-)
 create mode 100644 pages/SecondPhase/XuniDeliveryConfirm.vue

diff --git a/locale/en.json b/locale/en.json
index ed00145..be7bf96 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -109,6 +109,7 @@
 	"menu.in-stock-management": "Inventory Management",
 	"menu.inventory-management": "Stocktaking Management",
 	"menu.vehicle-management": "Carrier Management",
+	"menu.vehicle-storage": "Vehicle storage",
 	"menu.empty-vehicle-entering-the-warehouse": "Empty Carrier Warehousing",
 	"menu.empty-vehicle-leaving-the-warehouse": "Empty Carrier Outbound",
 	"menu.print-management": "Printing Management",
@@ -242,6 +243,8 @@
 	"grid.source-code": "Source tracking number",
 	"grid.date": "Date",
 	"grid.personnel": "Personnel",
+	"grid.replace-outsourcing": "Replace outsourcing",
+	"grid.replace-insourcing": "Replace the inner packaging",
 	"toast.point-not-empty": "Point position cannot be empty",
 	"toast.select-cache-point": "Please select a cache point position",
 	"toast.select-device": "Please select a device",
diff --git a/locale/id.json b/locale/id.json
index 55a5376..368dd74 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -109,6 +109,7 @@
 	"menu.in-stock-management": "Pengelolaan Persediaan",
 	"menu.inventory-management": "Pengelolaan Peninjauan Persediaan",
 	"menu.vehicle-management": "Pengelolaan Pengangkut",
+	"menu.vehicle-storage": "Deposit kendaraan",
 	"menu.empty-vehicle-entering-the-warehouse": "Penempatan Pengangkut Kosong ke Gudang",
 	"menu.empty-vehicle-leaving-the-warehouse": "Pengiriman Pengangkut Kosong dari Gudang",
 	"menu.print-management": "Pengelolaan Cetak",
@@ -242,6 +243,8 @@
 	"grid.source-code": "Nomor sumber",
 	"grid.date": "Tanggal",
 	"grid.personnel": "Staf",
+	"grid.replace-outsourcing": "Ganti outsourcing",
+	"grid.replace-insourcing": "Ganti Paket Dalam",
 	"toast.point-not-empty": "Posisi titik tidak boleh kosong",
 	"toast.select-cache-point": "Silakan pilih posisi titik cache",
 	"toast.select-device": "Silakan pilih peralatan",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index ce82446..d0ce316 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -109,6 +109,7 @@
 	"menu.in-stock-management": "在库管理",
 	"menu.inventory-management": "盘点管理",
 	"menu.vehicle-management": "载具管理",
+	"menu.vehicle-storage": "载具入库",
 	"menu.empty-vehicle-entering-the-warehouse": "空载具入库",
 	"menu.empty-vehicle-leaving-the-warehouse": "空载具出库",
 	"menu.print-management": "打印管理",
@@ -242,6 +243,8 @@
 	"grid.source-code": "源单号",
 	"grid.date": "日期",
 	"grid.personnel": "人员",
+	"grid.replace-outsourcing": "更换外包",
+	"grid.replace-insourcing": "更换内包",
 	"toast.point-not-empty": "点位不能为空",
 	"toast.select-cache-point": "请选择缓存点位",
 	"toast.select-device": "请选择设备",
diff --git a/pages.json b/pages.json
index 69d7dfe..8477453 100644
--- a/pages.json
+++ b/pages.json
@@ -55,6 +55,14 @@
                 "navigationStyle": "custom"
             }
             
+        }
+        ,{
+            "path" : "pages/SecondPhase/XuniDeliveryConfirm",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
         }
         ,{
             "path" : "pages/SecondPhase/DeliveryUnbindConfirm",
diff --git a/pages/SecondPhase/XuniDelivery.vue b/pages/SecondPhase/XuniDelivery.vue
index c0598bf..a2310ab 100644
--- a/pages/SecondPhase/XuniDelivery.vue
+++ b/pages/SecondPhase/XuniDelivery.vue
@@ -24,7 +24,7 @@
 				<view class="filter_item">
 					<view class="filter_label">{{$t('grid.bill-type')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index"  :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
@@ -114,9 +114,9 @@
 				this.dataList = [...res.data]
 			},
 			toSure () {
-				if (this.pkId) {
+				if (this.val1) {
 					uni.navigateTo({
-						url: '/pages/WarehouseManage/XuniDeliveryConfirm?billcode=' + this.pkObj.bill_code + '&title=' + this.title
+						url: '/pages/SecondPhase/XuniDeliveryConfirm?billcode=' + this.pkObj.bill_code + '&title=' + this.title
 					})
 				}
 			},
diff --git a/pages/SecondPhase/XuniDeliveryConfirm.vue b/pages/SecondPhase/XuniDeliveryConfirm.vue
new file mode 100644
index 0000000..3e7e617
--- /dev/null
+++ b/pages/SecondPhase/XuniDeliveryConfirm.vue
@@ -0,0 +1,138 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar :inner2="true" @goIn="goIn" title="虚拟区发货确认"></nav-bar> -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.woodenbox')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box ref="scanChild" v-model="val1" @handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<!-- <view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view> -->
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.total-net-weight')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input filter_input_disabled" v-model="net_weight_num" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>{{$t('grid.woodenboxcode')}}</th>
+								<th>{{$t('grid.sub-roll-number')}}</th>
+								<th>{{$t('grid.material-code')}}</th>
+								<th>{{$t('grid.material-name')}}</th>
+								<th>{{$t('grid.weight')}}</th>
+								<th>{{$t('grid.replace-outsourcing')}}</th>
+								<th>{{$t('grid.replace-insourcing')}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'bgyellow': e.colro_flag === '1'}">
+								<td>{{e.package_box_sn}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.product_description}}</td>
+								<td>{{e.net_weight}}</td>
+								<td>{{e.change_out}}</td>
+								<td>{{e.change_in}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !dataList.length}" :disabled="disabled1" @tap="_virtualoutConfirm">{{$t('button.outstore-confirm')}}</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" @tap="_virtualivtQuery">{{$t('button.search')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {virtualivtQuery, virtualoutConfirm} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				billCode: '',
+				dataList: [],
+				disabled1: false,
+				net_weight_num: ''
+			};
+		},
+		onLoad (option) {
+			this.billCode = option.billcode
+			this.title = option.title
+			this._virtualivtQuery()
+		},
+		mounted () {
+			this.$refs.scanChild.handleFocus()
+		},
+		methods: {
+			handleChange1 (e) {
+				this._virtualivtQuery()
+			},
+			goIn () {
+				uni.navigateTo({
+					url: '/pages/WarehouseManage/XuniDelivery?title=' + this.title
+				})
+			},
+			handleChange (e) {
+				// console.log(e)
+			},
+			/** 初始化查询 */
+			async _virtualivtQuery () {
+				let res = await virtualivtQuery(this.val1, this.val2, this.billCode)
+				this.dataList = [...res.data]
+				this.net_weight_num = res.net_weight_num
+			},
+			async _virtualoutConfirm () {
+				if (!this.dataList.length) {
+					return
+				}
+				this.disabled1 = true
+				try {
+					let res = await virtualoutConfirm(this.dataList, this.val1)
+					this.disabled1 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.dataList = []
+					this._virtualivtQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.$refs.scanChild.handleFocus()
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file