From 8a1a773cca045dd4d846e8655c831f0529c72e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Thu, 6 Nov 2025 14:40:07 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=B7=BB=E5=8A=A0=E6=8B=86=E7=AE=B1?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=BC=E7=AE=B1=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/warehouse/warehose.js |  11 +-
 manifest.json             |   4 +-
 pages.json                |   6 +
 pages/index/index.vue     | 277 ++++++++++++++++++--------------------
 4 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/api/warehouse/warehose.js b/api/warehouse/warehose.js
index 9dd25d6..afb78a1 100644
--- a/api/warehouse/warehose.js
+++ b/api/warehouse/warehose.js
@@ -72,7 +72,7 @@ export function resolutionPackage(params) {
 }
 
 
-// 入库
+// 入库（传U8）
 export function handlerIntoProductWarehouse(data) {
 	return request({
 		url: '/mes/wm/entrywarehouse/into_product_warehouse',
@@ -81,6 +81,15 @@ export function handlerIntoProductWarehouse(data) {
 	})
 }
 
+// 入库（ 不传U8 ）
+export function IntoProductwarehouseNoU8(data) {
+	return request({
+		url: '/mes/wm/entrywarehouse/IntoProductwarehouseNoU8',
+		method: 'post',
+		data
+	})
+}
+
 // 一般退库
 export function handlErexitwarehouse(params) {
 	return request({
diff --git a/manifest.json b/manifest.json
index 774ca6d..8c76d6f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "上海干巷涂装PDA",
     "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "2.7.3",
-    "versionCode" : 273,
+    "versionName" : "2.7.5",
+    "versionCode" : 275,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 29f3a0d..5cfd002 100644
--- a/pages.json
+++ b/pages.json
@@ -292,6 +292,12 @@
 			{
 				"navigationBarTitleText" : "毛坯出库"
 			}
+		},
+		{
+			"path": "pages/LCLPackage/LCLWarehouse",
+			"style": {
+				"navigationBarTitleText": "拆箱，拼箱入库"
+			}
 		}
 	]
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 55c9a88..d519e2c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,175 +1,161 @@
 <template>
 	<view class="home-container">
-		<view v-for="type in 4" :key="type" class="section-container">
+		<view v-for="box in 4" :key="box" class="section-container">
 			<view class="section-card">
-				<text class="section-title">{{ getSectionTitle(type) }}</text>
+				<text class="section-title">{{ getSectionTitle(box) }}</text>
 				<view class="grid-container">
-					<view v-for="(item, index) in getItemsByType(type)" :key="index" class="grid-item"
-						@click="gridCheck(item.url)">
+					<view v-for="(item, index) in getItemsByType(box)" :key="index" class="grid-item" @click="gridCheck(item.url)">
 						<image :src="'/static/images/index-icons/' + item.icon + '.svg'" class="grid-icon"></image>
 						<text class="grid-text">{{ item.name }}</text>
 					</view>
 					<!-- 当一行不满4个时，添加占位元素以保持布局 -->
-					<view v-for="index in (4 - getItemsByType(type).length % 4) % 4" :key="`placeholder-${index}`"
-						class="grid-item placeholder">
-					</view>
+					<view v-for="index in (4 - (getItemsByType(box).length % 4)) % 4" :key="`placeholder-${index}`" class="grid-item placeholder"></view>
 				</view>
 			</view>
-			<view class="section-gap" v-if="type < 4"></view>
+			<view class="section-gap" v-if="box < 4"></view>
 		</view>
 	</view>
 </template>
 
 <script>
-import {
-	mapActions
-} from 'vuex'
+import { mapActions } from 'vuex';
 export default {
 	data() {
 		return {
 			// 页面按钮参数
-			gridItemList: [{
-				name: '成品入库',
-				icon: 'inbound/finished-product-inbound',
-				url: '/pages/inWarehouse/inWarehouse?isStrict=true',
-				type: 1,
-				index: 1
-			},
-			{
-				name: '油漆入库',
-				icon: 'inbound/paint-inbound',
-				url: '',
-				type: 1,
-				index: 2
-			},
-			{
-				name: '毛坯入库',
-				icon: 'inbound/rough-casting-inbound',
-				url: '/pages/blank/blankWarehousing/blankWarehousing?isStrict=false',
-				type: 1,
-				index: 3
-			},
-			{
-				name: '备件入库',
-				icon: 'inbound/spare-parts-inbound',
-				url: '',
-				type: 1,
-				index: 4
-			},
-			{
-				name: '无校验入库',
-				icon: 'inbound/no-validation-inbound',
-				url: '/pages/inWarehouse/inWarehouse?isStrict=false',
-				type: 1,
-				index: 14
-			},
-			{
-				name: '成品出库',
-				icon: 'outbound/finished-product-outbound',
-				url: '/pages/outWarehouse/outWarehouse',
-				type: 2,
-				index: 5
-			},
-			{
-				name: '出库单',
-				icon: 'outbound/finished-product-outbound',
-				url: '/pages/outWarehouse/outboundList/outboundList',
-				type: 2,
-				index: 16
-			},
-			{
-				name: '无校验出库',
-				icon: 'outbound/no-outbound-order',
-				url: '/pages/returnWarehouse/returnWarehouse',
-				type: 2,
-				index: 15
-			},
-			{
-				name: '出货',
-				icon: 'outbound/shipping',
-				url: '',
-				type: 2,
-				index: 6
-			},
-			{
-				name: '毛坯出库',
-				icon: 'outbound/shipping',
-				url: '/pages/blank/blankOutbound/blankOutbound',
-				type: 2,
-				index: 17
-			},
-			{
-				name: '退货到\n成品库',
-				icon: 'outbound/return',
-				url: '/pages/returnWarehouse/returnProductwarehouse',
-				type: 2,
-				index: 7
-			},
-			{
-				name: '盘点',
-				icon: 'inventory-management/stocktake',
-				url: '/pages/stocktake/stocktake',
-				type: 3,
-				index: 8
-			},
-			{
-				name: '库存查询',
-				icon: 'inventory-management/inventory-query',
-				url: '/pages/watchGoods/watchGoods',
-				type: 3,
-				index: 9
-			},
-			{
-				name: '操作记录',
-				icon: 'inventory-management/operation-record',
-				url: '/pages/warehoseActionList/warehoseActionList',
-				type: 3,
-				index: 10
-			},
-			{
-				name: '扫描管理',
-				icon: 'inventory-management/scan-management',
-				url: '/pages/scan/scan',
-				type: 3,
-				index: 14
-			},
-			{
-				name: '拼箱',
-				icon: 'warehouse-management/consolidation',
-				url: '/pages/consolidation/consolidation',
-				type: 4,
-				index: 11
-			},
-			{
-				name: '拆箱',
-				icon: 'warehouse-management/unpacking',
-				url: '/pages/unpacking/unpacking',
-				type: 4,
-				index: 12
-			},
-			{
-				name: '移库',
-				icon: 'warehouse-management/relocation',
-				url: '/pages/relocation/relocation',
-				type: 4,
-				index: 13
-			}
+			gridItemList: [
+				{
+					name: '成品入库',
+					icon: 'inbound/finished-product-inbound',
+					url: '/pages/inWarehouse/inWarehouse?isStrict=true',
+					type: 1
+				},
+				{
+					name: '油漆入库',
+					icon: 'inbound/paint-inbound',
+					url: '',
+					type: 1
+				},
+				{
+					name: '毛坯入库',
+					icon: 'inbound/rough-casting-inbound',
+					url: '/pages/blank/blankWarehousing/blankWarehousing?isStrict=false',
+					type: 1
+				},
+				{
+					name: '备件入库',
+					icon: 'inbound/spare-parts-inbound',
+					url: '',
+					type: 1
+				},
+				{
+					name: '无校验入库',
+					icon: 'inbound/no-validation-inbound',
+					url: '/pages/inWarehouse/inWarehouse?isStrict=false',
+					type: 1
+				},
+				{
+					name: '拼箱，拆箱入库',
+					icon: 'inbound/no-validation-inbound',
+					url: '/pages/LCLPackage/LCLWarehouse?isStrict=false',
+					type: 1
+				},
+				{
+					name: '成品出库',
+					icon: 'outbound/finished-product-outbound',
+					url: '/pages/outWarehouse/outWarehouse',
+					type: 2
+				},
+				{
+					name: '出库单',
+					icon: 'outbound/finished-product-outbound',
+					url: '/pages/outWarehouse/outboundList/outboundList',
+					type: 2
+				},
+				{
+					name: '无校验出库',
+					icon: 'outbound/no-outbound-order',
+					url: '/pages/returnWarehouse/returnWarehouse',
+					type: 2
+				},
+				{
+					name: '出货',
+					icon: 'outbound/shipping',
+					url: '',
+					type: 2
+				},
+				{
+					name: '毛坯出库',
+					icon: 'outbound/shipping',
+					url: '/pages/blank/blankOutbound/blankOutbound',
+					type: 2
+				},
+				{
+					name: '退货到\n成品库',
+					icon: 'outbound/return',
+					url: '/pages/returnWarehouse/returnProductwarehouse',
+					type: 2
+				},
+				{
+					name: '盘点',
+					icon: 'inventory-management/stocktake',
+					url: '/pages/stocktake/stocktake',
+					type: 3
+				},
+				{
+					name: '库存查询',
+					icon: 'inventory-management/inventory-query',
+					url: '/pages/watchGoods/watchGoods',
+					type: 3
+				},
+				{
+					name: '操作记录',
+					icon: 'inventory-management/operation-record',
+					url: '/pages/warehoseActionList/warehoseActionList',
+					type: 3
+				},
+				{
+					name: '扫描管理',
+					icon: 'inventory-management/scan-management',
+					url: '/pages/scan/scan',
+					type: 3
+				},
+				{
+					name: '拼箱',
+					icon: 'warehouse-management/consolidation',
+					url: '/pages/consolidation/consolidation',
+					type: 4
+				},
+				{
+					name: '拆箱',
+					icon: 'warehouse-management/unpacking',
+					url: '/pages/unpacking/unpacking',
+					type: 4
+				},
+				{
+					name: '移库',
+					icon: 'warehouse-management/relocation',
+					url: '/pages/relocation/relocation',
+					type: 4
+				}
 			]
 		};
 	},
 	methods: {
-		...mapActions([
-			'LogOut',
-			'GetInfo'
-		]),
+		...mapActions(['LogOut', 'GetInfo']),
 		gridCheck(url) {
-
 			if (url === '') {
 				return;
 			}
 			try {
 				uni.navigateTo({
-					url
+					url,
+					fail:()=>{
+						uni.showToast({
+							title: '页面正在开发中……',
+							icon: 'none'
+						});
+					}
 				});
 			} catch (error) {
 				uni.showToast({
@@ -177,14 +163,13 @@ export default {
 					icon: 'none'
 				});
 			}
-
 		},
 		getSectionTitle(type) {
 			const titles = ['', '入库', '出库', '库存管理', '库内管理'];
 			return titles[type] || '';
 		},
 		getItemsByType(type) {
-			return this.gridItemList.filter(item => item.type === type);
+			return this.gridItemList.filter((item) => item.type === type);
 		}
 	},
 	onLoad: function () {
@@ -199,4 +184,4 @@ export default {
 
 <style lang="scss" scoped>
 @import url('index.scss');
-</style>
\ No newline at end of file
+</style>