From 6b8a6b0591e97aa7d175c5f6c61d64534f038124 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期一, 12 五月 2025 14:56:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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 fc68d77..4ac6ac7 100644 --- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue +++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue @@ -164,7 +164,7 @@ :disabled="disableSubmit || finalAcceptanceDisable"/> </a-form-model-item> </a-col> - <a-col :span="12"> + <a-col :span="6"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult" label="鍒濋獙鏀堕檮浠�"> <lx-upload :returnUrl="false" @@ -173,6 +173,17 @@ v-model="model.initialAcceptanceFilesResult"/> </a-form-model-item> </a-col> + <a-col :span="6"> + <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="randomInspectionFlag" + label="鎶芥鏍囪"> + <lx-switch + checked-children='鏄�' + un-checked-children='鍚�' + v-model="model.randomInspectionFlag" + :disabled="disableSubmit || finalAcceptanceDisable" + /> + </a-form-model-item> + </a-col> </a-row> </div> <div v-if="finalAcceptanceDisable"> -- Gitblit v1.9.3