From 1cb38dbdb58bc3966453ca43585140323e50d1b8 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 20 八月 2025 09:15:51 +0800 Subject: [PATCH] 1、二、三保工单增加批量打印及导出完工单和验收单功能 2、二保工单审批流程图展示增加滚动条 3、html导出成excel工具方法增加单元格换行展示以及自适应换行高度功能 --- src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue index 8c9382e..3ea2799 100644 --- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue +++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue @@ -20,13 +20,13 @@ </a-form-model-item> </a-col> <a-col :span="12"> - <a-form-model-item label="鏁呴殰绫诲瀷"> + <a-form-model-item label="鏁呴殰绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol"> <j-dict-select-tag dict-code="fault_type" v-model="model.faultType" disabled/> </a-form-model-item> </a-col> <a-col :span="12"> - <a-form-model-item label="鎶ヤ慨浜�"> - <a-input v-model="model.reportPerson" readOnly/> + <a-form-model-item label="鎶ヤ慨浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-input v-model="model.reportPerson_dictText" readOnly/> </a-form-model-item> </a-col> <a-col :span="12"> @@ -37,6 +37,16 @@ <a-col :span="12"> <a-form-model-item label="缁翠慨缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-input v-model="model.actualEndTime" readOnly/> + </a-form-model-item> + </a-col> + <a-col :span="12"> + <a-form-model-item label="缁翠慨鏃堕暱" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-input v-model="model.repairDuration" readOnly/> + </a-form-model-item> + </a-col> + <a-col :span="12"> + <a-form-model-item label="鏁呴殰鏃堕暱" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-input v-model="model.faultDuration" readOnly/> </a-form-model-item> </a-col> <a-col :span="24"> @@ -174,7 +184,7 @@ type: JVXETypes.normal }, { - title: '缁翠慨鏃堕暱', + title: '缁翠慨鏃堕暱(灏忔椂)', key: 'repairDuration', align: 'center', type: JVXETypes.normal -- Gitblit v1.9.3