From 3629dde86000f6412b35aea04399983921df7099 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 17:50:08 +0800
Subject: [PATCH] 1、OEE报表计算功能 选择时间添加限制，禁止选择选今天及未来日期 2、解决车间布局图点击设备详细弹窗展示异常问题（删除车间看板页面独立的详情弹窗组件，沿用设备监控页面详情弹窗组件）
---
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
index 4ac6ac7..5db633f 100644
--- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -197,7 +197,7 @@
:disabled="disableSubmit || completionDisable"/>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="6">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult"
label="缁堥獙鏀堕檮浠�">
<lx-upload :returnUrl="false"
@@ -206,6 +206,17 @@
v-model="model.finalAcceptanceFilesResult"/>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalRandomInspectionFlag"
+ label="鎶芥鏍囪">
+ <lx-switch
+ checked-children='鏄�'
+ un-checked-children='鍚�'
+ v-model="model.finalRandomInspectionFlag"
+ :disabled="disableSubmit || completionDisable"
+ />
+ </a-form-model-item>
+ </a-col>
</a-row>
</div>
</a-form-model>
--
Gitblit v1.9.3