From 092faccee6326921e4e4f2f7437944e19b82b4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Thu, 16 Feb 2023 18:27:37 +0800
Subject: [PATCH] =?UTF-8?q?dengjie=20:=20=E5=BE=85=E6=88=91=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=87=E5=BF=97*=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4,=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=B3=E8=BE=B9=E7=9A=84'=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E7=BA=A7'=E5=B7=B2=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/common/form/FormRender.vue      |  1 -
 .../common/process/nodes/ConditionNode.vue    |  2 +-
 .../src/views/workspace/DisposalTask.vue      | 21 ++++++++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/flowable-engine-web/src/views/common/form/FormRender.vue b/flowable-engine-web/src/views/common/form/FormRender.vue
index e1afb78..e55306b 100644
--- a/flowable-engine-web/src/views/common/form/FormRender.vue
+++ b/flowable-engine-web/src/views/common/form/FormRender.vue
@@ -78,7 +78,6 @@ export default {
         if (item.name === 'SpanLayout'){
           this.loadFormConfig(item.props.items)
         }else {
-          console.log(item,!item.perm)
           if (!item.perm){
             this.$set(item, 'perm', 'E')
           }
diff --git a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue
index 5b2382b..f761e93 100644
--- a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue
+++ b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue
@@ -7,7 +7,7 @@
       <div class="node-body-main" @click="$emit('selected')">
         <div class="node-body-main-header">
           <ellipsis class="title" hover-tip :content="config.name ? config.name : ('条件' + level)"/>
-          <span class="level">优先级{{ level }}</span>
+<!--          <span class="level">优先级{{ level }}</span>-->
           <span class="option" v-if="designStart()">
             <el-tooltip effect="dark" content="复制条件" placement="top">
               <i class="el-icon-copy-document" @click.stop="$emit('copy')"></i>
diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue
index 91527cc..ed49d4d 100644
--- a/flowable-engine-web/src/views/workspace/DisposalTask.vue
+++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue
@@ -60,9 +60,8 @@
         <div style="height: 15px;background:#f5f5f5;"></div>
         <form-render v-if="!loading" ref="taskViewForm" :form-items="taskData.formItems"
                           v-model="taskData.formData"/>
-        <!--        <process-diagram-viewer/>-->
         <div style="height: 15px;background:#f5f5f5;"></div>
-        <footer class="footer">
+        <el-footer class="footer">
           <div class="footer_comment" @click="showCommentBox">
             <i class="el-icon-chat-line-round" style="font-size: 18px;"></i>
             <span style="font-size: 12px;">评论</span>
@@ -85,7 +84,7 @@
             </el-button>
             <el-button type="primary" size="mini" round @click="submitTask()">同意</el-button>
           </div>
-        </footer>
+        </el-footer>
       </div>
     </el-drawer>
     <comment ref="comment"
@@ -131,6 +130,7 @@ export default {
       this.approveOpen = true;
       this.loadProcessTask(row.taskId);
       this.selectTask = row;
+
     },
     getList() {
       getTaskList().then(res => {
@@ -153,6 +153,13 @@ export default {
       let that = this;
       this.init();
       getTaskInfo(taskId).then(res => {
+        let data=res.data
+        data.formItems.map(item=>{
+          if(item.props.required){
+            item.props.required=!item.props.required
+          }
+          return item
+        })
         that.taskData = res.data;
         that.$store.state.design = that.taskData;
         that.$store.state.userTaskOption = that.taskData.userTaskOption;
@@ -296,15 +303,15 @@ export default {
 }
 
 .footer {
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
   display: flex;
   justify-content: space-between;
   align-items: center;
   height: 30px;
   padding: 15px 0;
-  position: absolute;
-  width: 100%;
-  bottom: 0;
-  left: 0;
   z-index: 99;
   background: #fff;
   border-top: 1px solid #dcdfe6;
-- 
2.40.1