From 5bdb2202cfeccf25f947689f07c80431000ad615 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 19:04:27 +0800
Subject: [PATCH] 增加新编程序统计;固化程序统计

---
 src/views/flow/todolist.vue |   37 +++++++++++--------------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index d53595d..8c2579a 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -26,7 +26,7 @@
         <el-drawer title="瀹℃壒" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
             <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" />
@@ -97,24 +97,7 @@
                             { label: '椹冲洖', value: 'N' },
                         ],
                         rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
-                    },/*
-                    {
-                        label: '鍙戦�佺粰',
-                        prop: 'assignee',
-                        type: 'select',
-                        props: {
-                            label: 'name',
-                            value: 'id',
-                        },
-                        display: true,
-                        filterable: true,
-                        span: 24,
-                        disabled: false,
-                        dicData: [
-
-                        ],
-                       
-                    },*/
+                    },
                     {
                         label: '鍙戦�佺粰',
                         prop: 'assignee',
@@ -137,7 +120,6 @@
                         span: 24,
                         prop: 'comment',
                         type: 'textarea',
-                        // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
                         rules: [
                             {
                             validator: (rule, value, callback) => {
@@ -783,17 +765,20 @@
             //console.log('handleAction', row, index);
         },
         handleSubmit(form, done) {
-            if(this.row.taskDefinitionKey === 'programmingTask') {
-                // if(this.applist.length !== 1) {
-                //     done();
-                //     return this.$message.success('璇烽�夋嫨1涓▼搴�');
-                // }
+            
+            
+            //this.$alert(this.$refs.todolistLeft.programOnMachine)
+            //done();
+            //return;
+            let programOnMachine = 'N'
+            if(this.row.taskDefinitionKey==='programmingTask'){
+                programOnMachine = this.$refs.todolistLeft.programOnMachine?'Y':'N';
             }
             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);

--
Gitblit v1.9.3