From 3a77f72e6a76f2d77342ec93ef48ef94b3fb964c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 8 Sep 2021 18:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/bpmnjsInit/bpmnjsInit.js           |  3 ++-
 .../property/selectStaff/selectStaff.html       | 17 +++++++++--------
 .../property/selectStaff/selectStaff.js         | 16 +++++++++++-----
 .../newOaWorkflowDetail/newOaWorkflowDetail.js  |  6 +++---
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/public/components/property/bpmnjsInit/bpmnjsInit.js b/public/components/property/bpmnjsInit/bpmnjsInit.js
index 85614a37c..25cbc663b 100644
--- a/public/components/property/bpmnjsInit/bpmnjsInit.js
+++ b/public/components/property/bpmnjsInit/bpmnjsInit.js
@@ -4,7 +4,8 @@
         data: {
             bpmnjsInfo: {
                 condition: '',
-                staffId: ''
+                staffId: '',
+                from: 'bpmn'
             }
         },
         _initMethod: function () {
diff --git a/public/components/property/selectStaff/selectStaff.html b/public/components/property/selectStaff/selectStaff.html
index 6658b1477..c6ecebed5 100755
--- a/public/components/property/selectStaff/selectStaff.html
+++ b/public/components/property/selectStaff/selectStaff.html
@@ -12,7 +12,8 @@
                         <div class=" staff padding padding-top-xs">
                             <div class=" padding overflow-hidden"
                                 :class="{'select':selectStaffInfo.curCompanyId == item.orgId}"
-                                v-for="(item,index) in selectStaffInfo.companys" @click="_changeCompany(item)" style="cursor:pointer">
+                                v-for="(item,index) in selectStaffInfo.companys" @click="_changeCompany(item)"
+                                style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-building-o margin-right-xs" aria-hidden="true"></i>
                                     {{item.orgName}}
@@ -25,7 +26,8 @@
                         <div class="padding-left staff padding  padding-top-xs">
                             <div class=" padding overflow-hidden"
                                 :class="{'select':selectStaffInfo.curDepartmentId == item.orgId}"
-                                v-for="(item,index) in selectStaffInfo.departments" @click="_changeDepartment(item)" style="cursor:pointer">
+                                v-for="(item,index) in selectStaffInfo.departments" @click="_changeDepartment(item)"
+                                style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-sitemap margin-right-xs" aria-hidden="true"></i>
                                     {{item.orgName}}
@@ -38,9 +40,8 @@
                         <div class="padding-left staff padding padding-top-xs">
                             <div class=" padding overflow-hidden"
                                 :class="{'select':selectStaffInfo.curStaffId == item.staffId}"
-                                v-for="(item,index) in selectStaffInfo.staffs"
-                                @click="_changeStaff(item)" style="cursor:pointer"
-                                >
+                                v-for="(item,index) in selectStaffInfo.staffs" @click="_changeStaff(item)"
+                                style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-user margin-right-xs" aria-hidden="true"></i>
                                     {{item.name}}
@@ -48,11 +49,11 @@
                             </div>
                         </div>
                     </div>
-
                 </div>
-
+                <div class="text-right" v-if="selectStaffInfo.staff.from == 'bpmn'">
+                    <button type="button" class="btn btn-primary btn-sm" @click="_firstUser()">提交者</button>
+                </div>
             </div>
-
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/components/property/selectStaff/selectStaff.js b/public/components/property/selectStaff/selectStaff.js
index 2ee87adb0..f4501624a 100755
--- a/public/components/property/selectStaff/selectStaff.js
+++ b/public/components/property/selectStaff/selectStaff.js
@@ -24,6 +24,7 @@
                 //查询公司信息
                 $that._initOrg(2, '');
                 $('#selectStaffModel').modal('show');
+                $that.selectStaffInfo.staff = _staff;
                 $that.staff = _staff;
             });
 
@@ -44,11 +45,11 @@
                 $that.loadStaff();
             },
             _changeStaff: function (item) {
-                console.log('selectStaff',item);
+                console.log('selectStaff', item);
                 $that.staff.staffId = item.userId;
                 $that.staff.staffName = item.userName;
                 $('#selectStaffModel').modal('hide');
-                if($that.staff.hasOwnProperty('call')){
+                if ($that.staff.hasOwnProperty('call')) {
                     $that.staff.call($that.staff);
                 }
             },
@@ -119,10 +120,15 @@
                         console.log('请求失败处理');
                     }
                 );
-
             },
-
-
+            _firstUser: function () {
+                $that.staff.staffId = '${startUserId}';
+                $that.staff.staffName = '开始人';
+                $('#selectStaffModel').modal('hide');
+                if ($that.staff.hasOwnProperty('call')) {
+                    $that.staff.call($that.staff);
+                }
+            }
         }
     });
 
diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
index feb31d574..bd2e16b82 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
@@ -88,8 +88,6 @@
                         row: 10
                     }
                 };
-                //发送get请求
-                //vc.http.apiGet('workflow.listWorkflowAuditInfo',
                 vc.http.apiGet('/oaWorkflow/queryOaWorkflowUser',
                     param,
                     function (json, res) {
@@ -154,7 +152,9 @@
                 var param = {
                     params: {
                         communityId: vc.getCurrentCommunity().communityId,
-                        taskId: $that.newOaWorkflowDetailInfo.audit.taskId
+                        taskId: $that.newOaWorkflowDetailInfo.audit.taskId,
+                        flowId: $that.newOaWorkflowDetailInfo.flowId,
+                        id: $that.newOaWorkflowDetailInfo.id
                     }
                 };
                 //发送get请求