From 12ab52e9490034843b72f1399da666108cabbe4f Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 20 七月 2023 14:40:45 +0800
Subject: [PATCH] 提交被覆盖的前端代码，流程模板、流程阶段、流程审批页面
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
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 86617b7..c63ebc4 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -5,7 +5,7 @@
<el-card class="dialogwarp_tab_card">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first">
-
+ <businesswork ref="businesswork":ids="ids" :templateId="templateId" :taskId="taskId" :modelKey="modelKey" :codeClassifyOid="codeClassifyOid"></businesswork>
</el-tab-pane>
<el-tab-pane label="娴佺▼璺熻釜" name="second">
<avue-crud :data="flowList" :option="option" ref="crud">
@@ -75,7 +75,11 @@
export default {
data() {
return {
+ ids:[],
+ templateId:'',
taskId: '',
+ modelKey:'',
+ codeClassifyOid:'',
businessId: '',
processInstanceId: '',
src: '',
@@ -94,9 +98,9 @@
indexLabelClassName: '搴忓彿',
column: [
{ label: '浠诲姟鍚嶇О', prop: 'historyActivityName', minWidth: 120 },
- { label: '鎵ц鎿嶄綔', prop: 'sex', minWidth: 80 },
+ { label: '鎵ц鎿嶄綔', prop: 'pass', minWidth: 80 ,formatter:this.formatterPass},
{ label: '浠诲姟寮�濮嬫椂闂�', prop: 'createTime', minWidth: 140 },
- { label: '瀹℃壒鎰忚', prop: 'sex', minWidth: 220, overHidden: true },
+ { label: '瀹℃壒鎰忚', prop: 'comment', minWidth: 220, overHidden: true },
{ label: '鎵ц浜�', prop: 'assigneeName', minWidth: 80 },
{ label: '浠诲姟瀹屾垚鏃堕棿', prop: 'endTime', minWidth: 140 },
{ label: '宸蹭笂浼犲鎵规枃浠�', prop: 'sex', minWidth: 220, overHidden: true },
@@ -131,12 +135,21 @@
})
this.apiGetBtnTask(this.processInstanceId)
},
+ formatterPass(row, value, column) {
+ console.log('value',value)
+ return value?'鍚屾剰':'椹冲洖'
+ },
async apiGetBtnTask(id) {
const response = await getBtnTask({ processInstanceId: id })
const res = response.data
+ this.ids=res.data.variables.ids;
+ this.templateId=res.data.variables.templateId;
+ this.modelKey=res.data.variables.modelKey;
+ this.codeClassifyOid=res.data.variables.codeClassifyOid;
+ //this.taskId=res.data.variables.taskId;
if (res.success) {
console.log(res)
- this.btnList = res.data.toTasks
+ this.btnList = res.data.toTasks;
}
},
async apiExamineTask(param) {
@@ -145,13 +158,16 @@
if (res.success) {
this.$message.success(res.msg);
this.$router.$avueRouter.closeTag();
- this.$router.push({ path: `/work/start` });
+ this.$router.push({ path: `/work/todo` });
} else {
this.$message.error(res.msg || '鎻愪氦澶辫触');
}
},
handelExecute(event) {
console.log(event)
+ if(this.$refs.businesswork.hasEditor){
+ this.$refs.businesswork.HandlerSave()
+ }
const { toName, conditionKey, conditionValue } = event
let param = {
comment: this.opinionVal || '鍚屾剰',
@@ -185,7 +201,7 @@
display: -ms-flexbox;
display: flex;
justify-content: space-between;
- height: 70vh;
+ height: 85vh;
&_tab {
width: 79%;
--
Gitblit v1.9.3