From 210f00e667957285abeaf007f7bca305cf7c8842 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 01 四月 2025 16:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowCompleted.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e83eee4..eecaeb1 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -75,7 +75,9 @@
</a-table>
</div>
- <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
</a-card>
</template>
@@ -86,13 +88,15 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
-import FlowXq from '@views/flowable/workflow/FlowXq.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowXq,
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
},
data () {
@@ -156,10 +160,11 @@
}
],
url: {
- list: "/nc/assign/flow/finishedList",
+ list: "/assign/flow/finishedList",
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{}
}
},
created() {
@@ -174,11 +179,14 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.description)
+ let approcesstype = this.splitAprocessType(item.category_dictText)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
this.handDrDetial(item)
+ break
+ case 'NC绋嬪簭绛炬淳':
+ this.handDispatchFileDetial(item)
break
default:
alert('娌℃壘鍒拌瀹℃壒')
@@ -194,6 +202,16 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.procInstId=item.procInsId
+ this.selectDispatchFileXqData.processInstanceId=item.procInsId
+ this.selectDispatchFileXqData.title=item.description
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ }
}
}
</script>
--
Gitblit v1.9.3