From 12d197c80d4461a855257bde7766cd2e22da6a2a Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 19 Dec 2025 10:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ftdlDTY/work-manage.vue | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/ftdlDTY/work-manage.vue b/pages/ftdlDTY/work-manage.vue
index fbd4ead..578a241 100644
--- a/pages/ftdlDTY/work-manage.vue
+++ b/pages/ftdlDTY/work-manage.vue
@@ -49,11 +49,10 @@
 			<!-- <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">
-			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
-			<!-- <button class="zd-col-6 button-primary" @tap="searchList">{{$t('button.search')}}</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="toStartConfirm">{{$t('button.start-confirm')}}</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="toEndConfirm">{{$t('button.end-confirm')}}</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled3" @tap="handleConfirm">{{$t('button.finish')}}</button>
+			<button class="zd-col-5 button-primary" @tap="searchList">{{$t('button.search')}}</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="toStartConfirm">{{$t('button.start-confirm')}}</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="toEndConfirm">{{$t('button.end-confirm')}}</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled3" @tap="handleConfirm">{{$t('button.finish')}}</button>
 		</view>
 		<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop_content">
@@ -71,7 +70,8 @@
 				</view>
 			</view>
 			<view class="zd-row submit-bar">
-				<button class="zd-col-22 button-primary" :class="{'button-info': !val2}" :disabled="disabled1" @tap="_startPointConfirm">{{$t('button.start-confirm')}}</button>
+				<button class="zd-col-6 button-default" @tap="toCancel">取消</button>
+				<button class="zd-col-16 button-primary" :class="{'button-info': !val2}" :disabled="disabled1" @tap="_startPointConfirm">{{$t('button.start-confirm')}}</button>
 			</view>
 		</view>
 		<view v-show="show" class="msg_mask"></view>
@@ -91,7 +91,8 @@
 				</view>
 			</view>
 			<view class="zd-row submit-bar">
-				<button class="zd-col-22 button-primary" :class="{'button-info': !val3}" :disabled="disabled2" @tap="_endPointConfirm">{{$t('button.end-confirm')}}</button>
+				<button class="zd-col-6 button-default" @tap="toCancel">取消</button>
+				<button class="zd-col-16 button-primary" :class="{'button-info': !val3}" :disabled="disabled2" @tap="_endPointConfirm">{{$t('button.end-confirm')}}</button>
 			</view>
 		</view>
 		<view v-show="show2" class="msg_mask"></view>
@@ -139,6 +140,10 @@
 			this.title = options.title
 		},
 		methods: {
+			toCancel() {
+				this.show = false
+				this.show2 = false
+			},
 			handleChange (e) {
 				if (e) {
 					this.searchList()