Merge pull request 'dengjie : 待我处理的审批详情的必填标志*已删除,审批流程条件右边的'优先级'已删除' (#15) from DJ into master

Reviewed-on: http://git.hchyun.com/clay/workflow-engine-web/pulls/15

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')
           }

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>

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;