From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0

---
 src/views/mes/workbench/components/TaskListPanel.vue |  135 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 134 insertions(+), 1 deletions(-)

diff --git a/src/views/mes/workbench/components/TaskListPanel.vue b/src/views/mes/workbench/components/TaskListPanel.vue
index 6530d39..90141ef 100644
--- a/src/views/mes/workbench/components/TaskListPanel.vue
+++ b/src/views/mes/workbench/components/TaskListPanel.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { PendingTask } from '../../types';
+
 
 import { computed, ref } from 'vue';
 
@@ -15,7 +15,13 @@
 
 const emit = defineEmits<{
   select: [task: PendingTask];
+  refresh: [];
 }>();
+
+import { pauseTask, resumeTask } from '#/api/mes/pro/task';
+import { Form, FormItem, Input, Modal, message, Button } from 'ant-design-vue';
+import { confirm } from '@vben/common-ui';
+import type {PendingTask} from "#/views/mes/workbench/types";
 
 const searchKeyword = ref('');
 
@@ -41,6 +47,50 @@
   if (rate >= 100) return '#52c41a';
   if (rate >= 60) return '#1890ff';
   return '#faad14';
+}
+
+const pauseModalVisible = ref(false);
+const pauseFormRef = ref();
+const pauseFormState = ref({ id: 0, reason: '', remark: '' });
+const pauseLoading = ref(false);
+
+const pauseRules = {
+  reason: [{ required: true, message: '璇疯緭鍏ュ仠宸ュ師鍥�', trigger: 'blur' }],
+};
+
+function handlePause(item: PendingTask, event: Event) {
+  event.stopPropagation();
+  pauseFormState.value = { id: item.id!, reason: '', remark: '' };
+  pauseModalVisible.value = true;
+}
+
+async function submitPause() {
+  await pauseFormRef.value?.validate();
+  pauseLoading.value = true;
+  try {
+    await pauseTask(pauseFormState.value);
+    message.success('鍋滃伐鎴愬姛');
+    pauseModalVisible.value = false;
+    emit('refresh');
+  } finally {
+    pauseLoading.value = false;
+  }
+}
+
+async function handleResume(item: PendingTask, event: Event) {
+  event.stopPropagation();
+  try {
+    await confirm('纭瑕佸宸ヨ浠诲姟鍚楋紵');
+  } catch {
+    return;
+  }
+  try {
+    await resumeTask({ id: item.id! });
+    message.success('澶嶅伐鎴愬姛');
+    emit('refresh');
+  } catch (error: any) {
+    // Error is handled by request interceptor
+  }
 }
 </script>
 
@@ -99,6 +149,27 @@
             >
               {{ item.feedbackRate ?? 0 }}%
             </span>
+            <div class="task-card__actions">
+              <Button
+                v-if="item.status === 9"
+                type="primary"
+                size="small"
+                class="task-card__action-btn resume-btn"
+                @click="handleResume(item, $event)"
+              >
+                澶嶅伐
+              </Button>
+              <Button
+                v-else
+                type="primary"
+                danger
+                size="small"
+                class="task-card__action-btn pause-btn"
+                @click="handlePause(item, $event)"
+              >
+                鍋滃伐
+              </Button>
+            </div>
           </div>
 
           <div class="task-card__progress-row">
@@ -144,6 +215,42 @@
         </div>
       </div>
     </div>
+
+    <Modal
+      v-model:open="pauseModalVisible"
+      title="鐢熶骇浠诲姟鍋滃伐"
+      @ok="submitPause"
+      :confirm-loading="pauseLoading"
+      destroy-on-close
+    >
+      <Form
+        ref="pauseFormRef"
+        :model="pauseFormState"
+        :rules="pauseRules"
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 20 }"
+        style="margin-top: 20px"
+      >
+        <FormItem label="鍋滃伐鍘熷洜" name="reason">
+          <Input.TextArea
+            v-model:value="pauseFormState.reason"
+            placeholder="璇疯緭鍏ュ仠宸ュ師鍥狅紙濡傦細璁惧鏁呴殰銆佺己鏂欑瓑锛�"
+            :rows="3"
+            :maxlength="100"
+            show-count
+          />
+        </FormItem>
+        <FormItem label="澶囨敞" name="remark">
+          <Input.TextArea
+            v-model:value="pauseFormState.remark"
+            placeholder="璇疯緭鍏ュ娉ㄨ鏄�"
+            :rows="2"
+            :maxlength="200"
+            show-count
+          />
+        </FormItem>
+      </Form>
+    </Modal>
   </section>
 </template>
 
@@ -290,6 +397,32 @@
   font-variant-numeric: tabular-nums;
 }
 
+.task-card__actions {
+  display: flex;
+  align-items: center;
+  margin-left: auto;
+}
+
+.task-card__action-btn {
+  font-size: 13px;
+  border-radius: 4px;
+}
+
+.pause-btn {
+  box-shadow: 0 2px 4px rgb(255 77 79 / 20%);
+}
+
+.resume-btn {
+  background-color: #52c41a;
+  border-color: #52c41a;
+  box-shadow: 0 2px 4px rgb(82 196 26 / 20%);
+}
+.resume-btn:hover,
+.resume-btn:focus {
+  background-color: #73d13d;
+  border-color: #73d13d;
+}
+
 .task-card__progress-row {
   display: flex;
   align-items: baseline;

--
Gitblit v1.9.3