From c425fedeb7b7a84c11ddc2149484af121a39396a Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sat, 28 Nov 2020 18:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/web/workflowForm.vue.tpl         | 15 +++++++++++++--
 server/service/sys_workflow.go                |  2 +-
 .../components/DetailPanel/UserTaskDetail.vue |  3 ++-
 .../workflowCreate/workflowCreate.vue         | 19 ++++++++++++-------
 .../view/workflow/workflowUse/workflowUse.vue |  7 +++++--
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/server/resource/template/web/workflowForm.vue.tpl b/server/resource/template/web/workflowForm.vue.tpl
index cde680ea..ae312026 100644
--- a/server/resource/template/web/workflowForm.vue.tpl
+++ b/server/resource/template/web/workflowForm.vue.tpl
@@ -31,6 +31,7 @@
            <el-button v-if="this.wf.clazz == 'start'" @click="start" type="primary">启动</el-button>
            <!-- complete传入流转参数 决定下一步会流转到什么位置 此处可以设置多个按钮来做不同的流转 -->
            <el-button v-if="canShow" @click="complete('yes')" type="primary">提交</el-button>
+           <el-button v-if="showSelfNode" @click="complete('')" type="primary">确认</el-button>
            <el-button @click="back" type="primary">返回</el-button>
            </el-form-item>
     </el-form>
@@ -56,8 +57,12 @@ export default {
         type:Object,
         default:function(){return{}}
       },
+      move:{
+         type:Object,
+         default:function(){return{}}
+      },
       workflowMoveID:{
-        type:Number,
+        type:[Number,String],
         default:0
       }
    },
@@ -91,6 +96,13 @@ export default {
     };
   },
   computed:{
+      showSelfNode(){
+         if(this.wf.assignType == "self" && this.move.promoterID == this.userInfo.ID){
+             return true
+         }else{
+             return false
+         }
+      },
       canShow(){
          if(this.wf.assignType == "user"){
             if(this.wf.assignValue.indexOf(","+this.userInfo.ID+",")>-1 && this.wf.clazz == 'userTask'){
@@ -105,7 +117,6 @@ export default {
                return false
             }
          }
-         return false
       },
       ...mapGetters("user", ["userInfo"])
   },
diff --git a/server/service/sys_workflow.go b/server/service/sys_workflow.go
index 38f039de..b588d2ee 100644
--- a/server/service/sys_workflow.go
+++ b/server/service/sys_workflow.go
@@ -406,7 +406,7 @@ func GetMyStated(userID uint) (err error, wfms []model.WorkflowMove) {
 func GetMyNeed(userID uint, AuthorityID string) (err error, wfms []model.WorkflowMove) {
 	user := "%," + strconv.Itoa(int(userID)) + ",%"
 	auth := "%," + AuthorityID + ",%"
-	err = global.GVA_DB.Preload("Promoter").Preload("Operator").Preload("WorkflowNode").Preload("WorkflowProcess").Joins("INNER JOIN workflow_nodes as node ON workflow_moves.workflow_node_id = node.id").Where("is_active = ? AND (node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND node.assign_value LIKE ? )", true, "user", user, "authority", auth).Find(&wfms).Error
+	err = global.GVA_DB.Preload("Promoter").Preload("Operator").Preload("WorkflowNode").Preload("WorkflowProcess").Joins("INNER JOIN workflow_nodes as node ON workflow_moves.workflow_node_id = node.id").Where("is_active = ? AND ((node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND promoter_id = ? ))", true, "user", user, "authority", auth, "self", userID).Find(&wfms).Error
 	return err, wfms
 }
 
diff --git a/web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue b/web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
index ee9c3db5..99cdfb87 100644
--- a/web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
+++ b/web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
@@ -4,7 +4,7 @@
     <div class="panelBody">
       <DefaultDetail :model="model" :onChange="onChange" :readOnly="readOnly" />
       <div class="panelRow">
-        <div>选择角色：</div>
+        <div>选择审批人类别：</div>
         <el-select
           style="width: 90%; font-size: 12px"
           placeholder="请选择角色（与用户互斥）"
@@ -19,6 +19,7 @@
         >
           <el-option key="user" value="user" :label="'用户'" />
           <el-option key="authority" value="authority" :label="'角色'" />
+          <el-option key="self" value="self" :label="'发起人本人'" />
         </el-select>
       </div>
       <div v-if="model.assignType == 'user'" class="panelRow">
diff --git a/web/src/view/workflow/workflowCreate/workflowCreate.vue b/web/src/view/workflow/workflowCreate/workflowCreate.vue
index d4357984..1d977e79 100644
--- a/web/src/view/workflow/workflowCreate/workflowCreate.vue
+++ b/web/src/view/workflow/workflowCreate/workflowCreate.vue
@@ -130,6 +130,17 @@ export default {
     },
     saveImg() {
       console.log(this.$refs["wfd"].graph.saveImg());
+    },
+    fmtAuthority(authorityList,list){
+      authorityList.map(item => {
+        list.push({
+          id: item.authorityId,
+          name: item.authorityName
+        });
+        if(item.children){
+          this.fmtAuthority(item.children,list)
+        }
+      });
     }
   },
   async created() {
@@ -140,14 +151,8 @@ export default {
       });
     }
     const authorityRes = await getAuthorityList({ page: 1, pageSize: 9999999 });
-    console.log(authorityRes)
     if (authorityRes.code == 0) {
-      authorityRes.data.list.map(item => {
-        this.authorities.push({
-          id: item.authorityId,
-          name: item.authorityName
-        });
-      });
+      this.fmtAuthority(authorityRes.data.list,this.authorities)
     }
     if(this.$route.query.id){
       const res = await findWorkflowProcess({ id: this.$route.query.id });
diff --git a/web/src/view/workflow/workflowUse/workflowUse.vue b/web/src/view/workflow/workflowUse/workflowUse.vue
index 5e6846f7..862f9fc4 100644
--- a/web/src/view/workflow/workflowUse/workflowUse.vue
+++ b/web/src/view/workflow/workflowUse/workflowUse.vue
@@ -14,8 +14,9 @@
       </div>
     <WorkflowInfo
       v-if="done"
-      :wf="this.node"
+      :wf="node"
       :business="business"
+      :move="move"
       :workflowMoveID="$route.query.workflowMoveID"
     />
   </div>
@@ -29,7 +30,8 @@ export default {
             done:false,
             business:null,
             node:null,
-            moves:[]
+            moves:[],
+            move:null
         }
     },
     computed:{
@@ -74,6 +76,7 @@ export default {
                this.business =  res.data.business
                this.workflow = res.data.move.workflowProcess
                this.node = res.data.move.workflowNode
+               this.move = res.data.move
                this.moves = res.data.moves
                this.createDone()
             }