From 54c22f2f0e98c35e48cdad6c4d0299d08beea630 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 28 七月 2025 10:15:13 +0800
Subject: [PATCH] update
---
src/views/flowable/workflow/FlowCompleted.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index c851a89..eec40ae 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -15,19 +15,26 @@
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>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -80,6 +87,10 @@
</div>
<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>
@@ -90,11 +101,15 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
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
},
@@ -162,9 +177,9 @@
list: '/assign/flow/finishedList'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
- selectInspectionOrderXqData: {}
+ selectWeekMaintenanceData: {},
+ selectInspectionOrderXqData: {},
+ selectRepairOrderData: {}
}
},
created() {
@@ -188,6 +203,9 @@
case 'WEEK_MAINTENANCE':
this.handleWeekMaintenance(item)
break
+ case 'eam_repair':
+ this.handleRepairOrder(item)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -199,8 +217,11 @@
return result
},
- handleWeekMaintenance() {
-
+ handleWeekMaintenance(record) {
+ this.selectWeekMaintenanceData = Object.assign({}, record)
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏'
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = true
},
handInspectionOrder(record) {
@@ -220,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