From ea1497cbb477825522c79cff1b7e1f2e96003ad2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:58:58 +0800
Subject: [PATCH] art: 工作流-待办列表调整
---
src/views/flowable/workflow/FlowTodo.vue | 237 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 127 insertions(+), 110 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 07b0f7d..636ffda 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -9,35 +9,49 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="6" :md="8" :sm="24">
<a-form-item label="娴佺▼鍒嗙被">
<j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category"
dictCode="flow_type"></j-dict-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="娴佺▼鍚嶇О">
- <a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>
+ <!--<a-col :xl="4" :lg="6" :md="8" :sm="24">-->
+ <!--<a-form-item label="娴佺▼鍚嶇О">-->
+ <!--<a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>-->
+ <!--</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.name"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <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"
- 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"
- v-model="queryParam.endTime"></j-date>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="8" :lg="8" :md="12" :sm="24">
+ <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="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>
+ </template>
+
+ <a-col :xl="4" :lg="6" :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>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
</span>
</a-col>
</a-row>
@@ -73,33 +87,36 @@
bordered
size="middle"
rowKey="id"
- :scroll="{x:getTableColumnsTotalWidth,y:465}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
+ class="j-table-force-nowrap"
+ :scroll="{ x: 'max-content' }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handelDetail(record,text)">鏌ョ湅璇︽儏</a>
+ <a @click="handelDetail(record,text)">鎵ц/瀹℃壒</a>
</span>
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
- <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
- @searchReset="searchReset"></DispatchFileHandle>
- <DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset"
- @ok="modalFormOk"></DispatchFileBachHandleStyle>
+ <!--鍗曚釜娴佺▼澶勭悊-->
<InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData"
@searchReset="searchReset"></InspectionOrderHandle>
- <InspectionOrderHandleBzz ref="modalFormInspectionOrderBzz" :selectShenpiData="selectInspectionOrderDataBzz"
- @searchReset="searchReset"></InspectionOrderHandleBzz>
- <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal"></week-maintenance-approval-modal>
- <repair-order-approval-modal ref="repairOrderApprovalModal"
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
+ @searchReset="searchReset"></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
+
+ <!--鎵归噺澶勭悊-->
+ <inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
+ :taskList="selectionRows"/>
+
+ <week-maintenance-batch-approval-modal ref="weenMaintenanceBatchApprovalModalRef" @searchReset="searchReset"
+ :taskList="selectionRows"/>
</a-card>
</template>
@@ -109,28 +126,24 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
- import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
- import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
- import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
- import InspectionOrderHandleBzz from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue'
import { getAction } from '@api/manage'
+ import InspectionOrderBatchHandle from './InspectionOrder/InspectionOrderBatchHandle'
+ import WeekMaintenanceBatchApprovalModal from './weekMaintenance/WeekMaintenanceBatchApprovalModal'
export default {
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- AssignFileStreamHandle,
+ WeekMaintenanceBatchApprovalModal,
+ InspectionOrderBatchHandle,
JDictSelectTag,
- DispatchFileHandle,
- DispatchFileBachHandleStyle,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle,
- InspectionOrderHandleBzz
+ InspectionOrderHandle
},
data() {
return {
@@ -150,46 +163,37 @@
{
title: '娴佺▼鍒嗙被',
align: 'center',
- dataIndex: 'category_dictText',
- width: 300
+ dataIndex: 'category_dictText'
},
{
title: '娴佺▼鍚嶇О',
align: 'center',
dataIndex: 'flowName',
- width: 200
},
{
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
dataIndex: 'title',
- width: 350,
- ellipsis: true
-
},
{
title: '涓婁竴姝ュ鐞嗕汉',
align: 'center',
dataIndex: 'preNodeAssignee_dictText',
- width: 150
},
{
title: '鍓嶉┍鑺傜偣',
align: 'center',
dataIndex: 'preNode',
- width: 200
},
{
title: '褰撳墠鑺傜偣',
align: 'center',
dataIndex: 'name',
- width: 200
},
{
title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
align: 'center',
dataIndex: 'createTime',
- width: 200
},
{
title: '鎿嶄綔',
@@ -205,10 +209,8 @@
isSameNode: '/assign/flow/isSameNode'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
selectInspectionOrderData: {},
- selectInspectionOrderDataBzz: {},
+ selectWeekMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
//涓氬姟淇℃伅ID
@@ -226,6 +228,40 @@
}
},
methods: {
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ if (!params) {
+ return false
+ }
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ // console.log(res)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ if (this.selectedRowKeys.length > 0) this.selectedRowKeys = this.selectionRows = []
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+
handelDetail(item, index) {
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
@@ -233,12 +269,6 @@
let processType = this.splitAprocessType(item.category)
console.log('processType--->', processType)
switch (processType) {
- case 'drApproval':
- this.handDrDetail(item)
- break
- case 'ggApproval':
- this.handDispatchFileDetail(item)
- break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -252,71 +282,57 @@
alert('娌℃壘鍒拌娴佺▼')
}
},
+
+ batchHandle() {
+ const categorySet = new Set(this.selectionRows.map(item => item.category))
+ const nameSet = new Set(this.selectionRows.map(item => item.name))
+ if (categorySet.size !== 1 || nameSet.size !== 1) {
+ this.$notification.info({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨鍚屼竴娴佺▼鍒嗙被涓嬬殑鍚屼竴褰撳墠鑺傜偣'
+ })
+ return
+ }
+
+ if (categorySet.has('eam_repair')) {
+ this.$notification.info({
+ message: '娑堟伅',
+ description: '璁惧缁翠慨娴佺▼鏃犳硶鎵归噺澶勭悊'
+ })
+ return
+ }
+
+ if (categorySet.has('sbdjApproval')) {
+ this.$refs.inspectionOrderBatchHandleRef.visible = true
+ this.$refs.inspectionOrderBatchHandleRef.title = this.selectionRows[0].name
+ this.$refs.inspectionOrderBatchHandleRef.getAllApproveData(this.selectionRows[0])
+ this.$refs.inspectionOrderBatchHandleRef.getBasicInformation(this.selectionRows[0])
+ } else if (categorySet.has('WEEK_MAINTENANCE')) {
+ this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
+ this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
+ }
+ },
+
splitAprocessType(title) {
let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
let result = parts[0]
return result
},
- handDrDetail(record) {
- this.selectShenpiData = Object.assign({}, record)
- this.$refs.modalFormApproval.visible = true
- this.$refs.modalFormApproval.getAllApproveData(record)
- },
- searchReset() {
- this.queryParam = {}
- this.loadData(1)
- },
- handDispatchFileDetail(item) {
- console.log('item----->', item)
- this.selectDispatchFileXqData = item
- this.$refs.modalFormDispatchFileXq.clearTableSource()
- this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
- },
+
handInspectionOrder(record) {
console.log('record----->', record)
- const tableRecord = Object.assign({}, record)
- if (record.taskDefKey === 'Confirmed_completed') {
- this.selectInspectionOrderDataBzz = tableRecord
- this.$refs.modalFormInspectionOrderBzz.getAllApproveData(record)
- } else {
- this.selectInspectionOrderData = tableRecord
- this.$refs.modalFormInspectionOrder.visible = true
- this.$refs.modalFormInspectionOrder.getAllApproveData(record)
- this.$refs.modalFormInspectionOrder.getBasicInformation(record)
- }
+ this.selectInspectionOrderData = Object.assign({}, record)
+ this.$refs.modalFormInspectionOrder.visible = true
+ this.$refs.modalFormInspectionOrder.title = record.name
+ this.$refs.modalFormInspectionOrder.getAllApproveData(record)
+ this.$refs.modalFormInspectionOrder.getBasicInformation(record)
},
- batchHandle() {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- return
- } else {
- let ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => {
- if (res.success) {
- let taskDefKey = res.result
- this.selectBachData.taskIds = ids
- this.selectBachData.taskDefKey = taskDefKey
- this.$refs.modalFormDispatchFileBatch.title = '鎵归噺澶勭悊'
- this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
- this.$refs.modalFormDispatchFileBatch.disableSubmit = false
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
- }
- },
+
+
handleWeekMaintenance(item) {
if (item && item.dataId) {
- this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
+ this.selectWeekMaintenanceData = Object.assign({}, item)
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
this.$refs.weekMaintenanceApprovalModal.title = item.name
this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
}
@@ -329,6 +345,7 @@
handleRepairOrder(record) {
this.selectRepairOrderData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = record.name
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
}
--
Gitblit v1.9.3