From 6c663b92b0078aa89657df22ec188dff65599f04 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 21 十月 2025 17:24:38 +0800
Subject: [PATCH] 1

---
 项目代码/PDA/pages/task/CompletedTask.vue |   34 ++++++++++------------------------
 1 files changed, 10 insertions(+), 24 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/TaskInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/CompletedTask.vue"
similarity index 74%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/TaskInfo.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/CompletedTask.vue"
index fbcb051..0c9990b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/TaskInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/CompletedTask.vue"
@@ -4,31 +4,23 @@
 			<uni-list-item direction="column" v-for="item in taskInfo" :key="item.taskNum">
 				<template v-slot:body>
 					<view class="uni-list-box">
-						<!-- <checkbox @click="click(item)"></checkbox> -->
+						<checkbox @click="click(item)"></checkbox>
 						<view class="uni-content">
 							<view class="uni-title-sub uni-ellipsis-2">浠诲姟鍙凤細{{item.taskNum}}</view>
-							<br>
-							<view class="uni-title-sub uni-ellipsis-2">鎵�&nbsp;鐩�&nbsp;鍙凤細{{item.palletCode}}</view>
-							<br>
-							<view class="uni-title-sub uni-ellipsis-2">浠诲姟绫诲瀷锛歿{item.taskType}}</view>
-							<br>
-							<view class="uni-title-sub uni-ellipsis-2">浠诲姟鐘舵�侊細{{item.taskState}}</view>
-							<br>
-							<view class="uni-title-sub uni-ellipsis-2">璧�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鐐癸細{{item.sourceAddress}}</view>
-							<br>
-							<view class="uni-title-sub uni-ellipsis-2">缁�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鐐癸細{{item.targetAddress}}</view>
-							<br>
+							<view class="uni-note">鎵�&nbsp;鐩�&nbsp;鍙凤細{{item.palletCode}}</view>
+							<view class="uni-note">璧�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鐐癸細{{item.sourceAddress}}</view>
+							<view class="uni-note">缁�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鐐癸細{{item.targetAddress}}</view>
 						</view>
 					</view>
 				</template>
 			</uni-list-item>
 		</uni-list>
 
-		<!-- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="customcss">
+		<view style="background-color: #fff; padding: 20rpx,20rpx;" class="customcss">
 			<u-sticky offset-top="80%">
-				<button type="primary" @click="cancelTask()">鍙栨秷浠诲姟</button>
+				<button type="primary" @click="completedTask()">瀹屾垚浠诲姟</button>
 			</u-sticky>
-		</view> -->
+		</view>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -44,21 +36,15 @@
 		onLoad(res) {
 			this.getData();
 		},
-		mounted() {
-			this.getData();
-			setInterval(() => {
-				this.getData();
-			}, 50000);
-		},
 		methods: {
 			getData() {
-				this.$u.post('/api/PDA/GetTaskInfo', null).then((res) => {
+				this.$u.post('/api/Task/GetTaskInfo', null).then((res) => {
 					if (res.status) {
 						this.taskInfo = res.data;
 					}
 				})
 			},
-			cancelTask() {
+			completedTask() {
 				if (this.items.length == 0) {
 					this.$refs.uToast.show({
 						title: "璇烽�夋嫨瑕佸彇娑堢殑鏁版嵁",
@@ -78,7 +64,7 @@
 						"taskNum": this.items[0].taskNum,
 					},
 				}
-				this.$u.post('/api/Task/TaskCancel', postData).then((res) => {
+				this.$u.post('/api/Task/CompleteAsync', postData).then((res) => {
 					if (res.status) {
 						this.items = [];
 						this.$refs.uToast.show({

--
Gitblit v1.9.3