From 4929a5b789b45617e5bd095f51d8deb4cdc4fef4 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Apr 2024 10:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=8C=85=E6=9C=BA=E7=A9=BA=E6=96=99?=
 =?UTF-8?q?=E4=BD=8D=E9=80=81=E7=A9=BA=E8=9B=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    |  3 +-
 common/style/layout.styl     | 26 +++++++++++-----
 pages/manage/cbj-carry.vue   | 59 ++++++++++++++++++++++++++++++------
 pages/manage/press-carry.vue | 12 ++++----
 utils/getData2.js            |  5 +++
 5 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 5f049ea..b2fe163 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # 注意事项
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
-+ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
\ No newline at end of file
++ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
++ app图标为lms
\ No newline at end of file
diff --git a/common/style/layout.styl b/common/style/layout.styl
index e4d0206..c4c7cb1 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -22,14 +22,16 @@ uni-button:after {
 	top: calc(var(--status-bar-height) + 72rpx);
 	width: 100%;
 	height: auto;
-	// padding: 20rpx 14rpx 140rpx 14rpx;
-	padding: 0 0 140rpx 0;
+	padding: 20rpx 14rpx 140rpx 14rpx;
+}
+.zd_content_1 {
+	top: calc(var(--status-bar-height) + 136rpx);
 }
 .zd_wrapper {
 	width: 100%;
 	height: auto;
 	background-color: #fff;
-	// border-radius: 10rpx;
+	border-radius: 10rpx;
 	padding: 22rpx;
 	margin-bottom: 20rpx;
 	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
@@ -447,16 +449,24 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	background-color: transparent !important
 }
 // 标签页
+.tab-item-wraper {
+	position: fixed;
+	top: calc(var(--status-bar-height) + 72rpx);
+	z-index 200
+	background-color: $red
+	box-shadow: 0 6rpx 10rpx 0 rgba(255, 106, 0, .25)
+}
 .tab-item {
 	position relative
-	font-size: 30rpx
+	font-size: 28rpx
 	line-height: 60rpx
-	color: #a5a5a5
+	color: #fbd5d5
 	text-align: center
-	margin: 0 30rpx 20rpx 30rpx
+	margin: 0 30rpx 0 30rpx
 }
 .tab-item_active {
-	color: $red
+	color: #fff
+	font-weight 700
 }
 .tab-item_active::after {
 	position absolute
@@ -465,5 +475,5 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	content ''
 	width 70%
 	height 4rpx
-	background-color $red
+	background-color #fff
 }
\ No newline at end of file
diff --git a/pages/manage/cbj-carry.vue b/pages/manage/cbj-carry.vue
index e6acfb7..79e5c4d 100644
--- a/pages/manage/cbj-carry.vue
+++ b/pages/manage/cbj-carry.vue
@@ -1,7 +1,14 @@
 <template>
 	<view class="zd_container">
 		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
+		<view class="zd-row jccenter tab-item-wraper">
+			<view class="zd-col-16 zd-row">
+				<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">叫料</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">满料</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 3}" @tap="tab=3">送空盅</view>
+			</view>
+		</view>
+		<view class="zd_content zd_content_1">
 			<view class="zd_wrapper">
 				<view v-show="tab === 2" class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -13,7 +20,7 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
+				<view v-show="tab === 1 || tab === 2" class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">点位</span>
 					</view>
@@ -21,11 +28,23 @@
 						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
 					</view>
 				</view>
-			</view>
-			<view class="zd-row jccenter">
-				<view class="zd-col-16 zd-row">
-					<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">叫料</view>
-					<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">满料</view>
+				<view v-show="tab === 3" class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">下个点位类型</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view v-show="tab === 3" class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
 				</view>
 			</view>
 			<view v-show="tab === 1" class="zd_wrapper grid-wraper">
@@ -102,6 +121,10 @@
 			<button class="zd-col-6 button-default" @tap="index1 = '', val1 = ''">清空</button>
 			<button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button>
 		</view>
+		<view v-show="tab === 3" class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="index2 = '', val2 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val2 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
+		</view>
 		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop-line"></view>
 			<view class="msg_content">
@@ -123,7 +146,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {unpackShelfInfo, getCbjPoint, cbjqlTask, hnWorkOrder,cbjmlTask,cbjqkTask} from '@/utils/getData2.js'
+	import {unpackShelfInfo, getCbjPoint, cbjqlTask, hnWorkOrder,cbjmlTask,cbjqkTask, cbjskTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -143,7 +166,11 @@
 				disabled1: false,
 				disabled2: false,
 				disabled3: false,
-				show: false
+				show: false,
+				options2: [{value: 'CBJXLW', text: '拆包机下料位'},{value: 'KLHW', text: '困料货架'}],
+				index2: '',
+				val2: '',
+				disabled4: false
 			};
 		},
 		onLoad (options) {
@@ -231,6 +258,20 @@
 					this.disabled3 = false
 				}
 			},
+			/** 拆包机空料位送空蛊 */
+			async _cbjskTask () {
+				this.disabled4 = true
+				try {
+					let res = await cbjskTask(this.index2, this.val2)
+					this.disabled4 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled4 = false
+				}
+			}
 		}
 	}
 </script>
diff --git a/pages/manage/press-carry.vue b/pages/manage/press-carry.vue
index d72ff5c..7f7b99f 100644
--- a/pages/manage/press-carry.vue
+++ b/pages/manage/press-carry.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="zd_container">
 		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd-row jccenter">
-				<view class="zd-col-16 zd-row">
-					<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">回库</view>
-					<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">点对点</view>
-				</view>
+		<view class="zd-row jccenter tab-item-wraper">
+			<view class="zd-col-16 zd-row">
+				<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">回库</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">点对点</view>
 			</view>
+		</view>
+		<view class="zd_content zd_content_1">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
diff --git a/utils/getData2.js b/utils/getData2.js
index d12c494..246ed57 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -57,6 +57,11 @@ export const cbjqkTask = (ep) => request({
 	url:'api/pda/cbjqkTask',
 	data: {endPoint: ep}
 })
+// 拆包机空料位送空蛊
+export const cbjskTask = (type, sp) => request({
+	url:'api/pda/cbjskTask',
+	data: {nextType: type, startPoint: sp}
+})
 
 /**
  * 压机搬运