From e830cc9c794b394ebdb2c5e611ef84d8ff952101 Mon Sep 17 00:00:00 2001
From: bob <bob.liu@happyelements.net>
Date: Tue, 14 Mar 2023 14:19:12 +0800
Subject: [PATCH] fix(flow)  update VariablesSubmitDate,delete invalid button

---
 .../views/flowable/task/allprocess/index.vue  | 56 +++++++++----------
 .../src/views/flowable/task/record/admin.vue  |  7 ++-
 .../src/views/flowable/task/record/index.vue  | 17 +-----
 .../src/views/flowable/task/todo/index.vue    | 30 +++++-----
 4 files changed, 46 insertions(+), 64 deletions(-)

diff --git a/ruoyi-ui/src/views/flowable/task/allprocess/index.vue b/ruoyi-ui/src/views/flowable/task/allprocess/index.vue
index 42d3ed2..3894630 100644
--- a/ruoyi-ui/src/views/flowable/task/allprocess/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/allprocess/index.vue
@@ -24,17 +24,17 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:deployment:add']"
-        >新增流程</el-button>
-      </el-col>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:deployment:add']"-->
+<!--        >新增流程</el-button>-->
+<!--      </el-col>-->
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="danger"-->
@@ -46,29 +46,23 @@
 <!--          v-hasPermi="['system:deployment:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:deployment:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:deployment:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程类别" align="center" prop="category" width="100px" />
-      <el-table-column label="流程版本" align="center" width="80px">
-        <template slot-scope="scope">
-          <el-tag size="medium" >v{{ scope.row.procDefVersion }}</el-tag>
-        </template>
-      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="projectName" :show-overflow-tooltip="true"/>
+      <el-table-column label="工作问题" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
       <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="流程状态" align="center" width="100">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/flowable/task/record/admin.vue b/ruoyi-ui/src/views/flowable/task/record/admin.vue
index e8ace84..0b72b21 100644
--- a/ruoyi-ui/src/views/flowable/task/record/admin.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/admin.vue
@@ -159,7 +159,7 @@
                       <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
                         <span>{{item.finishTime}}</span>
-                        <span > <el-button align="right" @click="handleUpdateTaskFinishDate(item.taskId)" size="mini" round plain  type="primary">修改时间</el-button></span>
+                        <span > <el-button align="right" @click="handleUpdateTaskFinishDate(item.taskId,index)" size="mini" round plain  type="primary">修改时间</el-button></span>
                       </el-descriptions-item >
 <!--                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">-->
 <!--                        <template slot="label"><i class="el-icon-time"></i>耗时</template>-->
@@ -408,6 +408,7 @@ export default {
       rejectOpen: false,
       updateFinishDateOpen: false,
       taskId: '',
+      taskIndex: '',
       rejectTitle: null,
       userData:[],
       checkSendUser: false // 是否展示选择人员模块
@@ -450,9 +451,10 @@ export default {
       );
     },
     /**  修改任务提交时间 */
-    handleUpdateTaskFinishDate(taskId) {
+    handleUpdateTaskFinishDate(taskId,taskIndex) {
       this.updateFinishDateOpen = true;
       this.taskId = taskId;
+      this.taskIndex = taskIndex;
     },
 
       /**  修改任务提交时间 */
@@ -460,6 +462,7 @@ export default {
       const params = {
         processInstanceId: this.taskForm.procInsId,
         taskId:  this.taskId,
+        taskIndex:  this.taskIndex,
         finishDate: this.finishDate
       }
       updateTaskFinishDate(params).then( res => {
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index f22e2be..60d46a9 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -158,31 +158,16 @@
                         <template slot="label"><i class="el-icon-user"></i>候选办理</template>
                         {{item.candidate}}
                       </el-descriptions-item>
-<!--                      <el-descriptions-item label-class-name="my-label">-->
-<!--                        <template slot="label"><i class="el-icon-date"></i>接收时间</template>-->
-<!--                        {{item.createTime}}-->
-<!--                      </el-descriptions-item>-->
                       <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
-                        <span v-if="form.submitDate !==undefined && form.submitDate !==''&& form.submitDate !==null">{{form.submitDate}}</span>
-                        <span v-else>{{item.finishTime}}</span>
+                        <span>{{item.finishTime}}</span>
                       </el-descriptions-item >
-<!--                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">-->
-<!--                        <template slot="label"><i class="el-icon-time"></i>耗时</template>-->
-<!--                        {{item.duration}}-->
-<!--                      </el-descriptions-item>-->
                       <el-descriptions-item v-if="item.comment" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{item.comment.comment}}
                       </el-descriptions-item>
 
                     </el-descriptions>
-
-<!--                    <p  v-if="item.comment">-->
-<!--                      <el-tag type="success" v-if="item.comment.type === '1'">  {{item.comment.comment}}</el-tag>-->
-<!--                      <el-tag type="warning" v-if="item.comment.type === '2'">  {{item.comment.comment}}</el-tag>-->
-<!--                      <el-tag type="danger" v-if="item.comment.type === '3'">  {{item.comment.comment}}</el-tag>-->
-<!--                    </p>-->
                     <img v-if="isRefuse(item.comment)"  src="@/assets/images/refuse.png" width="50" height="50">
                   </el-card>
                 </el-timeline-item>
diff --git a/ruoyi-ui/src/views/flowable/task/todo/index.vue b/ruoyi-ui/src/views/flowable/task/todo/index.vue
index 61a2213..cf7e937 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/index.vue
@@ -24,21 +24,21 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:deployment:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>