From d6a22e84896bd82f89b359061ca16eb3ea5f522c Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Tue, 27 Dec 2022 22:01:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Process/PropertyPanel.vue  |  5 ----
 .../src/views/flowable/definition/index.vue   |  4 ++--
 .../src/views/flowable/definition/model.vue   | 24 -------------------
 .../flowable/task/finished/detail/index.vue   |  5 ++--
 .../task/myProcess/detail/flowview.vue        |  3 +--
 .../flowable/task/myProcess/detail/index.vue  |  3 +--
 .../flowable/task/myProcess/send/index.vue    |  2 +-
 .../flowable/task/todo/detail/flowview.vue    |  2 +-
 .../views/flowable/task/todo/detail/index.vue |  2 +-
 9 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/ruoyi-ui/src/components/Process/PropertyPanel.vue b/ruoyi-ui/src/components/Process/PropertyPanel.vue
index 4974af90..96e46fc3 100644
--- a/ruoyi-ui/src/components/Process/PropertyPanel.vue
+++ b/ruoyi-ui/src/components/Process/PropertyPanel.vue
@@ -55,11 +55,6 @@ export default {
         name: '',
         color: null
       },
-      roles: [
-        { value: 'manager', label: '经理' },
-        { value: 'personnel', label: '人事' },
-        { value: 'charge', label: '主管' }
-      ]
     }
   },
   computed: {
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 2d065111..6c26e510 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -101,8 +101,8 @@
       <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180"/>
       <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">编辑</el-button>
-          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
+          <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
+          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>
           <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
           <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
           <el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
diff --git a/ruoyi-ui/src/views/flowable/definition/model.vue b/ruoyi-ui/src/views/flowable/definition/model.vue
index 37d8129c..da1b46ae 100644
--- a/ruoyi-ui/src/views/flowable/definition/model.vue
+++ b/ruoyi-ui/src/views/flowable/definition/model.vue
@@ -114,10 +114,6 @@ export default {
     },
     /** 指定流程办理人员列表 */
     getDataList() {
-      // todo 待根据部门选择人员
-      // const params = {
-      //
-      // }
       userList().then(res =>{
         res.data.forEach(val =>{
           val.userId = val.userId.toString();
@@ -142,26 +138,6 @@ export default {
       this.xmlOpen = true;
       this.xmlData = vkBeautify.xml(xmlData);
     },
-    // /** 获取数据类型 */
-    // dataType(data){
-    //   this.users = [];
-    //   this.groups = [];
-    //   if (data) {
-    //     if (data.dataType === 'dynamic') {
-    //       if (data.userType === 'assignee') {
-    //         this.users = [{nickName: "${INITIATOR}", userId: "${INITIATOR}"},
-    //                       {nickName: "#{approval}", userId: "#{approval}"}
-    //           ]
-    //       } else if (data.userType === 'candidateUsers') {
-    //         this.users = [ {nickName: "#{approval}", userId: "#{approval}"}]
-    //       } else {
-    //         this.groups = [{roleName: "#{approval}", roleId: "#{approval}"}]
-    //       }
-    //     } else {
-    //       this.getDataList()
-    //     }
-    //   }
-    // }
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue b/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
index 97519def..ab323507 100644
--- a/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-card class="box-card" >
       <div slot="header" class="clearfix">
-        <span class="el-icon-document">办结任务</span>
-        <el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
+        <span class="el-icon-document">已办任务</span>
+        <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
       <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
@@ -64,7 +64,6 @@
           <flow :flowData="flowData"/>
         </el-tab-pane>
       </el-tabs>
-      <el-button style="position: absolute;right:35px;top:35px;"  type="primary" @click="goBack">关闭</el-button>
     </el-card>
   </div>
 </template>
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue
index 85e80faf..f2075e4d 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue
@@ -41,7 +41,7 @@ export default {
             container: this.$refs.flowCanvas,
             height: 'calc(100vh - 200px)',
           });
-          this.loadFlowCanvas(newVal)
+          this.loadFlowCanvas(newVal);
         }
       },
       immediate: true, // 立即生效
@@ -55,7 +55,6 @@ export default {
     async loadFlowCanvas(flowData) {
       const self = this
       try {
-        console.log(flowData,"self.flowData")
         await self.bpmnViewer.importXML(flowData.xmlData);
         self.fitViewport()
         if (flowData.nodeData !==undefined && flowData.nodeData.length > 0 ) {
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
index 7503b64f..2459b0e8 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
@@ -3,7 +3,7 @@
     <el-card class="box-card" >
       <div slot="header" class="clearfix">
         <span class="el-icon-document">已发任务</span>
-        <el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
+        <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
       <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
@@ -65,7 +65,6 @@
           <flow :flowData="flowData"/>
         </el-tab-pane>
     </el-tabs>
-    <el-button style="position: absolute;right:35px;top:35px;"  type="primary" @click="goBack">关闭</el-button>
     </el-card>
   </div>
 </template>
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
index 2c147bdf..64ac8d20 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
@@ -3,7 +3,7 @@
     <el-card class="box-card" >
       <div slot="header" class="clearfix">
         <span class="el-icon-document">发起任务</span>
-        <el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
+        <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
       <el-tabs  tab-position="top" v-model="activeName"  @tab-click="handleClick">
         <!--表单信息-->
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue
index 0aafc56f..f2075e4d 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue
@@ -41,7 +41,7 @@ export default {
             container: this.$refs.flowCanvas,
             height: 'calc(100vh - 200px)',
           });
-          this.loadFlowCanvas(newVal)
+          this.loadFlowCanvas(newVal);
         }
       },
       immediate: true, // 立即生效
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
index acf971cc..e2e20121 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
@@ -5,7 +5,7 @@
         <span class="el-icon-document">待办任务</span>
         <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
         <el-tag>任务节点:{{ taskName }}</el-tag>
-        <el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
+        <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->