From 1dbb5bb85691cc48a0f6f64c999e91729d4ad22d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 00:17:04 +0800
Subject: [PATCH] 优化审批界面
---
src/views/flow/todolist.vue | 672 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 546 insertions(+), 126 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index a28e0c8..f149360 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -1,62 +1,98 @@
<template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
+ :search="query"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
- <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
+
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
</el-button>
- <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
+ <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>
+
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_on_machine" plain @click="showBatchOnMachine()">鐜板満缂栧埗
</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">
- {{scope.row.taskDefinitionKey === 'teamLeaderTask' ? '娲惧伐' : '瀹℃壒'}}
+ {{approveButtonText(scope.row.taskDefinitionKey)}}
</el-button>
</template>
+
</avue-crud>
<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">
+ <el-dialog title="鐜板満缂栧埗" append-to-body v-model="onMachineBox" width="30%">
+ <avue-form :option="onMachineOption" v-model="onMachineForm" @submit="batchOnMachine"></avue-form>
+ </el-dialog>
+ <div class="box-drawer">
+ <el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox" class="remark-drawer">
<div class="approve-box">
<div class="left">
- <TodolistLeft :row="row" @selection-change="selectionChange" />
+ <TodolistLeft ref="todolistLeft" :row="row" @selection-change="selectionChange" />
</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" >
+
+ </avue-form>
+ </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>
+ </div>
</basic-container>
</template>
-
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,getAssigneeTree,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove, batchApproveOnMachine } 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';
+
export default {
components: {
TodolistLeft,
- TodolistRightTop
+ TodolistRightTop,
+ processTrace
},
data() {
return {
-
+ activeName: 'approve',
applist: [],
assigneeData: [],
+ allAssigneeData: [],
+ managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
+
+ assignee2Data:[],
+
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
- assignee: ''
+ approve: '',
+ assignee: '',
},
+
+
optionApprove: {
labelWidth: 100,
column: [
@@ -75,36 +111,25 @@
{
label: '鍙戦�佺粰',
prop: 'assignee',
- type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
- props: {
- label: 'name',
- value: 'id',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
},
+ display: true,
filterable: true,
span: 24,
disabled: false,
- dicData: [
-
- ],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
- },
- {
- label: '宸ュ簭鐗堟',
- prop: 'processEdition',
- type: 'input',
- span: 24,
- // disabled: true,
- display: false,// 闅愯棌鏄剧ず
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
rules: [
{
validator: (rule, value, callback) => {
@@ -119,6 +144,7 @@
}
]
},
+
],
},
page: {
@@ -127,7 +153,12 @@
total: 0,
},
form: {},
- query: {},
+ query: {
+ machineSpec: ['1','2']
+ },
+ defaultQuery: {
+ machineSpec: ['1','2']
+ },
loading: true,
option: {
rowKey: "taskId",
@@ -136,11 +167,10 @@
delBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
+ searchEnter:true,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 4,
dialogWidth: '60%',
- // tree: true,
border: true,
index: true,
selection: true,
@@ -151,7 +181,7 @@
{
label: '鍏抽敭瀛�',
prop: 'keyword',
- width: 300,
+ width: 200,
search: true,
searchType: 'input',
hide: true,
@@ -166,10 +196,31 @@
},
],
},
+ {
+ label: '鏈哄簥绫诲瀷',
+ prop: 'machineSpec',
+ width: 200,
+ search: true,
+ searchType: 'select',
+ multiple:true,
+ clearable:false,
+ hide: true,
+ emptyValues :["1",'2'],
+ dicData: [
+ {
+ label: '鏁版帶杞﹀簥',
+ value: '1',
+ },
+ {
+ label: '鍔犲伐涓績',
+ value: '2',
+ },
+ ],
+ },
{
label: '鏍囬',
prop: '',
- width: 100,
+ width: 200,
render: ({ row }) => {
return h('p',
{
@@ -181,31 +232,47 @@
},
{
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,
prop: '',
+ showOverflowTooltip:true,
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
},
{
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',
@@ -213,11 +280,12 @@
search: true,
searchRange: true,
searchSpan: 8,
+ showOverflowTooltip:true,
// hide: true,
},
{
label: '涓婁竴姝ョ敤鎴�',
- width: 200,
+ width: 100,
prop: '',
formatter: (val, value, label) => {
return `${val?.variables?.approveUserNickName || ''}`;
@@ -225,18 +293,23 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 200,
+ width: 120,
+ showOverflowTooltip:true,
prop: 'taskName',
},
{
label: '鏂囦欢',
width: 200,
prop: 'file',
+ showOverflowTooltip:true,
},
{
label: '鍒拌揪鏃堕棿',
- width: 200,
+ width: 120,
prop: 'createTime',
+ showOverflowTooltip:true,
+
+
},
{
label: '鍒拌揪鎻忚堪',
@@ -255,20 +328,97 @@
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',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
+ 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: [
],
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },*/
+ {
+ label: '澶囨敞',
+ span: 24,
+ prop: 'comment',
+ type: 'textarea',
+ },
+ ],
+ },
+ reassignForm: {},
+
+ onMachineBox: false,//鐜板満缂栧埗妗�
+ onMachineForm: {},
+ onMachineOption: {
+ 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: 'assignee',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
},
{
@@ -276,34 +426,31 @@
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
- reassignForm: {}
};
},
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) {
this.setAssignee(this.row, val);
- // if(val === 'Y' && ['confirmIsUseableTask'].includes(this.row.taskDefinitionKey) && this.row.variables.isProcessEditionSame=='N') {
- // // this.optionApprove.column[2].display = true; // 鏄剧ず宸ュ簭鐗堟
- // } else {
- // this.optionApprove.column[2].display = false; // 闅愯棌宸ュ簭鐗堟
- // }
},
+ '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']),
@@ -311,43 +458,108 @@
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()
+ //this.setApproveBtn(row)
+ /*
+ getAssignee({
+ taskId: 0,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ });
+ */
+ getAssigneeTree({
+ taskId: 0,
+ }).then(res => {
+ this.assigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
+ }
+ }
+
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
+ this.onMachineOption.column[1].data = this.assigneeData;
+ });
},
methods: {
- // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
- setApproveBtn () {
+ approveButtonText(taskDefinitionKey){
+ let lower = taskDefinitionKey.toLowerCase();
+ if(taskDefinitionKey === 'teamLeaderTask') {
+ return '娲惧伐'
+ }else if(taskDefinitionKey == 'unlockProgramConfirm') {
+ //瑙ｉ攣锛岀紪鍒跺鏍�
+ return '澶嶆牳'
+ }else if(taskDefinitionKey == 'programMgrConfirm') {
+ //鍥哄寲锛岀▼搴忕鐞嗗憳纭
+ return '纭'
+ }else if(lower.indexOf('program')>-1) {
+ return '缂栧埗'
+ }else if(lower.indexOf('check')>-1) {
+ return '鏍″'
+ }else if(lower.indexOf('useable')>-1) {
+ return '妫�鏌�'
+ }else{
+ return '瀹℃壒'
+ }
+ },
+ 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': // 浠诲姟娲惧伐
- case 'cureProgramTask': // 鍥哄寲缂栧埗
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '缁撴潫', value: 'N' },
];
break;
- case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢�
+ case 'appendProgrammingTask': // 琛ュ厖娴佺▼鐨� 缂栫▼鑺傜偣
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
- { label: '涓嶉�氳繃', value: 'N' },
- { label: '椹冲洖', value: 'R' },
+ { 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' },
@@ -357,32 +569,82 @@
}
},
setAssignee (row, approve) {
- if (approve === 'Y') {
- if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+
+ if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ if(approve === 'N'){
+ this.optionApprove.column[1].data = this.managerAssigneeData;
+ }else{
+ //this.optionApprove.column[1].dicData = this.allAssigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
+ }
+ }
+ 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'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+ } else if (["programmingTask",'cureProgramTask','replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
- } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
+ this.optionApprove.column[1].disabled = false;
this.formApprove.assignee = row.variables.programmer
- } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ } 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'){
- this.formApprove.assignee = ''
- if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- getPrevius({processInstanceId: row.processInstanceId}).then(res => {
- console.log(res)
- if(res.data.code === 200) {
-
- this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- }
- })
+ //涓嶉�氳繃鐨勬儏鍐�
+ //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+ this.optionApprove.column[1].disabled = true;
+
+ if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
+ //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
+ if(row.variables.actProgrammer){
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ }else{
+ this.formApprove.assignee = row.variables.programmer;//鏃犵紪绋嬪憳缁欎富绠″伐鑹�
+ }
+ }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
+ //瑙ｉ攣楂樺笀瀹℃壒鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;//缁欎富绠″伐鑹�
+ } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
+ //鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ //this.formApprove.assignee = row.variables.programmer;
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
+ }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;
+ if(this.managerAssigneeData.length>0){
+ this.formApprove.assignee = this.managerAssigneeData[0].id;
+ }
+ }else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
+ this.formApprove.assignee = row.variables.programmer;
+ }if(['teamLeaderTask','replaceProgrammingTask','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 = ''
}
},
@@ -390,6 +652,7 @@
this.transferTaskSelection = list;
},
reassign(val) {// 閲嶆柊鎸囨淳
+ //var 0:鎵归噺杞淳锛�1锛氭墜鍔ㄦ淳宸ワ紱2锛氳嚜鍔ㄦ淳宸ワ紱3锛氭壒閲忓鎵�
this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
@@ -415,17 +678,74 @@
}
this.$message.success('鎿嶄綔鎴愬姛');
this.onLoad(this.page, this.query);
-
+ todoChangeNotify();
}).catch(err => {
this.$message.success('鎿嶄綔澶辫触');
})
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
});
} else {
+ //0閲嶆柊鎸囨淳 3鎵归噺瀹℃壒 锛�1鎵嬪姩娲惧伐
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 {
+ //0
+ this.reassignOption.column[0].display = false;
+ this.reassignForm.approve = '';
+
+ if(val === 0 || val === 1) {//0閲嶆柊鎸囨淳 1鎵嬪姩娲惧伐 ,闇�瑕佹樉绀哄鐞嗕汉
+ this.reassignOption.column[1].disabled = false;
+ this.reassignOption.column[1].display = true;
+ }
+ }
+ if(val ===1) {
+ this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
+ }
}
-
},
+ showBatchOnMachine(){//鏄剧ず鐜板満缂栧埗瀵硅瘽妗�
+ this.onMachineBox = true;
+ this.onMachineForm.assignee = this.transferTaskSelection[0].variables.checker;
+
+ },
+ batchOnMachine() {//缂栧埗鎵归噺澶勭悊锛堢幇鍦虹紪鍒讹級
+
+ this.$confirm('璇风‘璁ゆ槸鍚﹀皢閫夊畾浠诲姟璁剧疆涓虹幇鍦虹紪鍒讹紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ batchApproveOnMachine({
+ taskIds: this.transferTaskSelection.map(v => v.taskId),
+ processInstanceIds: this.transferTaskSelection.map(v => v.processInstanceId),
+ assignee: this.onMachineForm.assignee,
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.onMachineBox = false;
+ this.onLoad(this.page, this.query);
+ todoChangeNotify();
+ }).catch(err => {
+ this.$message.success('鎿嶄綔澶辫触');
+ })
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
+ });
+
+ },
+
toPerson(form, done) {
let tip = ''
this.reassignType === 1 ? tip = '璇风‘璁ゆ槸鍚︽墜鍔ㄦ淳宸�' : this.reassignType === 2 ? tip = '璇风‘璁ゆ槸鍚﹁嚜鍔ㄦ淳宸�' : tip = '璇风‘璁ゆ槸鍚﹂噸鏂版寚娲�';
@@ -434,7 +754,8 @@
confirmButtonText: this.$t('submitText'),
cancelButtonText: this.$t('cancelText'),
type: 'warning',
- }).then(() => {
+ }).then((res) => {
+ console.log(res,'>>>>>>')
reassgin({
...form,
taskId: this.transferTaskSelection[0].taskId,
@@ -448,12 +769,18 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();
done()
}).catch(err => {
this.$message.error('鎿嶄綔澶辫触');
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 1) {
@@ -476,39 +803,120 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();
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);
+
+ todoChangeNotify();
+ done()
+
+ }).catch(err => {
+ console.error(err);
+ done()
+ })
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
}
-
- done();
},
handleAction(row, index) {
+ getAssigneeTree({
+ taskId: row.taskId,
+ }).then(res => {
+
+ this.assigneeData = res.data.data;
+ this.allAssigneeData = res.data.data;
+
+ this.managerAssigneeData=[];
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
+ }
+ }
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
+ })
this.formApprove = {
comment: '',
approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
+
this.setAssignee(row, this.formApprove.approve);
- console.log('handleAction', row, index);
+ this.setApproveBtn(row);
+ //console.log('handleAction', row, index);
},
- handleSubmit(form, done) {
- if(this.row.taskDefinitionKey === 'programmingTask') {
- // if(this.applist.length !== 1) {
- // done();
- // return this.$message.success('璇烽�夋嫨1涓▼搴�');
- // }
+ async handleSubmit(form, done) {
+
+ let programOnMachine = 'N'
+ let goApprove = true;
+ if(this.row.taskDefinitionKey==='programmingTask' || this.row.taskDefinitionKey==='cureProgramTask'){
+ programOnMachine = this.$refs.todolistLeft.programOnMachine?'Y':'N';
+
+ let atts = this.$refs.todolistLeft.tableData;
+ let otherFileCOunt = atts.filter(att => att.program === false).length;
+ if(otherFileCOunt == 0 && programOnMachine != 'Y'){
+ let confirResult = await this.$confirm('鏂囦欢鍒楄〃涓棤鍏朵粬鏂囦欢锛岀‘璁よ鎻愪氦鍚楋紵', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(()=>{
+ goApprove = true;
+ }).catch(action => {
+ //鍙栨秷鎿嶄綔
+ goApprove = false;
+ });
+
+ }
+
}
+ if(goApprove == false){
+ done();
+ return;
+ }
+
approve({
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
- // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+ programOnMachine: programOnMachine
}).then(res => {
if(res.data.code !== 200) {
this.$message.error(res.data.msg);
@@ -518,6 +926,8 @@
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();//椤堕儴寰呭姙鏁伴噺鍒锋柊
done();
}).catch(err => {
done();
@@ -528,26 +938,22 @@
let data = {}
this.query = params;
this.page.currentPage = 1;
+ /*
console.log('searchChange', params);
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
- console.log(params);
- // data = {
- // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
data = {
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || ''
}
this.query = data
- this.onLoad(this.page, data);
+ */
+ this.onLoad(this.page, {});
done();
},
searchReset() {
- this.query = {};
+ this.query = this.defaultQuery;
this.onLoad(this.page);
},
currentChange(currentPage) {
@@ -563,7 +969,6 @@
onLoad(page, params = {}) {
const query = {
...this.query,
- // category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
try {
@@ -571,7 +976,9 @@
} catch (error) {
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
-
+ console.log('params',params);
+ console.log('q',query);
+ console.log('thisq',this.query);
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
@@ -587,7 +994,19 @@
};
</script>
+<style lang="scss">
+.remark-drawer {
+ .el-drawer__header {
+ padding-top:5px;
+ margin-bottom: 0px !important;
+ }
+ .el-drawer__body{
+ padding-top:5px;
+ }
+}
+</style>
<style scoped="scoped" lang="scss">
+
.approve-box {
display: flex;
@@ -596,11 +1015,12 @@
}
.left {
- width: 400px;
+ width: 40%;
}
.right {
flex: 1;
+ padding: 0 10px;
}
}
</style>
--
Gitblit v1.9.3