From 7e394d280c921445ab71a4a368146504595531c7 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 28 八月 2025 21:14:13 +0800
Subject: [PATCH] 搜索
---
src/views/flow/todolist.vue | 518 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 425 insertions(+), 93 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index e34e26f..0b8a2c7 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,15 +5,22 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
+
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
+ </el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
+ </el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
+ {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '娲惧伐' : '瀹℃壒'}}
</el-button>
</template>
</avue-crud>
- <el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
+ <el-dialog title=" " append-to-body v-model="reassignBox" width="30%">
<avue-form ref="reassginform" :option="reassignOption" v-model="reassignForm" @submit="toPerson"></avue-form>
</el-dialog>
<el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
@@ -23,34 +30,55 @@
</div>
<div class="right">
<TodolistRightTop :row="row" />
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ <el-tabs
+ type="card"
+ class="demo-tabs"
+ v-model="activeName"
+ >
+ <el-tab-pane label="瀹℃壒" name="approve">
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ </el-tab-pane>
+ <el-tab-pane label="娴佺▼杞ㄨ抗" name="log">
+ <processTrace :item="row" v-if="activeName==='log'"></processTrace>
+ </el-tab-pane>
+ </el-tabs>
+
</div>
</div>
</el-drawer>
</basic-container>
+ <div>
+ <!--<top-todo ref="topTodoComponent" />-->
+ </div>
</template>
-
<script>
-import { getList, approve, getAssignee,reassgin } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius,batchApprove } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
import TodolistRightTop from './components/TodolistRightTop.vue';
+import processTrace from './components/process-trace.vue';
+
+//import top-todo from '../../page/index/LoadGood.vue';
export default {
components: {
TodolistLeft,
- TodolistRightTop
+ TodolistRightTop,
+ processTrace
},
data() {
return {
-
+ activeName: 'approve',
applist: [],
assigneeData: [],
+ allAssigneeData: [],
+ managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
row: {},
approveBox: false,
formApprove: {
comment: '',
approve: '', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
@@ -71,12 +99,12 @@
label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
},
+ display: true,
+ filterable: true,
span: 24,
disabled: false,
dicData: [
@@ -122,6 +150,7 @@
columnBtn: false,
tip: false,
// simplePage: true,
+ searchEnter:true,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
@@ -151,17 +180,44 @@
},
],
},
+ {
+ label: '鏍囬',
+ prop: '',
+ width: 200,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.title)
+ }
+ },
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- width: 100,
- },/*
+ prop: '',
+ width: 110,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.myProcessName)
+ }
+ },
{
- label: '娴佺▼绫诲瀷',
+ label: '缂栧埗',
width: 100,
- prop: 'categoryName',
- },*/
-
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.programmerName)
+ }
+ },
{
label: '鏈哄簥',
width: 100,
@@ -172,12 +228,13 @@
},
{
label: '鍒涘缓浜�',
- width: 100,
+ width: 70,
+ overHidden:true,
prop: 'startUserName',
},
{
label: '鍒涘缓鏃堕棿',
- width: 200,
+ width: 100,
prop: 'processCreateTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -189,7 +246,7 @@
},
{
label: '涓婁竴姝ョ敤鎴�',
- width: 200,
+ width: 100,
prop: '',
formatter: (val, value, label) => {
return `${val?.variables?.approveUserNickName || ''}`;
@@ -197,7 +254,7 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 200,
+ width: 100,
prop: 'taskName',
},
{
@@ -207,7 +264,7 @@
},
{
label: '鍒拌揪鏃堕棿',
- width: 200,
+ width: 120,
prop: 'createTime',
},
{
@@ -221,22 +278,35 @@
data: [],
transferTaskSelection: [],
reassignBox: false,
+ reassignType: 0, // 0:閲嶆柊鎸囨淳锛�1:鑷姩娲惧伐 2: 鑷姩娲惧伐
reassignOption: {
submitBtn: true,
emptyBtn: false,
column: [
{
+ label: '瀹℃壒缁撴灉',
+ prop: 'approve',
+ type: 'radio',
+ span: 24,
+ display: false,
+ dicData: [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '椹冲洖', value: 'N' },
+ ],
+ rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
+ },
+ {
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ filterable:true,
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
},
span: 24,
disabled: false,
+ display: true,
dicData: [
],
@@ -247,7 +317,7 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -255,102 +325,363 @@
};
},
watch: {
- // 'form.category'() {
- // const category = func.toInt(this.form.category);
- // this.$refs.crud.option.column.filter(item => {
- // if (item.prop === 'path') {
- // item.rules[0].required = category === 1;
- // }
- // if (item.prop === 'isOpen') {
- // item.disabled = category === 2;
- // }
- // });
- // },
+
'formApprove.approve'(val) {
- if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else {
- this.optionApprove.column[1].disabled = false;
- }
+ this.setAssignee(this.row, val);
+
},
+ 'reassignForm.approve'(val) {
+ if(this.reassignType ===3) {
+ if(val === 'Y') {
+ this.reassignOption.column[1].disabled = true;
+ this.reassignOption.column[1].display = false;
+ this.reassignForm.newAssigneeId = '';
+ } else {
+ this.reassignOption.column[1].display = false;
+ this.reassignOption.column[1].disabled = false;
+ this.reassignForm.newAssigneeId = '';
+ }
+ }
+
+ }
},
computed: {
...mapGetters(['userInfo', 'permission']),
- // permissionList() {
- // return {
- // addBtn: this.validData(this.permission.menu_add, false),
- // viewBtn: this.validData(this.permission.menu_view, false),
- // delBtn: this.validData(this.permission.menu_delete, false),
- // editBtn: this.validData(this.permission.menu_edit, false),
- // };
- // },
+ permissionList() {
+ return {
+ manual_dispatch: this.validData(this.permission.manual_dispatch, false),
+ auto_dispatch: this.validData(this.permission.auto_dispatch, false),
+ batch_approve: this.validData(this.permission.batch_approve, true),
+ };
+ },
},
mounted() {
- getAssignee().then(res => {
- this.assigneeData = res.data.data;
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[0].dicData = this.assigneeData;
- })
+ //this.setApproveBtn(row)
+ getAssignee({
+ taskId: 0,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ });
},
methods: {
+ // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
+ setApproveBtn (row) {
+ // 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
+
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ ];
+ switch (this.row.taskDefinitionKey) {
+ case 'teamLeaderTask': // 浠诲姟娲惧伐
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '缁撴潫', value: 'N' },
+ ];
+ break;
+ case 'appendProgrammingTask': // 琛ュ厖娴佺▼鐨� 缂栫▼鑺傜偣
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '缁撴潫', value: 'E' },
+ ];
+ break;
+ case 'cureProgramTask': // 鍥哄寲缂栧埗,鍙互閫氳繃锛堢粰鏍″锛夛紱涓嶉�氳繃N锛堢粰绋嬪簭绠＄悊鍛橈級
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑▼搴忕鐞嗗憳
+
+ ];
+ break;
+ case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢紝椹冲洖鏄粰
+ this.optionApprove.column[0].dicData = [
+ { label: '鍙敤', value: 'Y' }, //缁欐牎瀵�
+ { label: '涓嶅彲鐢�', value: 'N' },//缁欑紪鍒�
+ { label: '椹冲洖', value: 'R' },//缁欓┏鍥炵粍闀�
+ ];
+ break;
+ case 'programmingTask': //璇曞垏 缂栧埗鑺傜偣
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑粍闀�
+ { label: '缁撴潫', value: 'E' },//缁撴潫娴佺▼
+ ];
+ break;
+ case 'programMgrConfirm'://鍥哄寲娴佺▼ 绋嬪簭绠＄悊鍛橈紝鍙兘缁撴潫
+ this.optionApprove.column[0].dicData = [
+ { label: '缁撴潫', value: 'E' },
+ ];
+ break;
+ case 'seniorApproveTask': // 楂樺笀瀹℃牳
+ case 'approveTask': // 楂樺笀瀹℃牳
+ default:
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ ];
+ break;
+ }
+ },
+ setAssignee (row, approve) {
+
+ if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ if(approve === 'N'){
+ this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ }else{
+ //this.assigneeData = this.allAssigneeData;
+ this.optionApprove.column[1].dicData = this.allAssigneeData;
+ }
+ }
+ if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
+
+ this.optionApprove.column[1].disabled = false;
+ if (["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
+ this.formApprove.assignee = row.variables.senior;
+ } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
+ this.formApprove.assignee = row.variables.checker;
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
+ this.optionApprove.column[1].disabled = false;
+ this.formApprove.assignee = row.variables.programmer
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
+ this.formApprove.assignee = row.variables.checker
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
+ this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
+ }else if('unlockProgramConfirm'==row.taskDefinitionKey){
+ //瑙ｉ攣娴佺▼锛岀紪绋嬪鏍�,榛樿缁欓珮甯�
+ this.formApprove.assignee = row.variables.senior;
+ }
+ } else if(approve === 'N'){
+ //涓嶉�氳繃鐨勬儏鍐�
+ //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+ this.optionApprove.column[1].disabled = true;
+
+ if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
+ //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛屼笉缁欐牎瀵逛簡
+ this.formApprove.assignee = row.variables.programmer;
+ } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
+ //鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;
+ }else if (["programmingTask"].includes(row.taskDefinitionKey)) {
+ // 璇曞垏缂栧埗鑺傜偣,涓婁竴姝ユ槸缁勯暱
+ this.formApprove.assignee = row.variables.teamLeader;
+ }else if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ //鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
+ //TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
+ this.optionApprove.column[1].disabled = false;
+ for(var i=0;i<this.assigneeData.length;i++){
+ if(this.assigneeData[i].manager == true){
+ this.formApprove.assignee = this.assigneeData[i].id;
+ break;
+ }
+ }
+ //this.formApprove.assignee = '';
+ }else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
+ this.formApprove.assignee = row.variables.programmer;
+ }if(['teamLeaderTask','repalceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
+ //鍒濆鑺傜偣涓嶉�氳繃灏辨槸缁撴潫娴佺▼锛屽鐞嗕汉涓虹┖
+ this.formApprove.assignee = '';
+ }
+
+ }else if(approve === 'R'){
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄┏鍥烇紝缁欑粍闀�
+ this.formApprove.assignee = row.variables.teamLeader;
+ }
+ }else if(approve === 'E'){//END 缁撴潫娴佺▼锛屼笉鍙�夊鐞嗕汉
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ this.optionApprove.column[1].disabled = true;//澶勭悊浜洪�夐」绂佺敤
+ this.formApprove.assignee = ''
+ }
+
+ },
selectionTransferTask(list) {
this.transferTaskSelection = list;
},
- reassign() {// 閲嶆柊鎸囨淳
+ reassign(val) {// 閲嶆柊鎸囨淳
+
+ this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
- this.$message.warning('璇烽�夋嫨闇�瑕侀噸鏂版寚娲剧殑浠诲姟');
+ this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
return;
}
- if (this.transferTaskSelection.length > 1) {
+ if (this.transferTaskSelection.length > 1 && this.reassignType === 0) {
this.$message.warning('璇烽�夋嫨涓�鏉�');
return;
}
- this.reassignBox = true;
+ if(val === 2) {
+ this.$confirm('璇风‘璁ゆ槸鍚﹁繘琛屾壒閲忚嚜鍔ㄦ淳宸ワ紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ autoDispatch({
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.onLoad(this.page, this.query);
+
+ }).catch(err => {
+ this.$message.success('鎿嶄綔澶辫触');
+ })
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
+ });
+ } else {
+ this.reassignBox = true;
+
+ if(val === 3) {//鎵归噺瀹℃壒鏃� 鏄剧ず閫氳繃椹冲洖
+ this.reassignOption.column[0].display = true;
+ this.reassignOption.column[0].dicData[1].label = '涓嶉�氳繃';
+ this.reassignForm.approve = 'Y';
+ this.reassignForm.newAssigneeId = '';
+ this.reassignOption.column[1].disabled = true;
+ this.reassignOption.column[1].display = true;
+ } else {
+ this.reassignOption.column[0].display = false;
+ this.reassignForm.approve = '';
+
+ }
+ if(val ===1) {
+ this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
+ }
+ }
+
+
},
toPerson(form, done) {
- this.$confirm('璇风‘璁ゆ槸鍚︽寚娲�', '', {
- confirmButtonText: this.$t('submitText'),
- cancelButtonText: this.$t('cancelText'),
- type: 'warning',
- }).then(() => {
- console.log('toPerson', form);
- reassgin({
- ...form,
- taskId: this.transferTaskSelection[0].taskId,
- processInstanceId: this.transferTaskSelection[0].processInstanceId,
- }).then(res => {
- this.$message.success('鎸囨淳鎴愬姛');
- this.reassignBox = false;
- this.$refs?.reassginform?.resetForm();
- this.onLoad(this.page, this.query);
- done()
+ let tip = ''
+ this.reassignType === 1 ? tip = '璇风‘璁ゆ槸鍚︽墜鍔ㄦ淳宸�' : this.reassignType === 2 ? tip = '璇风‘璁ゆ槸鍚﹁嚜鍔ㄦ淳宸�' : tip = '璇风‘璁ゆ槸鍚﹂噸鏂版寚娲�';
+ if (this.reassignType === 0) {
+ this.$confirm(tip, '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then((res) => {
+ console.log(res,'>>>>>>')
+ reassgin({
+ ...form,
+ taskId: this.transferTaskSelection[0].taskId,
+ processInstanceId: this.transferTaskSelection[0].processInstanceId,
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
- }).catch(err => {
- console.error(err);
- done()
- })
- });
- done();
+ }).catch(err => {
+ this.$message.error('鎿嶄綔澶辫触');
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+
+ } else if (this.reassignType === 1) {
+ this.$confirm(tip, '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ manualDispatch({
+ assignee: form.newAssigneeId,
+ comment: form.comment,
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+ } else if (this.reassignType === 3) {
+ this.$confirm('纭瑕佽繘琛屾壒閲忓鎵瑰悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ batchApprove({
+ assignee: form.newAssigneeId,
+ comment: form.comment,
+ approve: form.approve,
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.reassignBox = false;
+ this.$refs?.reassginform?.resetForm();
+ this.onLoad(this.page, this.query);
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
+ }
},
handleAction(row, index) {
+ getAssignee({
+ taskId: row.taskId,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.allAssigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.allAssigneeData.length;i++){
+ if(this.allAssigneeData[i].manager == true){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ }
+ }
+ this.optionApprove.column[1].dicData = this.assigneeData;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ })
this.formApprove = {
comment: '',
- approve: '', // 榛樿鍚�
+ approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
- if (row.taskDefinitionKey == "check") {
- this.formApprove.assignee = row.variables.senior;
- } else if (row.taskDefinitionKey == "programmingTask") {
- this.formApprove.assignee = row.variables.checker;
- } else if (row.taskDefinitionKey == "teamLeaderTask") {
- this.formApprove.assignee = row.variables.programmer
- } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
- this.formApprove.assignee = row.variables.checker
- } else if (row.taskDefinitionKey == "approveTask") {
- }
+ this.setAssignee(row, this.formApprove.approve);
+ this.setApproveBtn(row);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
@@ -452,11 +783,12 @@
}
.left {
- width: 400px;
+ width: 40%;
}
.right {
flex: 1;
+ padding: 0 10px;
}
}
</style>
--
Gitblit v1.9.3