From efe3e228713018604a1767e58aaa73382d4bbc23 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 九月 2025 23:20:03 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

---
 src/views/wel/todolist.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/wel/todolist.vue b/src/views/wel/todolist.vue
index 3c3e0a2..190446f 100644
--- a/src/views/wel/todolist.vue
+++ b/src/views/wel/todolist.vue
@@ -281,8 +281,18 @@
         };
     },
     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) {
-            console.log('>>>>>>>>>>')
             if (val === 'Y' && ["approveTask", 'seniorApproveTask'].includes(this.row.taskDefinitionKey)) {// 楂樺笀
                 this.optionApprove.column[1].disabled = true;
                 this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
@@ -290,15 +300,13 @@
                this.setAssignee(this.row);
             } else if(val === 'N') {
                 this.formApprove.assignee = ''
-                console.log('>>>>>>>>>>')
-                this.optionApprove.column[1].disabled = true;
                 // this.formApprove.assignee = row.variables.senior;
             }
-            // 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; // 闅愯棌宸ュ簭鐗堟
-            // }
+            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; // 闅愯棌宸ュ簭鐗堟
+            }
             
         },
     },

--
Gitblit v1.9.3