From a9ae6161822221640ecf7e0299035d47c4b3e09b Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 3 Jul 2025 09:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/EmptyBoxOutStore.vue       | 12 ++++++++---
 pages/SecondPhase/finished/BoxWeight.vue     | 18 ++++++++++------
 pages/SecondPhase/finished/ReturnToStore.vue | 20 +++++++++++-------
 pages/SecondPhase/finished/abnorToStore.vue  | 22 +++++++++++++-------
 pages/SecondPhase/point/ManPass.vue          | 16 +++++++++-----
 pages/SecondPhase/production/SboProcess.vue  |  2 +-
 6 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue
index a635c5d..60b47a7 100644
--- a/pages/SecondPhase/EmptyBoxOutStore.vue
+++ b/pages/SecondPhase/EmptyBoxOutStore.vue
@@ -79,6 +79,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {twoQueryBoxIvt, twoBoxOut} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -134,12 +135,17 @@
 					this.selectedNum = this.checkArr.length
 				}
 			},
-			async _twoBoxOut () {
-				this.disabled = true
+			async handleConfirm() {
 				if (!this.checkArr.length) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._twoPdaVehicleIn()
+				}
+			},
+			async _twoBoxOut () {
+				this.disabled = true
 				try {
 					let res = await twoBoxOut(this.checkArr)
 					uni.showToast({
diff --git a/pages/SecondPhase/finished/BoxWeight.vue b/pages/SecondPhase/finished/BoxWeight.vue
index 3f13d36..67289e5 100644
--- a/pages/SecondPhase/finished/BoxWeight.vue
+++ b/pages/SecondPhase/finished/BoxWeight.vue
@@ -4,7 +4,7 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.box-no')}}</span>
 					</view>
@@ -12,7 +12,7 @@
 						<search-box v-model="val1" @handleChange="handleChange"/>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('grid.weight')}}</view>
 					<view class="filter_input_wraper">
 						<input type="text" class="filter_input" v-model="val2" :class="{'filter_input_disabled': disabled1}" :disabled="disabled1">
@@ -22,7 +22,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_saveBoxInfo">保存</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="handleConfirm">保存</button>
 		</view>
 	</view>
 </template>
@@ -30,6 +30,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {getBoxInfo, saveBoxInfo} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -75,12 +76,17 @@
 				this.val2 = ''
 				this.disabled1 = true
 			},
-			async _saveBoxInfo () {
-				this.disabled = true
+			async handleConfirm() {
 				if (!this.val1 || !this.val2) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._saveBoxInfo()
+				}
+			},
+			async _saveBoxInfo () {
+				this.disabled = true
 				try {
 					let res = await saveBoxInfo(this.val1, this.val2)
 					uni.showToast({
diff --git a/pages/SecondPhase/finished/ReturnToStore.vue b/pages/SecondPhase/finished/ReturnToStore.vue
index 77e4846..18ee6a0 100644
--- a/pages/SecondPhase/finished/ReturnToStore.vue
+++ b/pages/SecondPhase/finished/ReturnToStore.vue
@@ -4,13 +4,13 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.document-type')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.box-no')}}</span>
 					</view>
@@ -18,7 +18,7 @@
 						<search-box v-model="val1" />
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('grid.point-code')}}</span>
 					</view>
@@ -30,7 +30,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2}" :disabled="disabled" @tap="_twoPdaReturnIn">入库</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2}" :disabled="disabled" @tap="handleConfirm">入库</button>
 		</view>
 	</view>
 </template>
@@ -38,6 +38,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {twoPdaReturnIn} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -61,12 +62,17 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _twoPdaReturnIn () {
-				this.disabled = true
+			async handleConfirm() {
 				if (!this.index || !this.val1 || !this.val2) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._twoPdaReturnIn()
+				}
+			},
+			async _twoPdaReturnIn () {
+				this.disabled = true
 				try {
 					let res = await twoPdaReturnIn(this.index, this.val1, this.val2)
 					uni.showToast({
diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue
index f987fc3..4eca08e 100644
--- a/pages/SecondPhase/finished/abnorToStore.vue
+++ b/pages/SecondPhase/finished/abnorToStore.vue
@@ -4,13 +4,13 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.document-type')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.box-no')}}</span>
 					</view>
@@ -18,7 +18,7 @@
 						<search-box v-model="val1" />
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.pallet-number')}}</span>
 					</view>
@@ -26,7 +26,7 @@
 						<search-box v-model="val2" />
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('grid.point-code')}}</span>
 					</view>
@@ -38,7 +38,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2 || !val3}" :disabled="disabled" @tap="_twoPdaReback">入库</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">入库</button>
 		</view>
 	</view>
 </template>
@@ -46,6 +46,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {twoPdaReback} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -70,12 +71,17 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _twoPdaReback () {
-				this.disabled = true
+			async handleConfirm() {
 				if (!this.index || !this.val1 || !this.val2 || !this.val3) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._twoPdaReback()
+				}
+			},
+			async _twoPdaReback () {
+				this.disabled = true
 				try {
 					let res = await twoPdaReback(this.index, this.val1, this.val2, this.val3)
 					uni.showToast({
diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue
index 0ab060f..bb56246 100644
--- a/pages/SecondPhase/point/ManPass.vue
+++ b/pages/SecondPhase/point/ManPass.vue
@@ -4,7 +4,7 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.vehicle-type')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
@@ -14,7 +14,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_confirmPass">{{$t('button.confirm')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</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'">
@@ -31,6 +31,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {confirmPass, outPointPass} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -53,12 +54,17 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _confirmPass () {
-				this.disabled = true
+			async handleConfirm() {
 				if (!this.index) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._confirmPass()
+				}
+			},
+			async _confirmPass () {
+				this.disabled = true
 				try {
 					let res = await confirmPass(this.index)
 					uni.showToast({
diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
index c8f8dfe..3957a86 100644
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -4,7 +4,7 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('grid.point-code')}}</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val1" />