🎉 1.0.5.RELEASE

src/views/plugin/workflow/design/form.vue

@@ -243,6 +243,7 @@ export default {
             })
           } else {
             this.$confirm('是否将此表单保存为新版本？这意味着可以返回到以前的版本。', '提示', {
+              distinguishCancelAndClose: true,
               confirmButtonText: '否',
               cancelButtonText: '是',
               type: 'warning'
@@ -254,14 +255,16 @@ export default {
                 this.onLoad(this.page, this.query)
                 this.formVisible = false
               })
-            }).catch(() => {
-              this.row.newVersion = true
+            }).catch(action => {
+              if (action == 'cancel') {
+                this.row.newVersion = true
 
-              update(this.row).then(() => {
-                this.$message.success("保存成功")
-                this.onLoad(this.page, this.query)
-                this.formVisible = false
-              })
+                update(this.row).then(() => {
+                  this.$message.success("保存成功")
+                  this.onLoad(this.page, this.query)
+                  this.formVisible = false
+                })
+              }
             })
           }
         }

src/views/plugin/workflow/design/index.vue

@@ -221,6 +221,7 @@ export default {
 
       if (this.process.id) {
         this.$confirm('是否将此模型保存为新版本？这意味着可以返回到以前的版本。', '提示', {
+          distinguishCancelAndClose: true,
           confirmButtonText: '否',
           cancelButtonText: '是',
           type: 'warning'
@@ -232,14 +233,16 @@ export default {
             this.$store.commit('DEL_TAG', this.tag)
             this.$router.push("/plugin/workflow/design/model")
           })
-        }).catch(() => {
-          params.newVersion = true
+        }).catch(action => {
+          if (action == 'cancel') {
+            params.newVersion = true
 
-          submit(params).then(() => {
-            this.$message.success("操作成功")
-            this.$store.commit('DEL_TAG', this.tag)
-            this.$router.push("/plugin/workflow/design/model")
-          })
+            submit(params).then(() => {
+              this.$message.success("操作成功")
+              this.$store.commit('DEL_TAG', this.tag)
+              this.$router.push("/plugin/workflow/design/model")
+            })
+          }
         })
       } else {
         submit(params).then(() => {

src/views/plugin/workflow/process/claim.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"
@@ -82,6 +82,13 @@ export default {
             search: true,
             overHidden: true
           },
+          {
+            label: '流水号',
+            prop: 'serialNumber',
+            bind: 'variables.serialNumber',
+            search: true,
+            overHidden: true
+          },
           {
             label: "流程分类",
             row: true,
@@ -98,6 +105,11 @@ export default {
             label: '当前步骤',
             prop: 'taskName',
           },
+          {
+            label: '申请人',
+            prop: 'startUsername',
+            search: true
+          },
           {
             label: '申请时间',
             prop: 'createTime',

src/views/plugin/workflow/process/components/detail.vue

@@ -168,7 +168,7 @@ export default {
           prop: '$copyUser',
           placeholder: '请选择 抄送人',
           readonly: true,
-          append: '➕',
+          append: '+',
           span: 24,
           event: {
             click: () => {
@@ -182,6 +182,7 @@ export default {
           prop: '$assignee',
           placeholder: '请选择 下一级审批人，如不选择则使用默认处理人，驳回时无效',
           readonly: true,
+          append: '+',
           span: 24,
           event: {
             click: () => {
@@ -244,10 +245,31 @@ export default {
                 const c = taskForm.find(s => s.id == col.prop)
                 if (c && c.readable) {
                   if (!c.writable) {
-                    col.readonly = true
-                    col.disabled = true
+                    if (col.type == 'dynamic') {
+                      col.children.addBtn = false
+                      col.children.delBtn = false
+                    }
+                    else {
+                      col.readonly = true
+                      col.disabled = true
+                    }
                     delete col.rules
                   } else vars.push(col.prop)
+                  if (col.type == 'dynamic') { // 处理子表单
+                    const childrenColumnArr = []
+                    col.children.column.forEach(cc => {
+                      let c2 = taskForm.find(s => s.id == cc.prop)
+                      if (c2 && c2.readable) {
+                        if (!c2.writable) {
+                          cc.readonly = true
+                          cc.disabled = true
+                          delete cc.rules
+                        }
+                        childrenColumnArr.push(cc)
+                      }
+                    })
+                    col.children.column = childrenColumnArr
+                  }
                   columnArr.push(col)
                 }
               })
@@ -260,10 +282,31 @@ export default {
                     const c = taskForm.find(s => s.id == col.prop)
                     if (c && c.readable) {
                       if (!c.writable) {
-                        col.readonly = true
-                        col.disabled = true
+                        if (col.type == 'dynamic') {
+                          col.children.addBtn = false
+                          col.children.delBtn = false
+                        }
+                        else {
+                          col.readonly = true
+                          col.disabled = true
+                        }
                         delete col.rules
                       } else vars.push(col.prop)
+                      if (col.type == 'dynamic') { // 处理子表单
+                        const childrenColumnArr = []
+                        col.children.column.forEach(cc => {
+                          let c2 = taskForm.find(s => s.id == cc.prop)
+                          if (c2 && c2.readable) {
+                            if (!c2.writable) {
+                              cc.readonly = true
+                              cc.disabled = true
+                              delete cc.rules
+                            }
+                            childrenColumnArr.push(cc)
+                          }
+                        })
+                        col.children.column = childrenColumnArr
+                      }
                       groupColumnArr.push(col)
                     }
                   })
@@ -273,6 +316,14 @@ export default {
               })
             }
 
+            if (process.variables && process.variables.serialNumber) {
+              columnArr.unshift({
+                label: '流水号',
+                prop: 'serialNumber',
+                span: 24,
+                detail: true,
+              })
+            }
             option.column = columnArr
             option.group = groupArr
             this.vars = vars
@@ -284,6 +335,8 @@ export default {
           this.flow = flow
           this.buttonList = button
 
+          this.tag.label = '流程详情 - ' + process.processDefinitionName
+
           const flows = []
           flow.forEach(f => {
             const ff = {

src/views/plugin/workflow/process/components/form.vue

@@ -54,13 +54,34 @@ export default {
           const { column, group } = option
           if (column && column.length > 0) { // 处理column
             column.forEach(col => {
-              const c = startForm.find(s => s.id == col.prop)
+              let c = startForm.find(s => s.id == col.prop)
               if (c && c.readable) {
                 if (!c.writable) {
-                  col.readonly = true
-                  col.disabled = true
+                  if (col.type == 'dynamic') {
+                    col.children.addBtn = false
+                    col.children.delBtn = false
+                  }
+                  else {
+                    col.readonly = true
+                    col.disabled = true
+                  }
                   delete col.rules
                 }
+                if (col.type == 'dynamic') { // 处理子表单
+                  const childrenColumnArr = []
+                  col.children.column.forEach(cc => {
+                    let c2 = startForm.find(s => s.id == cc.prop)
+                    if (c2 && c2.readable) {
+                      if (!c2.writable) {
+                        cc.readonly = true
+                        cc.disabled = true
+                        delete cc.rules
+                      }
+                      childrenColumnArr.push(cc)
+                    }
+                  })
+                  col.children.column = childrenColumnArr
+                }
                 columnArr.push(col)
               }
             })
@@ -73,10 +94,31 @@ export default {
                   const c = startForm.find(s => s.id == col.prop)
                   if (c && c.readable) {
                     if (!c.writable) {
-                      col.readonly = true
-                      col.disabled = true
+                      if (col.type == 'dynamic') {
+                        col.children.addBtn = false
+                        col.children.delBtn = false
+                      }
+                      else {
+                        col.readonly = true
+                        col.disabled = true
+                      }
                       delete col.rules
                     }
+                    if (col.type == 'dynamic') { // 处理子表单
+                      const childrenColumnArr = []
+                      col.children.column.forEach(cc => {
+                        let c2 = startForm.find(s => s.id == cc.prop)
+                        if (c2 && c2.readable) {
+                          if (!c2.writable) {
+                            cc.readonly = true
+                            cc.disabled = true
+                            delete cc.rules
+                          }
+                          childrenColumnArr.push(cc)
+                        }
+                      })
+                      col.children.column = childrenColumnArr
+                    }
                     groupColumnArr.push(col)
                   }
                 })
@@ -93,6 +135,8 @@ export default {
           setTimeout(() => {
             this.$refs.form.clearValidate()
           })
+
+          this.tag.label = '发起流程 - ' + process.name
         }
       })
     },

src/views/plugin/workflow/process/copy.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"

src/views/plugin/workflow/process/done.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"
@@ -82,6 +82,13 @@ export default {
             search: true,
             overHidden: true
           },
+          {
+            label: '流水号',
+            prop: 'serialNumber',
+            bind: 'variables.serialNumber',
+            search: true,
+            overHidden: true
+          },
           {
             label: "流程分类",
             type: "select",
@@ -98,6 +105,11 @@ export default {
             label: '当前节点',
             prop: 'taskName',
           },
+          {
+            label: '申请人',
+            prop: 'startUsername',
+            search: true
+          },
           {
             label: '申请时间',
             prop: 'createTime',

src/views/plugin/workflow/process/my-done.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                v-model="form"
                @search-change="searchChange"
                @search-reset="searchReset"
@@ -78,6 +78,13 @@ export default {
             search: true,
             overHidden: true
           },
+          {
+            label: '流水号',
+            prop: 'serialNumber',
+            bind: 'variables.serialNumber',
+            search: true,
+            overHidden: true
+          },
           {
             label: "流程分类",
             type: "select",
@@ -94,6 +101,11 @@ export default {
             label: '当前节点',
             prop: 'taskName',
           },
+          {
+            label: '申请人',
+            prop: 'startUsername',
+            search: true
+          },
           {
             label: '申请时间',
             prop: 'createTime',

src/views/plugin/workflow/process/send.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"
@@ -33,8 +33,8 @@
                destroy-on-close
                title="流程图">
       <wf-design ref="bpmn"
-                style="height: 500px;"
-                :options="bpmnOption"></wf-design>
+                 style="height: 500px;"
+                 :options="bpmnOption"></wf-design>
     </el-dialog>
   </basic-container>
 </template>
@@ -81,6 +81,13 @@ export default {
             search: true,
             overHidden: true
           },
+          {
+            label: '流水号',
+            prop: 'serialNumber',
+            bind: 'variables.serialNumber',
+            search: true,
+            overHidden: true
+          },
           {
             label: "流程分类",
             row: true,
@@ -97,6 +104,11 @@ export default {
             label: '当前节点',
             prop: 'taskName',
           },
+          {
+            label: '申请人',
+            prop: 'startUsername',
+            search: true
+          },
           {
             label: '申请时间',
             prop: 'createTime',

src/views/plugin/workflow/process/start.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"

src/views/plugin/workflow/process/todo.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
-               :page="page"
+               :page.sync="page"
                :permission="permissionList"
                v-model="form"
                @search-change="searchChange"
@@ -81,6 +81,13 @@ export default {
             search: true,
             overHidden: true
           },
+          {
+            label: '流水号',
+            prop: 'serialNumber',
+            bind: 'variables.serialNumber',
+            search: true,
+            overHidden: true
+          },
           {
             label: "流程分类",
             row: true,
@@ -97,6 +104,11 @@ export default {
             label: '当前节点',
             prop: 'taskName',
           },
+          {
+            label: '申请人',
+            prop: 'startUsername',
+            search: true
+          },
           {
             label: '申请时间',
             prop: 'createTime',