From b8d70542fa51293d26559efd8798f519aa8590e6 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 9 Jan 2025 11:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=A8=E7=AE=B1=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                | 416 +++++++++++-----------
 pages/SecondPhase/production/BoxStock.vue |  99 +++++
 pages/home/home.vue                       |   6 +-
 utils/getData1.js                         |  11 +
 utils/mork2.js                            |   1 +
 5 files changed, 326 insertions(+), 207 deletions(-)
 create mode 100644 pages/SecondPhase/production/BoxStock.vue

diff --git a/pages.json b/pages.json
index 1c7c2b2..d35c4de 100644
--- a/pages.json
+++ b/pages.json
@@ -254,311 +254,319 @@
 			    "navigationStyle": "custom"
 			}
 		}
-        ,{
-            "path" : "pages/SecondPhase/EmptyVehicleInStore",
+        ,{
+            "path" : "pages/SecondPhase/EmptyVehicleInStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/EmptyBoxInStore",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/DeliveryUnbind",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/DeliveryUnbindConfirm",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/SboProdProgress",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/SboProcess",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/BakeProcess",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/ManmadeBake",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/SurfaceProcess",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/SlittingFeeding",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjCasing",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjDelivery",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjInStore",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjOutStore",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
+            
         }
-		
-        ,{
-            "path" : "pages/SecondPhase/point/PointManage",
+        ,{
+            "path" : "pages/SecondPhase/EmptyBoxInStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/point/ErrorOutUnlock",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/DeliveryUnbind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/finished/ReturnToStore",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/DeliveryUnbindConfirm",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/finished/abnorToStore",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/SboProdProgress",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/SlittingCutting",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/SboProcess",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/DoInitShaft",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/BakeProcess",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/ZjCheck",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/ManmadeBake",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/PaperBind",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/SurfaceProcess",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/CacheCut",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/SlittingFeeding",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/CacheClean",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjCasing",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/finished/BoxWeight",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjDelivery",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ShaftSave",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjInStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjSave",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjOutStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/StockingArea",
+            
+        }
+		
+        ,{
+            "path" : "pages/SecondPhase/point/PointManage",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/AGVPass",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/point/ErrorOutUnlock",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/ZjContainer",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/finished/ReturnToStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/lvt/EmptyBox",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/finished/abnorToStore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/point/ManPass",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/SlittingCutting",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/PrintTable",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/DoInitShaft",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/SubRollWeight",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/ZjCheck",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/UpperShaftCut",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/PaperBind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/ProductManage/AxisApply",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/CacheCut",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/CacheClean",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/ZjInStore",
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/finished/BoxWeight",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ShaftSave",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjSave",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/StockingArea",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/AGVPass",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/ZjContainer",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/BoxStock",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/lvt/EmptyBox",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/point/ManPass",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/PrintTable",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/SubRollWeight",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/UpperShaftCut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/ProductManage/AxisApply",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/ZjInStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/production/BoxStock.vue b/pages/SecondPhase/production/BoxStock.vue
new file mode 100644
index 0000000..4416c95
--- /dev/null
+++ b/pages/SecondPhase/production/BoxStock.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="木箱库存"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" @handleChange="handleChange" />
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>木箱号</th>
+								<th>木箱编码</th>
+								<th>点位</th>
+								<th>木箱规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.box_no}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" @tap="toSure">查询</button>
+		</view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import UpTop from '@/components/upTop.vue'
+	import {woodenBoxPoint} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			UpTop
+		},
+		data() {
+			return {
+				title: '',
+				top: 0,
+				val1: '',
+				dataList: []
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				this._woodenBoxPoint(e)
+			},
+			clearUp () {
+				this.val1 = ''
+				this.dataList = []
+			},
+			toSure () {
+				this._woodenBoxPoint()
+			},
+			async _woodenBoxPoint (e) {
+				let res = await woodenBoxPoint(this.val1)
+				if (res.content.length) {
+					this.dataList = [...this.dataList, ...res.content]
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.slide_new table .bgred td:first-child
+	background-image linear-gradient(to right,#E9B451,#fff)
+.slide_new table .bgyellow td:first-child
+	background-image linear-gradient(to right,#c2cde3,#fff)
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2079182..34f7da0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -199,9 +199,9 @@
 		position relative
 		opacity 1
 		_wh(55%, auto)
-		background-color: #f3f5f8
-		box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
-		padding 16rpx
+		background-color: #f3f5f8
+		box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
+		padding 16rpx
 		border-radius 50%
 		margin 0 auto 0.2rpx
 .menu-name
diff --git a/utils/getData1.js b/utils/getData1.js
index 99818c6..056fd6b 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -324,3 +324,14 @@ export const abnormalOut = (bno, pcode) => request({
 		point_code: pcode
 	}
 })
+
+/**
+ * 木箱库存（二期）
+ */
+// 1.1查询木箱规格点位
+export const woodenBoxPoint = (cname) => request({
+	url: 'api/twoPda/st/woodenBoxPoint',
+	data: {
+		container_name: cname
+	}
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index f823165..1758417 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -74,6 +74,7 @@ export const allAuthority = () => {
 				{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'},
 				{menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'},
 				{menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'},
+				{menu_id: '8', title: '木箱库存', path: '/pages/SecondPhase/production/BoxStock'},
 				{menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'},
 				{menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'}
 			]},