whj před 11 měsíci
rodič
revize
3e253bbf66

+ 1 - 1
src/components/Jsplumb/index.vue

@@ -219,7 +219,7 @@ export default {
   min-height: calc(100vh - 200px);
   max-height: calc(100vh - 200px);
   overflow-y: auto;
-
+  padding-bottom: 30px;
   width: 100%;
 }
 .scale {

+ 2 - 0
src/views/custom/className/modules/BaseForm.vue

@@ -150,6 +150,8 @@ export default {
             methodCode: 'common_method',
           })
         })
+      } else {
+        this.form.resetFields()
       }
     },
     save() {

+ 19 - 0
src/views/workflow/workflow/modules/Detail.vue

@@ -49,6 +49,25 @@ export default {
       this.modalTitle = '详情'
       this.model = record
       this.details = JSON.parse(record.json)
+
+      const end = {
+        name: '结束',
+        id: String(+new Date()),
+        type: 4,
+        sortNum: 99,
+        y: 240,
+        x: this.details.find((item) => item.type === 1).x,
+        children: [],
+        parentIds: [],
+      }
+      this.details.forEach((item) => {
+        if (item.children.length === 0) {
+          item.children.push(end.id)
+          end.parentIds.push(item.id)
+          item.y > end.y - 240 && (end.y = item.y + 240)
+        }
+      })
+      this.details.push(end)
       this.$nextTick(() => {
         this.$refs.JsPlumb.init()
       })

+ 12 - 0
src/views/workflow/workflow/modules/modules/Node2.vue

@@ -28,6 +28,15 @@
         <div>{{detail.verifyType==1?detail.roleName:detail.userName}}</div>
       </div>
     </div>
+    <div v-else class="end">
+      <div class="top"></div>
+      <div class="title">
+        结束
+      </div>
+      <div class="card-content">
+        审批结束
+      </div>
+    </div>
   </div>
 </template>
 
@@ -84,6 +93,9 @@ export default {
       background: #e99e09;
     }
   }
+  .end {
+    margin-bottom: 30px;
+  }
 }
 .action {
   border-top: 1px solid #ccc;