From 8b5e064612c027ae459577a4e74ac3b9e9bf1000 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 31 Aug 2021 09:14:06 +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

---
 .../newOaWorkflowDetail.html                  | 36 +++++++++++++++++--
 .../newOaWorkflowDetail.js                    | 36 +++++++++++++++----
 2 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
index 8dd92ec1c..3560ca32e 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
@@ -85,6 +85,7 @@
         </div>
     </div>
 
+
     <div class="row" v-if="newOaWorkflowDetailInfo.action">
         <div class="col-lg-12">
             <div class="ibox">
@@ -102,7 +103,8 @@
                                     <option selected disabled value="">请选择</option>
                                     <option value="1100">办理</option>
                                     <option value="1200" v-if="newOaWorkflowDetailInfo.nextAudit.back">退回</option>
-                                    <option value="1400" v-if="newOaWorkflowDetailInfo.nextAudit.backIndex">退回至提交者</option>
+                                    <option value="1400" v-if="newOaWorkflowDetailInfo.nextAudit.backIndex">退回至提交者
+                                    </option>
                                     <option value="1300">转单</option>
                                 </select>
                             </div>
@@ -115,8 +117,21 @@
                                 </textarea>
                             </div>
                         </div>
-                        <div class="form-group row"
-                            v-if="newOaWorkflowDetailInfo.audit.auditCode != '1200' && newOaWorkflowDetailInfo.audit.auditCode != '1400'">
+                        <!-- 办理时 判断是否指定 委托人 如果指定了 则不显示 -->
+                        <div class="form-group row" v-if="newOaWorkflowDetailInfo.audit.auditCode == '1100' && !newOaWorkflowDetailInfo.nextAudit.assignee">
+                            <label class="col-sm-2 col-form-label text-right">下一处理人</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control" placeholder="必填，请选择下一处理人" disabled
+                                    v-model="newOaWorkflowDetailInfo.audit.staffName">
+                            </div>
+                            <div class="col-sm-2">
+                                <button class="btn btn-white " type="button" v-on:click="chooseStaff()">
+                                    选择
+                                </button>
+                            </div>
+                        </div>
+                        <!-- 转单时 必须指定 委托人 -->
+                        <div class="form-group row" v-if="newOaWorkflowDetailInfo.audit.auditCode == '1300'">
                             <label class="col-sm-2 col-form-label text-right">下一处理人</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" placeholder="必填，请选择下一处理人" disabled
@@ -138,5 +153,20 @@
             </div>
         </div>
     </div>
+
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>流程图</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                    </div>
+                </div>
+                <div class="ibox-content text-center">
+                    <img :src="newOaWorkflowDetailInfo.imgData" alt="" height="300px">
+                </div>
+            </div>
+        </div>
+    </div>
     <vc:create path="property/selectStaff"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
index 3db3b6932..feb31d574 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
@@ -15,6 +15,7 @@
                     staffName: '',
                     taskId: ''
                 },
+                imgData: '',
                 nextAudit: {}
             }
         },
@@ -31,6 +32,7 @@
             $that._listOaWorkflowDetails();
             $that._loadComments();
             $that._loadNextAuditPerson();
+            $that._openNewOaWorkflowDetailImg();
         },
         _initEvent: function () {
         },
@@ -82,8 +84,8 @@
                         communityId: vc.getCurrentCommunity().communityId,
                         id: $that.newOaWorkflowDetailInfo.id,
                         flowId: $that.newOaWorkflowDetailInfo.flowId,
-                        page:1,
-                        row:10
+                        page: 1,
+                        row: 10
                     }
                 };
                 //发送get请求
@@ -111,6 +113,9 @@
                 let _audit = $that.newOaWorkflowDetailInfo.audit;
                 _audit.flowId = $that.newOaWorkflowDetailInfo.flowId;
                 _audit.id = $that.newOaWorkflowDetailInfo.id;
+                if ($that.newOaWorkflowDetailInfo.nextAudit.assignee) {
+                    _audit.staffId = $that.newOaWorkflowDetailInfo.nextAudit.assignee;
+                }
                 if (!_audit.auditCode) {
                     vc.toast('请选择状态');
                     return;
@@ -142,11 +147,8 @@
                     },
                     function (errInfo, error) {
                         console.log('请求失败处理');
-
                         vc.toast(errInfo);
-
                     });
-
             },
             _loadNextAuditPerson: function () {
                 var param = {
@@ -190,7 +192,29 @@
                 }
 
                 return "未知"
-            }
+            },
+            _openNewOaWorkflowDetailImg: function () { //展示流程图
+                var param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        businessKey: $that.newOaWorkflowDetailInfo.id
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('workflow.listRunWorkflowImage',
+                    param,
+                    function (json, res) {
+                        var _workflowManageInfo = JSON.parse(json);
+                        if (_workflowManageInfo.code != '0') {
+                            //vc.toast(_workflowManageInfo.msg);
+                            return;
+                        }
+                        $that.newOaWorkflowDetailInfo.imgData = 'data:image/png;base64,' + _workflowManageInfo.data;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 })(window.vc);