From 673f6596d6099c29445e80448169715374ccaf61 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 21 Mar 2024 10:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                 | 146 +++++++++++++++++-------
 common/style/mixin.styl                 |   2 +-
 common/style/reset.css                  |   7 ++
 components/NavBar.vue                   |   4 +-
 components/SearchBox.vue                |   4 +-
 components/SearchBox1.vue               |   4 +-
 components/SearchBoxMx.vue              |   4 +-
 pages.json                              |  32 ++++++
 pages/DispatchManage/RGVStatus.vue      |   4 +-
 pages/DispatchManage/TaskManage.vue     |   8 +-
 pages/ProductManage/SboProdProgress.vue |   2 +-
 pages/ProductManage/SlittingFeeding.vue |  73 ++++++------
 pages/ProductManage/ZjOutStore.vue      |  53 +++++----
 pages/WarehouseManage/CheckDtl.vue      | 113 +++---------------
 pages/login/setup.vue                   |   2 +-
 static/image/search_bg.png              | Bin 0 -> 4167 bytes
 utils/getData2.js                       | 115 ++++++++++---------
 utils/mork2.js                          |  75 ++++++++++++
 18 files changed, 380 insertions(+), 268 deletions(-)
 create mode 100644 static/image/search_bg.png
 create mode 100644 utils/mork2.js

