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 |  356 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 276 insertions(+), 80 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 7a8ff98..0b8a2c7 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,14 +5,18 @@
             @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>
             </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>
@@ -26,29 +30,49 @@
                 </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,manualDispatch,autoDispatch } 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: {
@@ -75,27 +99,17 @@
                         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: [
 
                         ],
-                        // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
-                    },
-                    {
-                        label: '宸ュ簭鐗堟',
-                        prop: 'processEdition',
-                        type: 'input',
-                        span: 24,
-                        // disabled: true,
-                        display: false,// 闅愯棌鏄剧ず
                         // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
                     },
                     {
@@ -136,6 +150,7 @@
                 columnBtn: false,
                 tip: false,
                 // simplePage: true,
+                searchEnter:true,
                 searchShow: true,
                 searchMenuSpan: 6,
                 dialogWidth: '60%',
@@ -168,7 +183,7 @@
 					{
                         label: '鏍囬',
                         prop: '',
-                        width: 100,
+                        width: 200,
 						render: ({ row }) => {
                             return h('p',
                                 {
@@ -180,15 +195,29 @@
                     },
                     {
                         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,
@@ -199,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',
@@ -216,7 +246,7 @@
                     },
                     {
                         label: '涓婁竴姝ョ敤鎴�',
-                        width: 200,
+                        width: 100,
                         prop: '',
                         formatter: (val, value, label) => {
                             return `${val?.variables?.approveUserNickName || ''}`;
@@ -224,7 +254,7 @@
                     },
                     {
                         label: '褰撳墠鑺傜偣',
-                        width: 200,
+                        width: 100,
                         prop: 'taskName',
                     },
                     {
@@ -234,7 +264,7 @@
                     },
                     {
                         label: '鍒拌揪鏃堕棿',
-                        width: 200,
+                        width: 120,
                         prop: 'createTime',
                     },
                     {
@@ -254,17 +284,29 @@
                 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: [
 
                         ],
@@ -275,7 +317,7 @@
                         span: 24,
                         prop: 'comment',
                         type: 'textarea',
-                        rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+                        // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
                     },
                 ],
             },
@@ -283,26 +325,25 @@
         };
     },
     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']),
@@ -310,43 +351,70 @@
             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;
+             });
     },
     methods: {
         // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
-        setApproveBtn () {
+        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' },
@@ -356,25 +424,77 @@
             }
         },
         setAssignee (row, approve) {
-            if (approve === 'Y') {
-                if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+            
+            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'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+                } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','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){
+                    //瑙i攣娴佺▼锛岀紪绋嬪鏍�,榛樿缁欓珮甯�
+                    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;
-                    this.formApprove.assignee = row.varables.assignee; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+                //涓嶉�氳繃鐨勬儏鍐�
+                //鏍规嵁鍦ㄧ嚎鏂囨。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 = ''
             }
             
         },
@@ -382,6 +502,7 @@
             this.transferTaskSelection = list;
         },
         reassign(val) {// 閲嶆柊鎸囨淳
+            
             this.reassignType = val;
             if (this.transferTaskSelection.length === 0) {
                 this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
@@ -411,9 +532,27 @@
                     }).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;
+                }
             }
             
             
@@ -426,7 +565,8 @@
                     confirmButtonText: this.$t('submitText'),
                     cancelButtonText: this.$t('cancelText'),
                     type: 'warning',
-                }).then(() => {
+                }).then((res) => {
+                    console.log(res,'>>>>>>')
                     reassgin({
                         ...form,
                         taskId: this.transferTaskSelection[0].taskId,
@@ -446,6 +586,10 @@
                         this.$message.error('鎿嶄綔澶辫触');
                         done()
                     })
+                }).catch(() => {
+                    console.log('>>>>>>')
+                    // this.$message.info('宸插彇娑堟搷浣�');
+                    done();
                 });
                 
             } else if (this.reassignType === 1) {
@@ -474,19 +618,70 @@
                         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();
                 });
             }
-            
-            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: 'Y', // 榛樿鍚�
             }
             this.approveBox = true;
             this.row = row
+
             this.setAssignee(row, this.formApprove.approve);
+            this.setApproveBtn(row);
             console.log('handleAction', row, index);
         },
         handleSubmit(form, done) {
@@ -588,11 +783,12 @@
     }
 
     .left {
-        width: 400px;
+        width: 40%;
     }
 
     .right {
         flex: 1;
+        padding: 0 10px;
     }
 }
 </style>

--
Gitblit v1.9.3