From 141fab5b98beacd966a95467c7791504e045b1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 10:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=82=B9=E6=94=BE=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl            | 40 +++++++++++++++++++++++++++++
 common/style/reset.css              |  3 +++
 pages/SecondPhase/point/ManPass.vue | 33 +++++++++++++++++++++---
 utils/getData3.js                   |  5 ++++
 4 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index f83ad72..de584f2 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -531,4 +531,44 @@ uni-button[disabled]:not([type]) {
 	color: #ff6a00;
 	text-align: left;
 	margin-bottom: 16rpx;
+}
+.more_btns_wraper {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 301;
+	padding: 0 20rpx 20rpx;
+	transition: all .3s;
+}
+.more-button {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	border-radius: 0;
+	border-bottom: 1px solid #c9c9c9;
+	background-color: transparent;
+}
+.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
+	color: #c9c9c9;
+	border: none;
+}
+.more-button:last-child {
+	border-bottom: none;
+}
+.more_btns_cancle {
+	margin-top: 20rpx;
+	width: 100%;
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 20rpx;
+}
+.more_btns_items{
+	width: 100%;
+	border-radius: 20rpx;
+	background-color: #fff;
 }
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
index 128e30b..682929d 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -47,6 +47,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .jcflexstart {
 	justify-content: flex-start !important;
 }
+.jccenter {
+	justify-content: center !important;
+}
 .zd-row {
 	display: flex;
 	justify-content: space-between;
diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue
index bae40bb..18d4357 100644
--- a/pages/SecondPhase/point/ManPass.vue
+++ b/pages/SecondPhase/point/ManPass.vue
@@ -13,16 +13,25 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_confirmPass">确认</button>
+			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_confirmPass">确认</button>
+			<button class="zd-col-8 btn-submit btn-success" @tap="btn_active=true">出库点放行</button>
 		</view>
+		<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">
+			<view class="more_btns_items">
+				<button class="more-button" :disabled="disabled" @tap="_outPointPass('CK2026')">CK2026放行</button>
+				<button class="more-button" :disabled="disabled" @tap="_outPointPass('CK2027')">CK2027放行</button>
+			</view>
+			<view class="more_btns_cancle" @tap="btn_active = false">取消</view>
+		</view>
+		<view v-show="btn_active" class="msg_mask"></view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {confirmPass} from '@/utils/getData3.js'
+	import {confirmPass, outPointPass} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -33,7 +42,8 @@
 				title: '',
 				options: [{value: 'CK2020', text: '捆扎点2020'}, {value: 'CK2022', text: '捆扎点2022'}],
 				index: '',
-				disabled: false
+				disabled: false,
+				btn_active: false
 			};
 		},
 		onLoad (options) {
@@ -62,6 +72,21 @@
 			},
 			clearUp () {
 				this.index = ''
+			},
+			async _outPointPass (code) {
+				this.disabled = true
+				try {
+					let res = await outPointPass(code)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.btn_active = false
+				} catch (e) {
+					this.disabled = false
+					this.btn_active = false
+				}
 			}
 		}
 	}
diff --git a/utils/getData3.js b/utils/getData3.js
index 0398c55..937177c 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -278,6 +278,11 @@ export const confirmPass = (code) => request({
 	url:'api/twoPda/st/confirmPass',
 	data: {point_code: code}
 })
+// CK2026放行/CK2027放行
+export const outPointPass = (code) => request({
+	url:'api/twoPda/st/outPointPass',
+	data: {point_code: code}
+})
 
 /**
  * 打印