From 0c4e7ea6e347db2f2749bf9446ac0ed215bdecd5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 14 四月 2025 13:33:02 +0800
Subject: [PATCH] 修改审签工作流
---
src/views/flowable/workflow/FlowLedger.vue | 164 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 58 deletions(-)
diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index eeaa7ca..172ee82 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -9,40 +9,32 @@
<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-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.deviceNo"></a-input>
+ <a-form-item label="娴佺▼鍚嶇О">
+ <a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>
</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.characters"></a-input>
+ <a-form-item label="绠�瑕佹弿杩�">
+ <a-input placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" v-model="queryParam.title"></a-input>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="閮ㄩ棬鍒嗙粍">
- <j-dict-select-tag v-model="queryParam.departId" placeholder="璇烽�夋嫨閮ㄩ棬鍒嗙粍" dictCode="sys_department,depart_name,depart_id"/>
- </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.controlSystem"></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>
- </template>
+ <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">
<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 @click="handleToggleSearch" style="margin-left: 8px">{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}<a-icon :type="toggleSearchStatus ? 'up' : 'down'" /></a>
</span>
</a-col>
</a-row>
@@ -68,6 +60,11 @@
class="j-table-force-nowrap"
@change="handleTableChange">
+ <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="description" slot-scope="text">
+ <j-ellipsis :value="text" :length="25" />
+ </span>
+
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -89,32 +86,17 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村
- <a-icon type="down" />
- </a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm
- title="纭畾鍒犻櫎鍚�?"
- @confirm="() => handleDelete(record.id)"
- >
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a @click="handelDetial(record,text)">璇︽儏</a>
</span>
+
</a-table>
</div>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
+ <InspectionOrderXq ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"></InspectionOrderXq>
</a-card>
</template>
@@ -124,12 +106,18 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
+import InspectionOrderXq from '@views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
+ InspectionOrderXq
},
data () {
return {
@@ -140,11 +128,16 @@
title: '搴忓彿',
dataIndex: '',
key:'rowIndex',
- width:200,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
+ },
+ {
+ title: '娴佺▼鍒嗙被',
+ align: "center",
+ dataIndex: 'category_dictText',
+ width: 200,
},
{
title:'娴佺▼鍚嶇О',
@@ -154,7 +147,9 @@
{
title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
align:"center",
- dataIndex: 'title'
+ dataIndex: 'description',
+ width: '30%',
+ scopedSlots: {customRender: 'description'},
},
{
title:'鐢宠浜�',
@@ -162,17 +157,12 @@
dataIndex: 'proposer_dictText'
},
{
- title:'娴佺▼鐘舵�佽鏄�',
- align:"center",
- dataIndex: 'actStatus'
+ title: '鍓嶉┍鑺傜偣',
+ align: "center",
+ dataIndex: 'preNode',
},
{
- title:'褰撳墠鐨勪换鍔d',
- align:"center",
- dataIndex: 'taskId'
- },
- {
- title:'褰撳墠鐨勮妭鐐�',
+ title:'褰撳墠鑺傜偣',
align:"center",
dataIndex: 'taskName'
},
@@ -187,7 +177,12 @@
dataIndex: 'endTime'
},
{
- title:'浠诲姟浜�',
+ title:'澶勭悊鏃堕暱',
+ align:"center",
+ dataIndex: 'duration'
+ },
+ {
+ title:'褰撳墠浠诲姟浜�',
align:"center",
dataIndex: 'todoUsers_dictText'
},
@@ -206,9 +201,12 @@
}
],
url: {
- list: "nc/assign/flow/list",
+ list: "/assign/flow/list",
},
dictOptions:{},
+ selectShenpiData: {},
+ selectDispatchFileXqData:{},
+ selectInspectionOrderXqData:{}
}
},
created() {
@@ -219,7 +217,57 @@
},
},
methods: {
- initDictConfig(){
+ handelDetial(item, index) {
+ console.log('鐐瑰嚮浜嗚鎯�')
+ console.log('item----->', item)
+ console.log('index----->', index)
+ let approcesstype = this.splitAprocessType(item.category)
+ console.log('approcesstype--->', approcesstype)
+ switch (approcesstype) {
+ case 'drApproval':
+ item.description=item.title
+ this.handDrDetial(item)
+ break
+ case 'ggApproval':
+ item.description=item.title
+ this.handDispatchFileDetial(item)
+ break
+ case 'sbdjApproval':
+ item.description=item.title
+ this.handInspectionOrderDetial(item)
+ break
+ default:
+ alert('娌℃壘鍒拌娴佺▼')
+ }
+ },
+ splitAprocessType(title) {
+ let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
+ let result = parts[0]
+ return result
+ },
+ handDrDetial(item) {
+ this.selectShenpiData = item
+ this.selectShenpiData.assignee_dictText=item.todoUsers_dictText
+ this.selectShenpiData.createTime=item.startTime
+ this.selectShenpiData.procInstId=item.processInstanceId
+ this.$refs.modalFormApproval.clearTableSource()
+ this.$refs.modalFormApproval.getAllApproveData(item)
+ },
+ handDispatchFileDetial(item){
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.createTime=item.startTime
+ this.selectDispatchFileXqData.procInstId=item.processInstanceId
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ handInspectionOrderDetial(item){
+ this.selectInspectionOrderXqData = item
+ this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectInspectionOrderXqData.createTime=item.startTime
+ this.selectInspectionOrderXqData.procInstId=item.processInstanceId
+ this.$refs.modalFormInspectionOrderXq.clearTableSource()
+ this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
}
}
}
--
Gitblit v1.9.3