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 | 9 ++++
src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue | 2
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue | 4 +-
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 2
src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue | 8 ++-
src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue | 4 +-
src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue | 2
src/views/flowable/workflow/FlowCompleted.vue | 17 ++++++--
src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue | 4 +-
src/views/flowable/workflow/FlowTodo.vue | 20 ++++++---
src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue | 2
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue | 2
12 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
index bfff7df..9bb645b 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
@@ -16,7 +16,7 @@
</div>
</a-tab-pane>
- <a-tab-pane :key="2" tab="鍏朵粬鏂囨。">
+ <a-tab-pane :key="2" tab="鍏朵粬鏂囨。" v-if="currentTreeNodeInfo.type !==5 && currentTreeNodeInfo.type!==6">
<OtherDocumentTableList ref="otherDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo"
@handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/>
</a-tab-pane>
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index ba2a883..78c8c5b 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -48,6 +48,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>
@@ -105,7 +110,7 @@
},
data () {
return {
- description: '璁惧鐗规畩瀛楃绠＄悊椤甸潰',
+ description: '宸ヤ綔娴�-宸插姙',
// 琛ㄥご
columns: [
{
@@ -131,10 +136,11 @@
width: 200,
},
{
- title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
- align: "center",
+ title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
+ align:"center",
dataIndex: 'description',
- width:300
+ width:300,
+ scopedSlots: {customRender: 'description'},
},
{
title: '娴佺▼鍙戣捣浜哄悕绉�',
@@ -207,6 +213,9 @@
},
handDrDetial(item) {
this.selectShenpiData = item
+ this.selectShenpiData.assignee_dictText=item.todoUsers_dictText
+ this.selectShenpiData.procInstId=item.procInsId
+ this.selectShenpiData.title=item.description
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index 41014c0..172ee82 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -60,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>
@@ -142,7 +147,9 @@
{
title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
align:"center",
- dataIndex: 'title'
+ dataIndex: 'description',
+ width: '30%',
+ scopedSlots: {customRender: 'description'},
},
{
title:'鐢宠浜�',
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 42b5430..6404081 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -73,6 +73,11 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@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>
@@ -100,7 +105,7 @@
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
+ <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData" @searchReset="searchReset"></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>
@@ -147,7 +152,7 @@
title: '搴忓彿',
dataIndex: '',
key:'rowIndex',
- width:200,
+ width:100,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
@@ -166,16 +171,17 @@
width: 200,
},
{
- title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
- align: "center",
- dataIndex: 'title',
- width:300
+ title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
+ align:"center",
+ dataIndex: 'description',
+ width:300,
+ scopedSlots: {customRender: 'description'},
},
{
title: '涓婁竴姝ュ鐞嗕汉',
align: "center",
dataIndex: 'preNodeAssignee_dictText',
- width:200
+ width:100
},
{
title: '鍓嶉┍鑺傜偣',
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index 0fe58e5..d4cfa8b 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -13,7 +13,7 @@
>
<a-card :bordered="false">
<div>
- <b>{{ selectShenpiData.title }}</b>
+ <b>{{ selectShenpiData.description }}</b>
<br>
<br>
<a-tag color="blue">
@@ -208,7 +208,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
index a658adc..4e9fc1a 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
@@ -229,7 +229,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
index 4ef96af..498e570 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
@@ -205,7 +205,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
index fc8405c..cd6c700 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
@@ -13,7 +13,7 @@
>
<a-card :bordered="false">
<div>
- <b>{{ selectShenpiData.title }}</b>
+ <b>{{ selectShenpiData.description }}</b>
<br>
<br>
<a-tag color="blue">
@@ -244,7 +244,7 @@
url: {
queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/nc/activit/assign/file/approve",
},
dictOptions: {},
@@ -320,7 +320,9 @@
httpAction(url,flowTaskVo,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
- that.$emit('ok');
+ that.visible = false
+ //鍒锋柊琛ㄦ牸
+ that.$emit('searchReset')
}else{
that.$message.warning(res.message);
}
diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
index 6b602c7..004cdbd 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
@@ -200,7 +200,7 @@
url: {
queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
@@ -295,7 +295,7 @@
'id': item.dataId
}
let parmhis={
- 'procInstId': item.processInstanceId
+ 'procInstId': item.procInstId
}
getAction(this.url.queryHisTaskList,parmhis).then(res=>{
this.hitaskDataSource=res.result
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
index 3df4835..72c510b 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
@@ -13,7 +13,7 @@
>
<a-card :bordered="false">
<div>
- <b>{{ selectShenpiData.title }}</b>
+ <b>{{ selectShenpiData.description }}</b>
<br>
<br>
<a-tag color="blue">
@@ -185,7 +185,7 @@
url: {
queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/dncFlow/dispatchFile/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
index dfac703..3e0c806 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
@@ -176,7 +176,7 @@
url: {
queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 01a921c..0660b32 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -149,7 +149,7 @@
url: {
queryBomDataById: '/eam/eamRepairOrder/queryById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
--
Gitblit v1.9.3