From 4e60ba038a1fbd0808a4cadd83e04606e6865bd4 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期二, 14 十一月 2023 10:14:47 +0800 Subject: [PATCH] 工艺信息的更新按钮加载更换方式 --- src/views/dashboard/components/TaskControl.vue | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue index 3d22b64..e8e60e1 100644 --- a/src/views/dashboard/components/TaskControl.vue +++ b/src/views/dashboard/components/TaskControl.vue @@ -21,8 +21,10 @@ 寮�濮嬬敓浜� </BigButton> <template v-if="task?.Procedure.Status === 2 || task?.Procedure.Status === 3"> - <BigButton class="btn" bg-color="#ff9933">鎵撳嵃</BigButton> - <BigButton class="btn" bg-color="#00cc33">鎶ュ伐</BigButton> + <BigButton class="btn" bg-color="#ff9933" :disabled="task?.Procedure.Status === 3">鎵撳嵃</BigButton> + <BigButton class="btn" bg-color="#00cc33" :disabled="task?.Procedure.Status === 3" @click="openReportModal"> + 鎶ュ伐 + </BigButton> <el-popconfirm width="340" confirm-button-text="纭畾" @@ -36,13 +38,18 @@ @confirm="finishTaskProduce" > <template #reference> - <BigButton class="btn" bg-color="#ff0000">瀹屾垚</BigButton> + <BigButton class="btn" bg-color="#ff0000" :disabled="task?.Procedure.Status === 3">瀹屾垚</BigButton> </template> </el-popconfirm> </template> </div> </div> <TaskControlModal v-model="showTaskControlModal" :task="task" @produce-start="onProduceStart"></TaskControlModal> + <ReportProductionModal + v-model="showReportModal" + @close="showReportModal = false" + @submit="showReportModal = false" + ></ReportProductionModal> </template> <script setup lang="ts"> import type { Task } from '@/api/task' @@ -53,6 +60,7 @@ import { CircleCloseFilled } from '@element-plus/icons-vue' import { finishTask } from '@/api' import { ElMessage } from 'element-plus' +import ReportProductionModal from '@/views/dashboard/components/ReportProductionModal.vue' const props = defineProps<{ task?: Task @@ -113,9 +121,14 @@ if (!timestamp) { return '--' } - const time = useDateFormat(timestamp * 1000, 'YYYY-MM-DD', { locales: 'zh-cn' }) + const time = useDateFormat(timestamp * 1000, 'YYYY-MM-DD HH:mm:ss', { locales: 'zh-cn' }) return time.value } +// 鎶ュ伐 +const showReportModal = ref(false) +function openReportModal() { + showReportModal.value = true +} </script> <style scoped lang="scss"> $title-text-color: #9599af; -- Gitblit v1.8.0