From 37c5538fcd6a83f7122c9e961db3d8442ec6cb55 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 04 八月 2023 18:48:47 +0800
Subject: [PATCH] 修改流程执行
---
Source/UBCS-WEB/src/views/work/todo.vue | 3 ++-
Source/UBCS-WEB/src/views/work/send.vue | 2 +-
Source/UBCS-WEB/src/views/wel/index.vue | 2 +-
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 2 ++
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 2 +-
Source/UBCS-WEB/src/views/work/done.vue | 4 ++--
Source/UBCS-WEB/src/views/work/claim.vue | 2 +-
7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 7ec8388..f3a8041 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -39,6 +39,7 @@
</template>
<script>
import { personnelInit, personnelCollect, cancelCollect, personnelSave, personnelDict } from '@/api/template/setPersonnel.js'
+import { dateFormat } from "@/util/date";
export default {
name: 'SetPersonnel',
props: {
@@ -194,6 +195,7 @@
const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids,btmtype} = this.saveParam
let vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,btmtype,...vars}
vals.oids=ids;
+ vals.createTime=dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss")
const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
if (response.status === 200) {
this.$message({
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 69a47eb..da24de5 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -111,7 +111,7 @@
label: '涓婁竴姝ュ鐞嗘椂闂�',
sortable:true,
width:150,
- prop: 'historyActivityDurationTime'
+ prop: 'createTime'
},
{
label: '涓婁竴姝ユ搷浣滀汉',
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 9d31372..fc71ffd 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -105,7 +105,7 @@
label: '鍙戣捣鏃堕棿',
sortable:true,
width:180,
- prop: 'createTime',
+ prop: 'processDefinitionStartTime'
}, {
label: '褰撳墠姝ラ',
prop: 'taskName',
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 7dd1822..9d3d6e2 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -99,12 +99,12 @@
label: '鍙戣捣鏃堕棿',
sortable: true,
width:180,
- prop: 'createTime',
+ prop: 'processDefinitionStartTime'
}, {
label: '瀹屾垚鏃堕棿',
sortable: true,
width:180,
- prop: 'historyTaskEndTime',
+ prop: 'createTime'
}, {
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable: true,
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index bb59a71..4ead723 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -146,7 +146,7 @@
this.templateId=res.data.variables.templateId;
this.modelKey=res.data.variables.modelKey;
this.codeClassifyOid=res.data.variables.codeClassifyOid;
- this.title='11';
+ this.title=res.data.variables.processName;
//this.taskId=res.data.variables.taskId;
if (res.success) {
console.log(res)
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index 2e50088..f44dc18 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -103,7 +103,7 @@
label: '鍙戣捣鏃堕棿',
sortable:true,
width:180,
- prop: 'createTime'
+ prop: 'processDefinitionStartTime'
},{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index bff6aab..35f7281 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -5,6 +5,7 @@
:data="data"
ref="crud"
v-model="form"
+ :page.sync="page"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -105,7 +106,7 @@
label: '鍙戣捣鏃堕棿',
sortable:true,
width:180,
- prop: 'createTime',
+ prop: 'processDefinitionStartTime'
}, {
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
--
Gitblit v1.9.3