diff --git a/common/style/layout.css b/common/style/layout.css
index 0b956b3..fd83206 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -30,7 +30,7 @@ uni-button:after {
 	color: #bbb;
 }
 .icon_eye_active {
-	color: #ff6a00;
+	color: #D7592F ;
 }
 .icon_unchecked {
 	color: #fff;
@@ -41,8 +41,8 @@ uni-button:after {
 	border: 1rpx solid #bbb;
 }
 .icon_checked {
-	color: #ff6a00;
-	border: 1rpx solid #ff6a00;
+	color: #D7592F ;
+	border: 1rpx solid #D7592F ;
 }
 .icon_back {
 	font-size: 52rpx;
@@ -116,6 +116,11 @@ uni-button:after {
 	border-radius: 24rpx;
 	padding: 14rpx;
 	margin-bottom: 20rpx;
+	box-shadow: 0px 3px 3px 0px rgba(160,160,160,0.20);
+}
+.zd_wrapper-1 {
+	padding: 0 14rpx;
+	border-radius: 0;
 }
 .filter_item {
 	display: flex;
@@ -154,7 +159,7 @@ uni-button:after {
 	color: #323232;
 	text-align: center;
 	background-color: #fff;
-	border: 1px solid #ff6a00;
+	border: 1px solid #D7592F ;
 	border-radius: 10rpx;
 	margin-left: 30rpx;
 }
@@ -167,6 +172,7 @@ uni-button:after {
 	/* flex: 1; */
 	width: calc(100% - 170rpx);
 	height: 80rpx;
+	line-height: 80rpx;
 	padding: 5rpx 0;
 	margin-left: 30rpx;
 	display: flex;
@@ -184,8 +190,8 @@ uni-button:after {
 }
 .filter_input {
 	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
+	height: 80rpx;
+	line-height: 80rpx;
 	border: 1px solid #dcdfe6;
 	background-color: #fff;
 	padding: 0 15rpx;
@@ -196,6 +202,16 @@ uni-button:after {
 .filter_input_disabled {
 	background-color: #eee;
 }
+.filter_item-1 {
+	border-bottom: 2rpx solid #dcdfe6;
+}
+.filter_item-1 .filter_label {
+	text-align: auto;
+	text-align-last: auto;
+}
+.filter_item-1 .filter_input, .filter_item-1 .uni-select {
+	border: 0 !important;
+}
 
 .grid-wraper {
 	width: 100%;
@@ -209,8 +225,10 @@ uni-button:after {
 	table-layout: fixed;
 	min-width: 100%;
 	border-collapse: separate;
-	border-spacing: 0;
-	border: 0;
+	-webkit-border-horizontal-spacing: 0px;
+	-webkit-border-vertical-spacing: 10rpx;
+	padding-bottom: 8rpx;
+	background-color: #f5f5f5;
 }
 .slide_new table td, .slide_new table th {
 	box-sizing: border-box;
@@ -219,13 +237,13 @@ uni-button:after {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	padding: 0 20rpx;
-	border-bottom: 10rpx solid #f5f5f5;
 	text-align: center;
 }
 .slide_new table td:first-child, .slide_new table th:first-child{
 	position: sticky;
 	left: 0;
 	z-index: 101;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
 }
 .slide_new table thead tr th {
 	position: sticky;
@@ -246,8 +264,24 @@ uni-button:after {
 	color: #323232;
 	background: #fff;
 }
+.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
+	color: #4e6ef2;
+	font-weight: bold;
+}
 .slide_new table tbody tr.checked td {
-	background-color: #fef6e4;
+	border-top: 1px solid #D7592F;
+	border-bottom: 1px solid #D7592F;
+}
+.slide_new table tbody tr.checked td:first-child {
+	border-left: 1px solid #D7592F;
+	border-top-left-radius: 8rpx;
+	border-bottom-left-radius: 8rpx;
+}
+.slide_new table tbody tr.checked td:last-child {
+	border-right: 1px solid #D7592F;
+	border-top-right-radius: 8rpx;
+	border-bottom-right-radius: 8rpx;
+	
 }
 
 /** 提交栏 **/
@@ -268,16 +302,16 @@ uni-button:after {
 .submit-button {
 	font-size: 30rpx;
 	line-height: 62rpx;
-	color: #ff6a00;
+	color: #D7592F ;
 	text-align: center;
 	letter-spacing: 1rpx;
 	padding: 0 22rpx;
 	background-color: #fff;
-	border: 1px solid #ff6a00;
+	border: 1px solid #D7592F ;
 	margin: 0 40rpx 10rpx 0;
 	border-radius: 30rpx;
 }
-.submit-bar_new {
+.submitbar {
 	position: fixed;
 	bottom: 0;
 	left: 0;
@@ -287,54 +321,83 @@ uni-button:after {
 	padding: 10rpx 0;
 	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
 }
-.submit-button_new {
+.btn-submit {
+	padding: 0;
 	font-size: 30rpx;
 	line-height: 62rpx;
-	color: #ff6a00;
-	padding: 0;
-	text-align: center;
+	border-radius: 10rpx;
+}
+.btn-default {
+	color: #D7592F ;
 	background-color: #fff;
-	border: 1px solid #ff6a00;
-	border-radius: 30rpx;
+	border: 1px solid #D7592F ;
 }
-.btn-disabled, .submit-button[disabled] {
-	background-color: #c9c9c9;
-	border: 1px solid #c9c9c9;
+.btn-success {
 	color: #fff;
+	border: 1px solid #D7592F ;
+	background-color: #D7592F ;
+}
+.btn-info {
+	color: #fff;
+	border: 1px solid #c9c9c9;
+	background-color: #c9c9c9;
+}
+.btn-disabled, .submit-button[disabled]:not([type]) {
+	color: #fff;
+	border: 1px solid #c9c9c9;
+	background-color: #c9c9c9;
+}
+uni-button[disabled]:not([type]) {
+	color: #fff;
+	border: 1px solid #c9c9c9;
+	background-color: #c9c9c9;
 }
-
 /** 下拉框 */
 .uni-select__selector {
 	z-index: 300 !important;
 }
   
 /** 弹窗 */
+.popshow {
+	transform: translateY(0);
+}
+.pophide {
+	transform: translateY(100%);
+}
 .msg_wrapper {
 	position: fixed;
-	top: 0;
+	top: auto;
 	bottom: 0;
 	left: 0;
-	right: 0;
-	text-align: center;
-	z-index: 201;
-	display: flex;
-	justify-content: center;
-	align-items: center;
+	width: 100%;
+	height: calc(100% - var(--status-bar-height) - 72rpx);
+	padding: 14rpx;
+	background-color: #f6f6f6;
+	box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	z-index: 301;
+	transition: all .3s;
 }
 .msg_wrapper_1 {
 	text-align: left;
 }
-
-.msg_box {
-	width: 90%;
-	padding: 20rpx;
-	background-color: #fff;
-	border-radius: 4px;
-	border: 1px solid #ebeef5;
-	box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-	backface-visibility: hidden;
+.pop-line {
+	width: 10%;
+	height: 8rpx;
+	margin: 0 auto 14rpx auto;
+	background-color: #d4d4d4;
+	border-radius: 8rpx;
+}
+.msg_content {
+	width: 100%;
+	height: calc(100% - 22rpx);
+	margin-bottom: 86rpx;
+	overflow-y: scroll;
+}
+.msg_box {
+	width: 100%;
 }
-
 .msg_mask {
 	position: fixed;
 	top: 0;
@@ -343,9 +406,8 @@ uni-button:after {
 	height: 100%;
 	opacity: .7;
 	background: #000;
-	z-index: 200;
+	z-index: 300;
 }
-
 .msg_btns {
 	width: 100%;
 	max-width: 300px;
diff --git a/common/style/mixin.styl b/common/style/mixin.styl
index f564d40..86ef090 100644
--- a/common/style/mixin.styl
+++ b/common/style/mixin.styl
@@ -1,4 +1,4 @@
-$red = #ff6a00
+$red = #D7592F 
 $green = #6CBE8B
 $yellow = #E9B451
 $blue = #6798ef
diff --git a/common/style/reset.css b/common/style/reset.css
index 0890ca5..8e116f0 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -123,4 +123,11 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 }
 .zd-col-1 {
     width: 4.16667%
+}
+.letter-30 {
+	letter-spacing: 30rpx;
+	text-indent: 30rpx;
+}
+.h-50 {
+	height: 50% !important;
 }
\ No newline at end of file
diff --git a/components/NavBar.vue b/components/NavBar.vue
index a03af93..0f4c46e 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -2,7 +2,7 @@
 	<view class="header">
 		<span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
 		<span class="page_name">{{title}}</span>
-		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
+		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show === false}">&#xe69b;</span>
 	</view>
 </template>
 
@@ -22,7 +22,7 @@
 				type: Boolean,
 				default: false
 			},
-			show1: {
+			show: {
 				type: Boolean,
 				default: true
 			}
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index e0d75fc..273229b 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -129,14 +129,14 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
+	_wh(100%, 80rpx)
 .search_input
 	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 10rpx
-	_wh(auto, 70rpx)
+	_wh(auto, 80rpx)
 	_fj(flex-end)
 .icon_scan_active
 	color $red
diff --git a/components/SearchBox1.vue b/components/SearchBox1.vue
index 63134f7..95be93d 100644
--- a/components/SearchBox1.vue
+++ b/components/SearchBox1.vue
@@ -99,12 +99,12 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
+	_wh(100%, 80rpx)
 .search_input
 	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 0
-	_wh(auto, 70rpx)
+	_wh(auto, 80rpx)
 </style>
diff --git a/components/SearchBoxMx.vue b/components/SearchBoxMx.vue
index 6b0a818..22f124b 100644
--- a/components/SearchBoxMx.vue
+++ b/components/SearchBoxMx.vue
@@ -74,14 +74,14 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
+	_wh(100%, 80rpx)
 .search_input
 	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 10rpx
-	_wh(auto, 70rpx)
+	_wh(auto, 80rpx)
 	_fj(flex-end)
 .icon_scan_active
 	color $red
diff --git a/pages.json b/pages.json
index 1ebae9a..3fcb9de 100644
--- a/pages.json
+++ b/pages.json
@@ -254,6 +254,38 @@
 			    "navigationStyle": "custom"
 			}
 		}
+        ,{
+            "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"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/DispatchManage/RGVStatus.vue b/pages/DispatchManage/RGVStatus.vue
index 11fed4e..e1cae77 100644
--- a/pages/DispatchManage/RGVStatus.vue
+++ b/pages/DispatchManage/RGVStatus.vue
@@ -35,8 +35,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_rgvStatusQuery">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_rgvStatusQuery">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/DispatchManage/TaskManage.vue b/pages/DispatchManage/TaskManage.vue
index 689dcd0..a4d1ed1 100644
--- a/pages/DispatchManage/TaskManage.vue
+++ b/pages/DispatchManage/TaskManage.vue
@@ -53,10 +53,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
-			<button class="submit-button" @tap="_taskTaskQuery">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" @tap="_taskTaskQuery">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/SboProdProgress.vue b/pages/ProductManage/SboProdProgress.vue
index d49e0fc..e576553 100644
--- a/pages/ProductManage/SboProdProgress.vue
+++ b/pages/ProductManage/SboProdProgress.vue
@@ -152,7 +152,7 @@
 	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
 	.bgred td
-		background-color #ff6a00
+		background-color #D7592F 
 		color #ffffff
 	.bgyellow td
 		background-color #E9B451
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 8954f9a..83a4855 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -76,44 +76,47 @@
 			</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 submit-bar_new">
-			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
-			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
-			<button class="zd-col-5 submit-button_new" @tap="handleSure">人工呼叫</button>
-			<button class="zd-col-3 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
-			<button class="zd-col-3 submit-button_new" @tap="searchList">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
+			<button class="zd-col-5 btn-submit btn-default" @tap="handleSure">人工呼叫</button>
+			<button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
+			<button class="zd-col-3 btn-submit btn-default" @tap="searchList">查询</button>
 		</view>
-		<view v-if="active" class="msg_wrapper msg_wrapper_1">
-			<view class="msg_box">
-				<view class="filter_item">
-					<view class="filter_label">起点</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val3"
-						@handleChange="handleChange1"
-						/>
+		<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">起点</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val3"
+							@handleChange="handleChange1"
+							/>
+						</view>
+					</view>
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">母卷号</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val4"
+							/>
+						</view>
+					</view>
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">终点</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val5"
+							/>
+						</view>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label">母卷号</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val4"
-						/>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">终点</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val5"
-						/>
-					</view>
-				</view>
-				<view class="msg_btns">
-					<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
-					<button class="submit-button msg_btn" @tap="modalToSure">确认</button>
-				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">确认</button>
 			</view>
 		</view>
 		<view v-if="active" class="msg_mask"></view>
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index 8ac9d23..03e6812 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -80,31 +80,40 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || checkArr.length > 0}" :disabled="disabled3" @tap="_disuseConfirm">废箔下卷</button>
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !checkArr.length}" :disabled="disabled1" @tap="_outConfirm">子卷出站</button>
-			<button class="submit-button" @tap="showModal">出站配送</button>
-			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || checkArr.length > 0}" :disabled="disabled3" @tap="_disuseConfirm">废箔下卷</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || !checkArr.length}" :disabled="disabled1" @tap="_outConfirm">子卷出站</button>
+			<button class="zd-col-6 btn-submit btn-success" @tap="showModal">出站配送</button>
+			<button class="zd-col-5 btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
 		</view>
-		<view v-if="active" class="msg_wrapper">
-			<view class="msg_box">
-				<view class="filter_item">
-					<view class="filter_label">区域</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+		<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">区域</view>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+						</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-19">
+							<view class="filter_item filter_item-1">
+								<view class="filter_label">缓存点位</view>
+								<view class="filter_input_wraper">
+									<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
+								</view>
+							</view>
+						</view>
+						<view class="zd-col-4">
+							<button class="btn-submit btn-success" @tap="_conveyPointQuery">查询</button>
+						</view>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label">缓存点位</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
-					</view>
-					<view class="filter_search" @tap="_conveyPointQuery">查询</view>
-				</view>
-				<view class="msg_btns">
-					<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
-					<button class="submit-button msg_btn" :class="{'btn-disabled': !index4}" :disabled="disabled2" @tap="_conveyConfirm">确认</button>
-				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !index4}" :disabled="disabled2" @tap="_conveyConfirm">确认</button>
 			</view>
 		</view>
 		<view v-if="active" class="msg_mask"></view>
diff --git a/pages/WarehouseManage/CheckDtl.vue b/pages/WarehouseManage/CheckDtl.vue
index 20531e9..976c44e 100644
--- a/pages/WarehouseManage/CheckDtl.vue
+++ b/pages/WarehouseManage/CheckDtl.vue
@@ -75,27 +75,30 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
+		<view class="zd-row submitbar">
 			<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_saveCheck">保存</button> -->
 			<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_confirmCheck">确认</button> -->
-			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checkexception">异常</button>
-			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checknormal">正常</button>
-			<button class="submit-button" @tap="_checkQueryDtl(checkCode, val1)">查询</button>
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !dataList.length}" :disabled="disabled1" @tap="_checkexception">异常</button>
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !dataList.length}" :disabled="disabled1" @tap="_checknormal">正常</button>
+			<button class="zd-col-7 btn-submit btn-success letter-30" @tap="_checkQueryDtl(checkCode, val1)">查询</button>
 		</view>
-		<view v-show="modelShow" class="msg_wrapper">
-			<view class="msg_box">
-				<view class="msg_item">
-					<view class="filter_label">备注</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="msg_input" v-model="val0">
+		<view class="msg_wrapper h-50" :class="modelShow ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">备注</view>
+						<view class="filter_input_wraper">
+							<input type="text" class="filter_input" v-model="val0">
+						</view>
 					</view>
 				</view>
-				<view class="msg_btns">
-					<button class="submit-button" @tap="toSurerk">确定</button>
-				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-22 btn-submit btn-success letter-30" @tap="toSurerk">确定</button>
 			</view>
 		</view>
-		<view v-show="modelShow" class="mask"></view>
+		<view v-show="modelShow" class="msg_mask"></view>
 	</view>
 </template>
 
@@ -240,86 +243,4 @@
 	// // 	left 89rpx
 	// // 	z-index 102
 	// // 	box-shadow 1px 0 2px rgba(0,0,0,.12)
-	.msg_wrapper
-		position fixed
-		top 0
-		bottom 0
-		left 0
-		right 0
-		text-align center
-		z-index 10000
-		&::after
-			content ""
-			display inline-block
-			height 100%
-			width 0
-			vertical-align middle
-	.msg_box
-		display inline-block
-		width calc(100% - 30rpx)
-		padding 30rpx
-		vertical-align middle
-		background-color #fff
-		border-radius 8rpx
-		border 1px solid #ebeef5
-		font-size 36rpx
-		box-shadow 0 2px 12px 0 rgb(0 0 0 / 10%)
-		text-align left
-		overflow hidden
-		backface-visibility hidden
-	.buttonbox
-		width 100px
-		height 30px
-		margin-top 20px
-		margin 0 auto
-	.mask
-		position fixed
-		top 0
-		left 0
-		width 100%
-		height 100%
-		opacity .6
-		background #000
-		z-index 9999
-	.msg_item
-		display flex
-		justify-content: space-between
-		align-items: center
-		width 100%
-		height 80rpx
-		line-height 80rpx
-		margin 0 auto
-		margin-bottom 14rpx
-	.label_item
-		display inline-block
-		width 180rpx
-		font-size 32rpx
-		line-height inherit
-		color #606266
-	.from_item
-		display inline-block
-		width calc(100% - 200rpx)
-		line-height inherit
-	.msg_input
-		width 100%
-		height  80rpx
-		padding 0 30rpx
-		border-radius 4px
-		border 1px solid #DCDFE6
-		font-size 28rpx
-		line-height 80rpx
-		color #606266
-	.msg_btns
-		width 600rpx
-		height 70rpx
-		line-height 70rpx
-		margin 40rpx auto 0
-		display flex
-		justify-content: center
-		align-items: center
-	.submit-bar
-		justify-content space-around
-	.submit-button
-		margin-left 20rpx
-		margin-right 20rpx
 </style>
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 1aa37df..4065472 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
+		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show="false"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="input-wrap">
diff --git a/static/image/search_bg.png b/static/image/search_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca17e798a0781aca88eddabf998e252fbb683ee2
GIT binary patch
literal 4167
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

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 4d2813d..7d49016 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -29,65 +29,10 @@ export const handRequest = () => request({
 })
 
 // 菜单
-export const authority1 = () => request({
+export const authority = () => request({
 	url:'api/pda/authority',
 	data: {}
 })
-export const authority = () => {
-	let res = {
-		sonTree: [
-			{menu_id: '1', path: 'RF01', name: '生产管理', sonTree: [
-				{menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
-				{menu_id: '2', name: '生箔工序', path: '/pages/ProductManage/SboProcess'},
-				{menu_id: '3', name: '烘烤工序', path: '/pages/ProductManage/BakeProcess'},
-				{menu_id: '4', name: '人工烘烤', path: '/pages/ProductManage/ManmadeBake'}
-				]},
-			{menu_id: '2', path: 'RF02', name: '半成品管理', sonTree: [
-				{menu_id: '1', name: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'},
-				{menu_id: '2', name: '半成品出库', path: '/pages/WarehouseManage/SemifinishedOutStore'},
-				]},
-			{menu_id: '3', path: 'RF03', name: '分切管理', sonTree: [
-				{menu_id: '1', name: '分切上料', path: '/pages/ProductManage/SlittingFeeding'},
-				{menu_id: '2', name: '空轴套管', path: '/pages/ProductManage/ZjCasing'},
-				{menu_id: '3', name: '空轴配送', path: '/pages/ProductManage/ZjDelivery'},
-				{menu_id: '4', name: '空轴进站', path: '/pages/ProductManage/ZjInStore'},
-				{menu_id: '5', name: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
-				]},
-			{menu_id: '4', path: 'RF04', name: '点位管理', sonTree: [
-				{menu_id: '1', name: '点位管理', path: '/pages/ProductManage/PointManage'},
-				{menu_id: '2', name: '异常出库解锁', path: '/pages/WarehouseManage/ErrorOutUnlock'}
-				]},
-			{menu_id: '5', path: 'RF05', name: '纸管/FRP管管理', sonTree: [
-				{menu_id: '1', name: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'},
-				{menu_id: '2', name: '空管出库', path: '/pages/ProductManage/EmptyPipeOutStore'},
-				]},
-			{menu_id: '6', path: 'RF06', name: '成品管理', sonTree: [
-				{menu_id: '1', name: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'},
-				{menu_id: '2', name: '退货入库', path: '/pages/WarehouseManage/ReturngoodsInStore'},
-				{menu_id: '3', name: '报废入库', path: '/pages/WarehouseManage/ScrapInStore'},
-				{menu_id: '4', name: '拆分入库', path: '/pages/WarehouseManage/InStoreSplit'},
-				{menu_id: '5', name: '生产区发货', path: '/pages/WarehouseManage/ProdDelivery'},
-				{menu_id: '6', name: '虚拟区发货', path: '/pages/WarehouseManage/XuniDelivery'},
-				{menu_id: '7', name: '贴标捆扎', path: '/pages/WarehouseManage/LabelBind'}
-				]},
-			{menu_id: '7', path: 'RF07', name: '在库管理', sonTree: [
-				{menu_id: '1', name: '盘点管理', path: '/pages/WarehouseManage/CheckList'},
-				]},
-			{menu_id: '8', path: 'RF08', name: '载具管理', sonTree: [
-				{menu_id: '1', name: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'},
-				{menu_id: '2', name: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'},
-				]},
-			{menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [
-				{menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
-				]},
-			{menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [
-				{menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'},
-				{menu_id: '2', name: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
-				]}
-		]
-	}
-	return res
-}
 
 /**
  * 空管入库
@@ -557,4 +502,62 @@ data: {
 export const rgvStatusQuery = () => request({
 	url:'api/pda/task/rgvStatusQuery',
 	data: {}
+})
+
+/**
+ * 二期空载具入库
+ */
+// 1.1空载具入库-【入库按钮】
+export const twoPdaVehicleIn = (code, type, pcode) => request({
+	url:'api/twoPda/vehicle/vehicleIn',
+	data: {
+		vehicle_code: code,
+		vehicle_type: type,
+		point_code: pcode
+	}
+})
+/**
+ * 二期空木箱入库
+ */
+// 1.1空木箱入库-【入库按钮】
+export const twoPdaBoxIn = (code, no, pcode) => request({
+	url:'api/twoPda/vehicle/boxIn',
+	data: {
+		vehicle_code: code,
+		box_no: no,
+		point_code: pcode
+	}
+})
+/**
+ * 二期发货区解绑
+ */
+// 1.1单据初始化查询
+export const twoPdaIvtQuery = (no, code) => request({
+	url:'api/twoPda/st/ivtQuery',
+	data: {
+		box_no: no,
+		bill_code: code
+	}
+})
+// 1.2【确认】按钮（二级页面）
+export const twoPdaIvtDtlQuery = (no, code) => request({
+	url:'api/twoPda/st/ivtDtlQuery',
+	data: {
+		box_no: no,
+		bill_code: code
+	}
+})
+// 1.3木箱明细（点木箱超链接跳转）
+export const twoPdaIvtbBoxDtlQuery = (no) => request({
+	url:'api/twoPda/st/ivtbBoxDtlQuery',
+	data: {
+		box_no: no
+	}
+})
+// 1.4【出库确认】按钮（二级页面按钮）
+export const twoPdaOutConfirm = (no) => request({
+	url:'api/twoPda/st/outConfirm',
+	data: {
+		box_no: no
+	}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
new file mode 100644
index 0000000..5999694
--- /dev/null
+++ b/utils/mork2.js
@@ -0,0 +1,75 @@
+export const authority = () => {
+	let res = {
+		code: '1',
+		result: {
+		sonTree: [
+			{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
+				{menu_id: '1', title: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
+				{menu_id: '2', title: '生箔工序', path: '/pages/ProductManage/SboProcess'},
+				{menu_id: '3', title: '烘烤工序', path: '/pages/ProductManage/BakeProcess'},
+				{menu_id: '4', title: '人工烘烤', path: '/pages/ProductManage/ManmadeBake'}
+				]},
+			{menu_id: '2', path: 'RF02', title: '半成品管理', sonTree: [
+				{menu_id: '1', title: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'},
+				{menu_id: '2', title: '半成品出库', path: '/pages/WarehouseManage/SemifinishedOutStore'},
+				]},
+			{menu_id: '3', path: 'RF03', title: '分切管理', sonTree: [
+				{menu_id: '1', title: '分切上料', path: '/pages/ProductManage/SlittingFeeding'},
+				{menu_id: '2', title: '空轴套管', path: '/pages/ProductManage/ZjCasing'},
+				{menu_id: '3', title: '空轴配送', path: '/pages/ProductManage/ZjDelivery'},
+				{menu_id: '4', title: '空轴进站', path: '/pages/ProductManage/ZjInStore'},
+				{menu_id: '5', title: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
+				]},
+			{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
+				{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},
+				{menu_id: '2', title: '异常出库解锁', path: '/pages/WarehouseManage/ErrorOutUnlock'}
+				]},
+			{menu_id: '5', path: 'RF05', title: '纸管/FRP管管理', sonTree: [
+				{menu_id: '1', title: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'},
+				{menu_id: '2', title: '空管出库', path: '/pages/ProductManage/EmptyPipeOutStore'},
+				]},
+			{menu_id: '6', path: 'RF06', title: '成品管理', sonTree: [
+				{menu_id: '1', title: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'},
+				{menu_id: '2', title: '退货入库', path: '/pages/WarehouseManage/ReturngoodsInStore'},
+				{menu_id: '3', title: '报废入库', path: '/pages/WarehouseManage/ScrapInStore'},
+				{menu_id: '4', title: '拆分入库', path: '/pages/WarehouseManage/InStoreSplit'},
+				{menu_id: '5', title: '生产区发货', path: '/pages/WarehouseManage/ProdDelivery'},
+				{menu_id: '6', title: '虚拟区发货', path: '/pages/WarehouseManage/XuniDelivery'},
+				{menu_id: '7', title: '贴标捆扎', path: '/pages/WarehouseManage/LabelBind'}
+				]},
+			{menu_id: '7', path: 'RF07', title: '在库管理', sonTree: [
+				{menu_id: '1', title: '盘点管理', path: '/pages/WarehouseManage/CheckList'},
+				]},
+			{menu_id: '8', path: 'RF08', title: '载具管理', sonTree: [
+				{menu_id: '1', title: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'},
+				{menu_id: '2', title: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'},
+				]},
+			{menu_id: '9', path: 'RF09', title: '打印管理', sonTree: [
+				{menu_id: '1', title: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
+				]},
+			{menu_id: '10', path: 'RF10', title: '调度管理', sonTree: [
+				{menu_id: '1', title: '任务管理', path: '/pages/DispatchManage/TaskManage'},
+				{menu_id: '2', title: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
+				]}
+		]
+	}}
+	return res
+}
+export const twoPdaIvtQuery = (no, code) => {
+	let res = {
+		data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}]
+	}
+	return res
+}
+export const twoPdaIvtDtlQuery = (no, code) => {
+	let res = {
+		data: [{package_box_sn: '1', point_code: 'ljdjldj'}, {package_box_sn: '2'}]
+	}
+	return res
+}
+export const twoPdaIvtbBoxDtlQuery = (no) => {
+	let res = {
+		data: [{package_box_sn: '1', container_name: 'ljdjldj'}, {package_box_sn: '2'}]
+	}
+	return res
+}
\ No newline at end of file