From dde07be43edfc9bd4a9cc495dde993c0e92266b2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 20 Jun 2020 17:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/common/audit/audit.html     |  2 +-
 .../workflowSettingManage.js                  | 82 +++++++++++++++++--
 2 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/public/components/common/audit/audit.html b/public/components/common/audit/audit.html
index 54af00018..52d4308cf 100644
--- a/public/components/common/audit/audit.html
+++ b/public/components/common/audit/audit.html
@@ -20,7 +20,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">原因</label>
                                 <div class="col-sm-10">
-                                    <textarea placeholder="选填，请填写原因" class="form-control"
+                                    <textarea placeholder="必填，请填写原因" class="form-control"
                                               v-model="auditInfo.remark"></textarea></div>
                             </div>
 
diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.js b/public/pages/property/workflowSettingManage/workflowSettingManage.js
index f06c36af2..fd9c88659 100644
--- a/public/pages/property/workflowSettingManage/workflowSettingManage.js
+++ b/public/pages/property/workflowSettingManage/workflowSettingManage.js
@@ -17,11 +17,7 @@
         },
         methods: {
             saveWorkflowSettingInfo: function () {
-                if (!vc.component.addWorkflowSettingValidate()) {
-                    vc.toast(vc.validate.errInfo);
 
-                    return;
-                }
 
                 vc.component.workflowSettingInfo.communityId = vc.getCurrentCommunity().communityId;
 
@@ -35,7 +31,7 @@
                         let data = JSON.parse(json);
                         if (data.code == 0) {
                             vc.toast(data.msg);
-                            $that.getBack();
+                            $that._goBack();
                             return;
                         }
                         vc.toast(data.msg);
@@ -57,6 +53,76 @@
                 }
                 $that.workflowSettingInfo.flowId = flowId;
                 $that.workflowSettingInfo.flowName = vc.getParam('flowName');
+
+                //查询步骤
+                var param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        flowId: flowId
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('workflow.listWorkflowSteps',
+                    param,
+                    function (json, res) {
+                        var _workflowInfo = JSON.parse(json);
+                        if (_workflowInfo.code != '0') {
+                            vc.toast(_workflowInfo.msg);
+                            return;
+                        }
+                        $that._freshResStep(_workflowInfo.data);
+
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _freshResStep: function (_data) {
+                $that.workflowSettingInfo.describle = _data.describle;
+                let _steps = [];
+                if (!_data.hasOwnProperty("workflowSteps")) {
+                    return;
+                }
+
+                for (let stepIndex = 0; stepIndex < _data.workflowSteps.length; stepIndex++) {
+                    let _workflowStep = _data.workflowSteps[stepIndex];
+                    let _step = {
+                        seq: stepIndex,
+                        staffId: _workflowStep.workflowStepStaffs[0].staffId,
+                        staffName: _workflowStep.workflowStepStaffs[0].staffName,
+                        type: _workflowStep.type,
+                        subStaff: []
+                    };
+                    if (_workflowStep.type == 2) {
+                        _steps.push(_step);
+                        continue;
+                    }
+                    let _subStaffs = [];
+
+                    if (!_workflowStep.hasOwnProperty("workflowStepStaffs") || _workflowStep.workflowStepStaffs.length < 2) {
+                        _steps.push(_step);
+                        continue;
+                    }
+
+                    for (let _subIndex = 1; _subIndex < _workflowStep.workflowStepStaffs.length; _subIndex++) {
+                        let _workflowStepStaff = _workflowStep.workflowStepStaffs[_subIndex];
+                        let _subStaff = {
+                            id: vc.uuid(),
+                            staffId: _workflowStepStaff.staffId,
+                            staffName: _workflowStepStaff.staffName
+                        }
+
+                        _subStaffs.push(_subStaff);
+                    }
+
+                    _step.subStaff = _subStaffs;
+                    _steps.push(_step);
+
+                }
+
+                $that.workflowSettingInfo.steps = _steps;
+
             },
             addWorkflowStep: function () {
                 let _step = {
@@ -70,7 +136,7 @@
             },
             chooseStaff: function (item) {
                 console.log(item);
-                vc.emit('selectStaff','openStaff',item);
+                vc.emit('selectStaff', 'openStaff', item);
             },
             _goBack: function () {
                 vc.getBack();
@@ -96,8 +162,8 @@
                     }
                 }
             },
-            chooseType:function(_item){
-                if(_item.type == '1'){
+            chooseType: function (_item) {
+                if (_item.type == '1') {
                     _item.subStaff = [];
                 }
             }