From 486265bf2c8759f04e095b52e283d21759856433 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 15 Nov 2019 18:10:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=8D=E9=9A=90=E8=97=8F=E7=9A=84?= =?UTF-8?q?bug=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=BC=80=E5=9D=91=20=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E9=83=A8=E7=BD=B2=E6=BC=94=E7=A4=BA=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=20=E6=AD=A3=E5=9C=A8=E5=86=99=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=81=A2=E5=A4=8Dsql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/model/dbModel/worfFlow.go | 44 +++++++++++++++++ QMPlusVuePage/package-lock.json | 47 ++++++++++++++----- QMPlusVuePage/package.json | 2 +- .../layout/aside/asideComponent/index.vue | 2 +- QMPlusVuePage/vue.config.js | 2 +- 5 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 QMPlusServer/model/dbModel/worfFlow.go diff --git a/QMPlusServer/model/dbModel/worfFlow.go b/QMPlusServer/model/dbModel/worfFlow.go new file mode 100644 index 00000000..bdebe9b7 --- /dev/null +++ b/QMPlusServer/model/dbModel/worfFlow.go @@ -0,0 +1,44 @@ +package dbModel + +import ( + "github.com/jinzhu/gorm" + "time" +) + +type Application struct { + gorm.Model + WorkFlowID string // 所属工作流 + 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 + WorkflowName string // 工作流名称 + WorkflowDescription string //工作流描述 + WorkflowStep []WorkflowStepInfo //工作流步骤 +} + +type WorkflowStepInfo struct { + gorm.Model + WorkflowID uint + IsStrat bool + StepName string + StepNo float64 + StepAuthorityId string + IsEnd bool +} \ No newline at end of file diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 0385458b..f4c43c11 100644 --- a/QMPlusVuePage/package-lock.json +++ b/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", diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index c018d7db..1491b142 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -58,4 +58,4 @@ "> 1%", "last 2 versions" ] -} +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue index 6949d3e6..dc3227f7 100644 --- a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue @@ -1,5 +1,5 @@