From d8750fe7ab9bd6691cb3078f7cf365ae1f64ac06 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期一, 09 六月 2025 11:45:08 +0800 Subject: [PATCH] 利用率分段分析页面时间段默认值从00:00至08:00点调整为00:00至23:59分 --- src/views/flowable/workflow/FlowCompleted.vue | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue index 21cf990..eec40ae 100644 --- a/src/views/flowable/workflow/FlowCompleted.vue +++ b/src/views/flowable/workflow/FlowCompleted.vue @@ -15,12 +15,19 @@ dictCode="flow_type"></j-dict-select-tag> </a-form-item> </a-col> + <a-col :xl="4" :lg="6" :md="8" :sm="24"> + <a-form-item label="绠�瑕佹弿杩�"> + <a-input placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" v-model="queryParam.title"></a-input> + </a-form-item> + </a-col> <a-col :xl="10" :lg="11" :md="12" :sm="24"> - <a-form-item label="鎿嶄綔鏃堕棿"> - <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="query-group-cust" + <a-form-item label="浠诲姟鏃堕棿鑼冨洿"> + <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" + class="query-group-cust" v-model="queryParam.startTime"></j-date> <span class="query-group-split-cust"></span> - <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="query-group-cust" + <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" + class="query-group-cust" v-model="queryParam.endTime"></j-date> </a-form-item> </a-col> @@ -82,6 +89,8 @@ <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/> <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/> + + <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/> </a-card> </template> @@ -93,11 +102,13 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle' import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal' + import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal' export default { name: 'NcDeviceCharactersList', mixins: [JeecgListMixin, mixinDevice], components: { + RepairOrderApprovalModal, WeekMaintenanceApprovalModal, InspectionOrderHandle, JDictSelectTag @@ -167,7 +178,8 @@ }, dictOptions: {}, selectWeekMaintenanceData: {}, - selectInspectionOrderXqData: {} + selectInspectionOrderXqData: {}, + selectRepairOrderData: {} } }, created() { @@ -190,6 +202,9 @@ break case 'WEEK_MAINTENANCE': this.handleWeekMaintenance(item) + break + case 'eam_repair': + this.handleRepairOrder(item) break default: alert('娌℃壘鍒拌娴佺▼') @@ -226,6 +241,24 @@ processInstanceId: procInsId }) this.$refs.modalFormInspectionOrderXq.getBasicInformation(record) + }, + + /** + * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙� + * @param record + */ + handleRepairOrder(record) { + this.selectRepairOrderData = Object.assign({}, record) + const { procInsId, taskName } = this.selectRepairOrderData + this.$refs.repairOrderApprovalModal.visible = true + this.$refs.repairOrderApprovalModal.disableSubmit = true + this.$refs.repairOrderApprovalModal.title = taskName + this.$refs.modalFormInspectionOrderXq.getAllApproveData({ + ...record, + procInstId: procInsId, + processInstanceId: procInsId + }) + this.$refs.repairOrderApprovalModal.getBasicInformation(record) } } } -- Gitblit v1.9.3