Merge branch 'master' of https://github.com/piexlmax/gin-vue-admin

QMPlusServer/model/dbModel/worfFlow.go

@@ -0,0 +1,48 @@
+package dbModel
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+type Application struct {
+	gorm.Model
+	WorkFlowID           string    // 所属工作流ID
+	WorkFlowStepInfoID   string    // 当前节点ID
+	ApplicationName      string    // 申请人姓名
+	ApplicationCause     string    // 请假原因
+	ApplicationStartData time.Time // 请假开始日期
+	ApplicationEndData   time.Time // 请假开始日期
+
+}
+
+// 流转表
+type ApplicationWorkFlowProcess struct {
+	gorm.Model
+	ApplicationID  uint   // 当前工作流所属申请的ID
+	CurrentNode    string // 当前进度节点
+	HistoricalNode string //上一个进度节点
+	CurrentUser    string // 当前进度操作人
+	HistoricalUser string // 上一个进度的操作人
+	State          bool   // 状态 是否是正在进行的状态
+}
+
+//工作流属性表
+type Workflow struct {
+	gorm.Model
+	WorkflowNickName    string             // 工作流名称
+	WorkflowName        string             // 工作流英文id
+	WorkflowDescription string             //工作流描述
+	WorkflowStep        []WorkflowStepInfo //工作流步骤
+}
+
+// 工作流状态表
+type WorkflowStepInfo struct {
+	gorm.Model
+	WorkflowID      uint    // 所属工作流ID
+	IsStrat         bool    // 是否是开始流节点
+	StepName        string  // 工作流名称
+	StepNo          float64 // 步骤id （第几步）
+	StepAuthorityID string  // 操作者级别id
+	IsEnd           bool    // 是否是完结流节点
+}

QMPlusVuePage/package-lock.json

@@ -2858,7 +2858,8 @@
       "version": "4.6.0",
       "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.2",
@@ -5217,7 +5218,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5238,12 +5240,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5258,17 +5262,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5385,7 +5392,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5397,6 +5405,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5411,6 +5420,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5418,12 +5428,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5442,6 +5454,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5522,7 +5535,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5534,6 +5548,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5619,7 +5634,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5655,6 +5671,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5674,6 +5691,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5717,12 +5735,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -9844,7 +9864,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

QMPlusVuePage/package.json

@@ -58,4 +58,4 @@
         "> 1%",
         "last 2 versions"
     ]
-}
+}

QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <component :is="menuComponent" :routerInfo="routerInfo">
+  <component :is="menuComponent" :routerInfo="routerInfo" v-if="!routerInfo.hidden">
     <template v-if="routerInfo.children.length">
       <AsideComponent :key="item.name" :routerInfo="item" v-for="item in routerInfo.children" />
     </template>

QMPlusVuePage/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 }
 module.exports = {
     // 基础配置 详情看文档
-    publicPath: '/',
+    publicPath: './',
     outputDir: 'dist',
     assetsDir: 'static',
     lintOnSave: process.env.NODE_ENV === 'development',