Quellcode durchsuchen

加入添加审核人员功能

wuxw vor 6 Jahren
Ursprung
Commit
be2ad0c902
15 geänderte Dateien mit 519 neuen und 298 gelöschten Zeilen
  1. 3 3
      WebService/src/main/java/com/java110/web/components/auditUser/AddAuditUserComponent.java
  2. 0 35
      WebService/src/main/java/com/java110/web/components/auditUser/EditAuditUserComponent.java
  3. 0 65
      WebService/src/main/java/com/java110/web/smo/auditUser/impl/EditAuditUserSMOImpl.java
  4. 0 69
      WebService/src/main/resources/components/auditUserPackage/add-auditUser/addAuditUser.html
  5. 50 0
      WebService/src/main/resources/components/auditUserPackage/addAuditUserOtherView/addAuditUserOtherView.html
  6. 33 59
      WebService/src/main/resources/components/auditUserPackage/add-auditUser/addAuditUser.js
  7. 41 0
      WebService/src/main/resources/components/auditUserPackage/addAuditUserStep/addAuditUserStep.html
  8. 169 0
      WebService/src/main/resources/components/auditUserPackage/addAuditUserStep/addAuditUserStep.js
  9. 1 5
      WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html
  10. 51 54
      WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.js
  11. 14 0
      WebService/src/main/resources/components/staffPackage/view-staff-info/viewStaffInfo.js
  12. 38 0
      WebService/src/main/resources/views/addAuditUserStepFlow.html
  13. 76 7
      java110-code-generator/src/main/resources/relationship/template_1.json
  14. 41 0
      java110-code-generator/src/main/resources/relationship/template_repairDispatchStep.json
  15. 2 1
      java110-utils/src/main/java/com/java110/utils/constant/PrivilegeCodeConstant.java

+ 3 - 3
WebService/src/main/java/com/java110/web/components/auditUser/AddAuditUserComponent.java

@@ -7,10 +7,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 /**
 /**
- * 添加审核人员组件
+ * 添加添加审核人员组件
  */
  */
-@Component("addAuditUser")
-public class AddAuditUserComponent {
+@Component("addAuditUserStepBinding")
+public class AddAuditUserStepBindingComponent {
 
 
     @Autowired
     @Autowired
     private IAddAuditUserSMO addAuditUserSMOImpl;
     private IAddAuditUserSMO addAuditUserSMOImpl;

+ 0 - 35
WebService/src/main/java/com/java110/web/components/auditUser/EditAuditUserComponent.java

@@ -1,35 +0,0 @@
-package com.java110.web.components.auditUser;
-
-import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IEditAuditUserSMO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-
-/**
- * 编辑小区组件
- */
-@Component("editAuditUser")
-public class EditAuditUserComponent {
-
-    @Autowired
-    private IEditAuditUserSMO editAuditUserSMOImpl;
-
-    /**
-     * 添加小区数据
-     *
-     * @param pd 页面数据封装
-     * @return ResponseEntity 对象
-     */
-    public ResponseEntity<String> update(IPageData pd) {
-        return editAuditUserSMOImpl.updateAuditUser(pd);
-    }
-
-    public IEditAuditUserSMO getEditAuditUserSMOImpl() {
-        return editAuditUserSMOImpl;
-    }
-
-    public void setEditAuditUserSMOImpl(IEditAuditUserSMO editAuditUserSMOImpl) {
-        this.editAuditUserSMOImpl = editAuditUserSMOImpl;
-    }
-}

+ 0 - 65
WebService/src/main/java/com/java110/web/smo/auditUser/impl/EditAuditUserSMOImpl.java

@@ -1,65 +0,0 @@
-package com.java110.web.smo.auditUser.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.PrivilegeCodeConstant;
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
-import com.java110.web.core.AbstractComponentSMO;
-import com.java110.web.smo.auditUser.IEditAuditUserSMO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * 添加审核人员服务实现类
- * add by wuxw 2019-06-30
- */
-@Service("eidtAuditUserSMOImpl")
-public class EditAuditUserSMOImpl extends AbstractComponentSMO implements IEditAuditUserSMO {
-
-    @Autowired
-    private RestTemplate restTemplate;
-
-    @Override
-    protected void validate(IPageData pd, JSONObject paramIn) {
-
-        //super.validatePageInfo(pd);
-
-        Assert.hasKeyAndValue(paramIn, "auditUserId", "审核ID不能为空");
-        Assert.hasKeyAndValue(paramIn, "userId", "必填,请填写用户ID");
-        Assert.hasKeyAndValue(paramIn, "userName", "必填,请填写用户名称");
-        Assert.hasKeyAndValue(paramIn, "auditLink", "必填,请选择审核环节");
-        Assert.hasKeyAndValue(paramIn, "objCode", "必填,请填写流程对象");
-
-
-        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_AUDITUSER);
-
-    }
-
-    @Override
-    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
-        ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
-
-        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/auditUser.updateAuditUser",
-                HttpMethod.POST);
-        return responseEntity;
-    }
-
-    @Override
-    public ResponseEntity<String> updateAuditUser(IPageData pd) {
-        return super.businessProcess(pd);
-    }
-
-    public RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
-
-    public void setRestTemplate(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
-}

+ 0 - 69
WebService/src/main/resources/components/auditUserPackage/add-auditUser/addAuditUser.html

@@ -1,69 +0,0 @@
-<div id="addAuditUserModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加审核人员</h3>
-                <div class="ibox-content">
-                    <div>
-                        <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填,请填写名称" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼编号</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填,请填写编号" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填,请填写备注" class="form-control"></div>
-                            </div>-->
-
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">用户ID</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addAuditUserInfo.userId" type="text" placeholder="必填,请填写用户ID"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">用户名称</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addAuditUserInfo.userName" type="text" placeholder="必填,请填写用户名称"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">审核环节</label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addAuditUserInfo.auditLink">
-                                        <option selected disabled value="">必填,请选择审核环节</option>
-                                        <option value="809001">部门主管</option>
-                                        <option value="809002">财务主管</option>
-                                        <option value="809003">采购人员</option>
-                                    </select></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">流程对象</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addAuditUserInfo.objCode" type="text" placeholder="必填,请填写流程对象"
-                                           class="form-control">
-                                </div>
-                            </div>
-
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="saveAuditUserInfo()"><i class="fa fa-check"></i>&nbsp;保存
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">取消
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 50 - 0
WebService/src/main/resources/components/auditUserPackage/addAuditUserOtherView/addAuditUserOtherView.html

@@ -0,0 +1,50 @@
+<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">
+
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">用户ID</label>
+                    <div class="col-sm-10">
+                        <input v-model="addAuditUserOtherViewInfo.userId" readonly type="text" placeholder="必填,请填写用户ID"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">用户名称</label>
+                    <div class="col-sm-10">
+                        <input v-model="addAuditUserOtherViewInfo.userName" readonly type="text" placeholder="必填,请填写用户名称"
+                               class="form-control">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">审核环节</label>
+                    <div class="col-sm-10">
+                        <select class="custom-select" v-model="addAuditUserOtherViewInfo.auditLink">
+                            <option selected disabled value="">必填,请选择审核环节</option>
+                            <option value="809001">部门主管</option>
+                            <option value="809002">财务主管</option>
+                            <option value="809003">采购人员</option>
+                        </select></div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">流程对象</label>
+                    <div class="col-sm-10">
+                        <select class="custom-select" v-model="addAuditUserOtherViewInfo.objCode">
+                            <option selected disabled value="">必填,请选择审核流程</option>
+                            <option value="resourceEntry">采购流程</option>
+                            <option value="resourceOut">出库流程</option>
+                        </select></div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>

+ 33 - 59
WebService/src/main/resources/components/auditUserPackage/add-auditUser/addAuditUser.js

@@ -6,8 +6,8 @@
             callBackFunction: vc.propTypes.string //父组件监听方法
             callBackFunction: vc.propTypes.string //父组件监听方法
         },
         },
         data: {
         data: {
-            addAuditUserInfo: {
-                auditUserId: '',
+            addAuditUserOtherViewInfo: {
+                flowComponent: 'addAuditUserOtherView',
                 userId: '',
                 userId: '',
                 userName: '',
                 userName: '',
                 auditLink: '',
                 auditLink: '',
@@ -15,20 +15,39 @@
 
 
             }
             }
         },
         },
+        watch: {
+            addAuditUserOtherViewInfo: {
+                deep: true,
+                handler: function () {
+                    vc.component.saveAddAuditUserOtherInfo();
+                }
+            }
+        },
         _initMethod: function () {
         _initMethod: function () {
 
 
         },
         },
         _initEvent: function () {
         _initEvent: function () {
-            vc.on('addAuditUser', 'openAddAuditUserModal', function () {
-                $('#addAuditUserModel').modal('show');
+
+            vc.on('addAuditUserOtherViewInfo', 'onIndex', function (_index) {
+                vc.component.addAuditUserOtherViewInfo.index = _index;
+            });
+
+            vc.on('addAuditUserOtherViewInfo', '_clear', function (_staffInfo) {
+                vc.component.addAuditUserOtherViewInfo= {
+                    flowComponent: 'addAuditUserOtherView',
+                    userId: _staffInfo.userId,
+                    userName: _staffInfo.userName,
+                    auditLink: '',
+                    objCode: '',
+                };
             });
             });
         },
         },
         methods: {
         methods: {
-            addAuditUserValidate() {
+            addAuditUserOtherValidate() {
                 return vc.validate.validate({
                 return vc.validate.validate({
-                    addAuditUserInfo: vc.component.addAuditUserInfo
+                    addAuditUserOtherViewInfo: vc.component.addAuditUserOtherViewInfo
                 }, {
                 }, {
-                    'addAuditUserInfo.userId': [
+                    'addAuditUserOtherViewInfo.userId': [
                         {
                         {
                             limit: "required",
                             limit: "required",
                             param: "",
                             param: "",
@@ -40,7 +59,7 @@
                             errInfo: "用户ID必须为数字"
                             errInfo: "用户ID必须为数字"
                         },
                         },
                     ],
                     ],
-                    'addAuditUserInfo.userName': [
+                    'addAuditUserOtherViewInfo.userName': [
                         {
                         {
                             limit: "required",
                             limit: "required",
                             param: "",
                             param: "",
@@ -52,7 +71,7 @@
                             errInfo: "用户名称必须在2至50字符之间"
                             errInfo: "用户名称必须在2至50字符之间"
                         },
                         },
                     ],
                     ],
-                    'addAuditUserInfo.auditLink': [
+                    'addAuditUserOtherViewInfo.auditLink': [
                         {
                         {
                             limit: "required",
                             limit: "required",
                             param: "",
                             param: "",
@@ -64,7 +83,7 @@
                             errInfo: "审核环节格式错误"
                             errInfo: "审核环节格式错误"
                         },
                         },
                     ],
                     ],
-                    'addAuditUserInfo.objCode': [
+                    'addAuditUserOtherViewInfo.objCode': [
                         {
                         {
                             limit: "required",
                             limit: "required",
                             param: "",
                             param: "",
@@ -77,59 +96,14 @@
                         },
                         },
                     ],
                     ],
 
 
-
                 });
                 });
             },
             },
-            saveAuditUserInfo: function () {
-                if (!vc.component.addAuditUserValidate()) {
-                    vc.message(vc.validate.errInfo);
-
-                    return;
-                }
-
-                vc.component.addAuditUserInfo.communityId = vc.getCurrentCommunity().communityId;
-                //不提交数据将数据 回调给侦听处理
-                if (vc.notNull($props.callBackListener)) {
-                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addAuditUserInfo);
-                    $('#addAuditUserModel').modal('hide');
+            saveAddAuditUserOtherInfo: function () {
+                if (vc.component.addAuditUserOtherValidate()) {
+                    //侦听回传
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addAuditUserOtherViewInfo);
                     return;
                     return;
                 }
                 }
-
-                vc.http.post(
-                    'addAuditUser',
-                    'save',
-                    JSON.stringify(vc.component.addAuditUserInfo),
-                    {
-                        emulateJSON: true
-                    },
-                    function (json, res) {
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if (res.status == 200) {
-                            //关闭model
-                            $('#addAuditUserModel').modal('hide');
-                            vc.component.clearAddAuditUserInfo();
-                            vc.emit('auditUserManage', 'listAuditUser', {});
-
-                            return;
-                        }
-                        vc.message(json);
-
-                    },
-                    function (errInfo, error) {
-                        console.log('请求失败处理');
-
-                        vc.message(errInfo);
-
-                    });
-            },
-            clearAddAuditUserInfo: function () {
-                vc.component.addAuditUserInfo = {
-                    userId: '',
-                    userName: '',
-                    auditLink: '',
-                    objCode: '',
-
-                };
             }
             }
         }
         }
     });
     });

+ 41 - 0
WebService/src/main/resources/components/auditUserPackage/addAuditUserStep/addAuditUserStep.html

@@ -0,0 +1,41 @@
+<div id="component">
+
+    <div class="java110_step">
+        <div id="step"></div>
+    </div>
+
+    <!-- 选择 应用信息 -->
+    <div v-if="addAuditUserStepInfo.index == 0 || addAuditUserStepInfo.index == 1">
+        <vc:create name="viewOrgInfo"
+                   callBackListener="addAuditUserStep"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+    <div v-if="addAuditUserStepInfo.index == 2">
+        <vc:create name="viewStaffInfo"
+                   callBackListener="addAuditUserStep"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+    <div v-if="addAuditUserStepInfo.index == 3">
+        <vc:create name="addAuditUserOther"
+                   callBackListener="addAuditUserStep"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+
+
+    <div class="row">
+        <div class="col-md-10"></div>
+        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
+            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
+            <button v-if="addAuditUserStepInfo.index != 3" type="button" class="btn btn-primary"
+                    style="margin-left:10px;" v-on:click="_nextStep()">下一步
+            </button>
+            <button v-if="addAuditUserStepInfo.index == 3" type="button" class="btn btn-primary"
+                    style="margin-left:10px;" v-on:click="_finishStep()">完成
+            </button>
+        </div>
+    </div>
+
+</div>

+ 169 - 0
WebService/src/main/resources/components/auditUserPackage/addAuditUserStep/addAuditUserStep.js

@@ -0,0 +1,169 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    vc.extends({
+        data: {
+            addAuditUserStepInfo: {
+                $step: {},
+                index: 0,
+                infos: [],
+                branchOrgInfo:{
+                    orgId:'',
+                    componentName:'分公司信息',
+                    buttonName:'选择分公司',
+                    orgName:'',
+                    orgLevel:'2',
+                    parentOrgId:'',
+                    description:'',
+                },
+                departmemtOrgInfo:{
+                    orgId:'',
+                    componentName:'部门信息',
+                    buttonName:'选择部门',
+                    orgName:'',
+                    orgLevel:'3',
+                    parentOrgId:'',
+                    description:'',
+                },
+                viewStaffInfo:{
+                    index:0,
+                    flowComponent:'viewStaffInfo',
+                    userId:'',
+                    name:'',
+                    email:'',
+                    tel:'',
+                    sex:'',
+                    orgId:''
+                },
+                auditUserInfo:{
+                    userId: '',
+                    userName: '',
+                    auditLink: '',
+                    objCode: '',
+                }
+            }
+        },
+        watch: {
+            'addAuditUserStepInfo.departmemtOrgInfo': {
+                deep: true,
+                handler: function () {
+                    vc.emit('viewStaffInfo', '_clear',{});
+                }
+            },
+            'addAuditUserStepInfo.viewStaffInfo': {
+                deep: true,
+                handler: function () {
+                    vc.emit('auditUserInfo', '_clear',vc.component.addAuditUserStepInfo.viewStaffInfo);
+                }
+            },
+        },
+        _initMethod: function () {
+            vc.component._initStep();
+        },
+        _initEvent: function () {
+            vc.on("addAuditUserStep", "notify", function (_info) {
+                //vc.component.addAuditUserStepInfo.infos[vc.component.addAuditUserStepInfo.index] = _info;
+
+                if(vc.component.addAuditUserStepInfo.index == 0){
+                    vc.copyObject(_info,vc.component.addAuditUserStepInfo.branchOrgInfo);
+                    vc.component.addAuditUserStepInfo.infos[0] = vc.component.addAuditUserStepInfo.branchOrgInfo;
+                }else if(vc.component.addAuditUserStepInfo.index == 1){
+                    vc.copyObject(_info,vc.component.addAuditUserStepInfo.departmemtOrgInfo);
+                    vc.component.addAuditUserStepInfo.repairDispatchInfo.orgId = _info.orgId
+                    vc.component.addAuditUserStepInfo.infos[1] = vc.component.addAuditUserStepInfo.departmemtOrgInfo;
+                }else if(vc.component.addAuditUserStepInfo.index == 2){
+                    vc.copyObject(_info,vc.component.addAuditUserStepInfo.viewStaffInfo);
+                    vc.component.addAuditUserStepInfo.infos[vc.component.addAuditUserStepInfo.index] = _info;
+                }else{
+                    //vc.copyObject(_info, vc.component.addAuditUserStepInfo.repairDispatchInfo);
+                    vc.copyObject(_info,vc.component.addAuditUserStepInfo.auditUserInfo);
+                    vc.component.addAuditUserStepInfo.infos[vc.component.addAuditUserStepInfo.index] = _info;
+                }
+            });
+
+        },
+        methods: {
+            _initStep: function () {
+                vc.component.addAuditUserStepInfo.$step = $("#step");
+                vc.component.addAuditUserStepInfo.$step.step({
+                    index: 0,
+                    time: 500,
+                    title: ["选择分公司", "选择部门", "选择员工", "扩展信息"]
+                });
+                vc.component.addAuditUserStepInfo.index = vc.component.addAuditUserStepInfo.$step.getIndex();
+                vc.component._notifyViewOrgInfoComponentData();
+            },
+            _prevStep: function () {
+                vc.component.addAuditUserStepInfo.$step.prevStep();
+                vc.component.addAuditUserStepInfo.index = vc.component.addAuditUserStepInfo.$step.getIndex();
+
+                vc.emit('viewOrgInfo', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.emit('viewStaffInfo', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.emit('addAuditUserOther', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.component._notifyViewOrgInfoComponentData();
+
+            },
+            _nextStep: function () {
+                var _currentData = vc.component.addAuditUserStepInfo.infos[vc.component.addAuditUserStepInfo.index];
+                if (_currentData == null || _currentData == undefined) {
+                    vc.message("请选择或填写必选信息");
+                    return;
+                }
+                vc.component.addAuditUserStepInfo.$step.nextStep();
+                vc.component.addAuditUserStepInfo.index = vc.component.addAuditUserStepInfo.$step.getIndex();
+
+                vc.emit('viewOrgInfo', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.emit('viewStaffInfo', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.emit('addAuditUserOther', 'onIndex', vc.component.addAuditUserStepInfo.index);
+                vc.component._notifyViewOrgInfoComponentData();
+
+            },
+            _finishStep: function () {
+
+
+                var _currentData = vc.component.addAuditUserStepInfo.infos[vc.component.addAuditUserStepInfo.index];
+                if (_currentData == null || _currentData == undefined) {
+                    vc.message("请选择或填写必选信息");
+                    return;
+                }
+
+                var param = {
+                    data: vc.component.addAuditUserStepInfo.infos
+                }
+
+                vc.http.post(
+                    'addAuditUserStepBinding',
+                    'binding',
+                    JSON.stringify(vc.component.addAuditUserStepInfo.auditUserInfo),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        if (res.status == 200) {
+
+                            vc.message('处理成功', true);
+                            //关闭model
+                            vc.jumpToPage("/flow/auditUserFlow?" + vc.objToGetParam(JSON.parse(json)));
+                            return;
+                        }
+                        vc.message(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                    });
+            },
+            _notifyViewOrgInfoComponentData:function(){
+
+                if(vc.component.addAuditUserStepInfo.index == 0){
+                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addAuditUserStepInfo.branchOrgInfo);
+                }else if(vc.component.addAuditUserStepInfo.index == 1){
+                    vc.component.addAuditUserStepInfo.departmemtOrgInfo.parentOrgId = vc.component.addAuditUserStepInfo.branchOrgInfo.orgId;
+                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addAuditUserStepInfo.departmemtOrgInfo);
+                }
+            }
+        }
+    });
+})(window.vc);

+ 1 - 5
WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html

@@ -49,7 +49,7 @@
                     <div class="ibox-tools" style="top:10px;">
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAuditUserModal()">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAuditUserModal()">
                             <i class="glyphicon glyphicon-plus"></i>
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加审核人员
+                            添加
                         </button>
                         </button>
                     </div>
                     </div>
                 </div>
                 </div>
@@ -101,10 +101,6 @@
     </div>
     </div>
 
 
 
 
-    <vc:create name="addAuditUser"
-               callBackListener=""
-               callBackFunction=""
-    ></vc:create>
     <vc:create name="deleteAuditUser"></vc:create>
     <vc:create name="deleteAuditUser"></vc:create>
 
 
 </div>
 </div>

+ 51 - 54
WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.js

@@ -1,86 +1,83 @@
 /**
 /**
-    入驻小区
-**/
-(function(vc){
+ 入驻小区
+ **/
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     var DEFAULT_ROWS = 10;
     vc.extends({
     vc.extends({
-        data:{
-            auditUserManageInfo:{
-                auditUsers:[],
-                total:0,
-                records:1,
-                moreCondition:false,
-                userName:'',
-                conditions:{
-                    auditUserId:'',
-userName:'',
-auditLink:'',
+        data: {
+            auditUserManageInfo: {
+                auditUsers: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                userName: '',
+                conditions: {
+                    auditUserId: '',
+                    userName: '',
+                    auditLink: '',
 
 
                 }
                 }
             }
             }
         },
         },
-        _initMethod:function(){
+        _initMethod: function () {
             vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
             vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         },
-        _initEvent:function(){
-            
-            vc.on('auditUserManage','listAuditUser',function(_param){
-                  vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
+        _initEvent: function () {
+
+            vc.on('auditUserManage', 'listAuditUser', function (_param) {
+                vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
             });
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listAuditUsers(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listAuditUsers(_currentPage, DEFAULT_ROWS);
             });
             });
         },
         },
-        methods:{
-            _listAuditUsers:function(_page, _rows){
+        methods: {
+            _listAuditUsers: function (_page, _rows) {
 
 
                 vc.component.auditUserManageInfo.conditions.page = _page;
                 vc.component.auditUserManageInfo.conditions.page = _page;
                 vc.component.auditUserManageInfo.conditions.row = _rows;
                 vc.component.auditUserManageInfo.conditions.row = _rows;
                 var param = {
                 var param = {
-                    params:vc.component.auditUserManageInfo.conditions
-               };
+                    params: vc.component.auditUserManageInfo.conditions
+                };
 
 
-               //发送get请求
-               vc.http.get('auditUserManage',
-                            'list',
-                             param,
-                             function(json,res){
-                                var _auditUserManageInfo=JSON.parse(json);
-                                vc.component.auditUserManageInfo.total = _auditUserManageInfo.total;
-                                vc.component.auditUserManageInfo.records = _auditUserManageInfo.records;
-                                vc.component.auditUserManageInfo.auditUsers = _auditUserManageInfo.auditUsers;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.auditUserManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                //发送get请求
+                vc.http.get('auditUserManage',
+                    'list',
+                    param,
+                    function (json, res) {
+                        var _auditUserManageInfo = JSON.parse(json);
+                        vc.component.auditUserManageInfo.total = _auditUserManageInfo.total;
+                        vc.component.auditUserManageInfo.records = _auditUserManageInfo.records;
+                        vc.component.auditUserManageInfo.auditUsers = _auditUserManageInfo.auditUsers;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.auditUserManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
             },
-            _openAddAuditUserModal:function(){
-                vc.emit('addAuditUser','openAddAuditUserModal',{});
+            _openAddAuditUserModal: function () {
+                vc.jumpToPage("/flow/addAuditUserStepFlow")
             },
             },
-            _openEditAuditUserModel:function(_auditUser){
-                vc.emit('editAuditUser','openEditAuditUserModal',_auditUser);
+            _openDeleteAuditUserModel: function (_auditUser) {
+                vc.emit('deleteAuditUser', 'openDeleteAuditUserModal', _auditUser);
             },
             },
-            _openDeleteAuditUserModel:function(_auditUser){
-                vc.emit('deleteAuditUser','openDeleteAuditUserModal',_auditUser);
-            },
-            _queryAuditUserMethod:function(){
+            _queryAuditUserMethod: function () {
                 vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
                 vc.component._listAuditUsers(DEFAULT_PAGE, DEFAULT_ROWS);
 
 
             },
             },
-            _moreCondition:function(){
-                if(vc.component.auditUserManageInfo.moreCondition){
+            _moreCondition: function () {
+                if (vc.component.auditUserManageInfo.moreCondition) {
                     vc.component.auditUserManageInfo.moreCondition = false;
                     vc.component.auditUserManageInfo.moreCondition = false;
-                }else{
+                } else {
                     vc.component.auditUserManageInfo.moreCondition = true;
                     vc.component.auditUserManageInfo.moreCondition = true;
                 }
                 }
             }
             }
 
 
-             
+
         }
         }
     });
     });
 })(window.vc);
 })(window.vc);

+ 14 - 0
WebService/src/main/resources/components/staffPackage/view-staff-info/viewStaffInfo.js

@@ -40,6 +40,20 @@
                 console.log(_info);
                 console.log(_info);
             });
             });
 
 
+            vc.on('viewStaffInfo', '_clear', function(_info){
+                //vc.component.viewStaffInfo.index = _index;
+                vc.component.viewStaffInfo = {
+                    index:0,
+                    flowComponent:'viewStaffInfo',
+                    userId:'',
+                    name:'',
+                    email:'',
+                    tel:'',
+                    sex:'',
+                    orgId:''
+                };
+            });
+
         },
         },
         methods:{
         methods:{
 
 

+ 38 - 0
WebService/src/main/resources/views/addAuditUserStepFlow.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:vc="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>添加审核人员|java110</title>
+    <vc:create name="commonTop"></vc:create>
+    <link href="/css/jquery.step.css" rel="stylesheet"/>
+    <script src="/js/jquery.step.min.js" ></script>
+</head>
+<body>
+<vc:create name="bodyTop"></vc:create>
+<div id="wrapper">
+    <vc:create name="menu"></vc:create>
+
+
+    <div id="page-wrapper" class="gray-bg dashbard-1">
+        <div class="row border-bottom">
+            <vc:create name="nav"></vc:create>
+        </div>
+        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
+            <vc:create name="breadcrumb"></vc:create>
+        </div>
+        <!-- id="component" -->
+        <div class="wrapper wrapper-content animated fadeInRight">
+            <vc:create name="addAuditUserStep"></vc:create>
+        </div>
+
+        <vc:create name="copyright"></vc:create>
+
+    </div>
+</div>
+
+<vc:create name="commonBottom"></vc:create>
+</body>
+</html>

+ 76 - 7
java110-code-generator/src/main/resources/relationship/template_1.json

@@ -1,10 +1,10 @@
 {
 {
-  "templateName":"报修派单",
-  "templateCode":"repairDispatchStep",
-  "templateKey":"ruId",
-  "templateKeyName":"派单ID",
-  "package": "ownerRepairPackage",
-  "successUrl": "/flow/repairDispatch",
+  "templateName":"添加审核人员",
+  "templateCode":"addAuditUserStep",
+  "templateKey":"auditUserId",
+  "templateKeyName":"审核人员Id",
+  "package": "auditUserPackage",
+  "successUrl": "/flow/auditUserFlow",
   "needAffirm": false,
   "needAffirm": false,
   "flows":[
   "flows":[
     {
     {
@@ -36,6 +36,75 @@
       "businessName": "businessStaff",
       "businessName": "businessStaff",
       "businessType": "BUSINESS_TYPE_SAVE_STAFF_INFO",
       "businessType": "BUSINESS_TYPE_SAVE_STAFF_INFO",
       "existsComponent": true
       "existsComponent": true
+    },
+    {
+      "index": 3,
+      "code":"addAuditUserOther",
+      "flowKey": "auditUserId",
+      "cnCode":"扩展信息",
+      "vcName":"addAuditUserOther",
+      "businessName": "addAuditUserOther",
+      "businessType": "BUSINESS_TYPE_SAVE_AUDIT_USER_INFO",
+      "existsComponent": false
+    }
+  ],
+  "components": {
+    "addAuditUserOther": {
+      "templateName": "扩展信息",
+      "templateCode": "addAuditUserOther",
+      "package": "auditUserPackage",
+      "columns": [
+        {
+          "code":"userId",
+          "cnCode":"用户ID",
+          "desc":"必填,请填写用户ID",
+          "required":true,
+          "hasDefaultValue":false,
+          "inputType":"input",
+          "limit":"num",
+          "limitParam":"",
+          "limitErrInfo":"用户ID必须为数字",
+          "show": true
+        },
+        {
+          "code":"userName",
+          "cnCode":"用户名称",
+          "desc":"必填,请填写用户名称",
+          "required":true,
+          "hasDefaultValue":false,
+          "inputType":"input",
+          "limit":"maxin",
+          "limitParam":"2,50",
+          "limitErrInfo":"用户名称必须在2至50字符之间",
+          "show": true
+        },
+        {
+          "code":"auditLink",
+          "cnCode":"审核环节",
+          "desc":"必填,请选择审核环节",
+          "required":true,
+          "hasDefaultValue":false,
+          "inputType":"select",
+          "selectValue":"809001,809002,809003",
+          "selectValueName":"部门主管,财务主管,采购人员",
+          "limit":"num",
+          "limitParam":"",
+          "limitErrInfo":"审核环节格式错误",
+          "show": true
+        },
+        {
+          "code":"objCode",
+          "cnCode":"流程对象",
+          "desc":"必填,请填写流程对象",
+          "required":true,
+          "hasDefaultValue":false,
+          "inputType":"input",
+          "limit":"maxLength",
+          "limitParam":"64",
+          "limitErrInfo":"物品库存不能大于64位",
+          "show": false
+        }
+      ]
     }
     }
-  ]
+  }
 }
 }

+ 41 - 0
java110-code-generator/src/main/resources/relationship/template_repairDispatchStep.json

@@ -0,0 +1,41 @@
+{
+  "templateName":"报修派单",
+  "templateCode":"repairDispatchStep",
+  "templateKey":"ruId",
+  "templateKeyName":"派单ID",
+  "package": "ownerRepairPackage",
+  "successUrl": "/flow/repairDispatch",
+  "needAffirm": false,
+  "flows":[
+    {
+      "index": 0,
+      "code":"branchOrg",
+      "flowKey": "branchOrgId",
+      "cnCode":"选择分公司",
+      "vcName":"viewOrgInfo",
+      "businessName": "businessOrg",
+      "businessType": "BUSINESS_TYPE_SAVE_ORG_INFO",
+      "existsComponent": true
+    },
+    {
+      "index": 1,
+      "code":"departmentOrg",
+      "flowKey": "departmentOrgId",
+      "cnCode":"选择部门",
+      "vcName":"viewOrgInfo",
+      "businessName": "businessOrg",
+      "businessType": "BUSINESS_TYPE_SAVE_ORG_INFO",
+      "existsComponent": true
+    },
+    {
+      "index": 2,
+      "code":"staff",
+      "flowKey": "userId",
+      "cnCode":"选择员工",
+      "vcName":"viewStaffInfo",
+      "businessName": "businessStaff",
+      "businessType": "BUSINESS_TYPE_SAVE_STAFF_INFO",
+      "existsComponent": true
+    }
+  ]
+}

+ 2 - 1
java110-utils/src/main/java/com/java110/utils/constant/PrivilegeCodeConstant.java

@@ -115,6 +115,7 @@ public final class PrivilegeCodeConstant {
 
 
     public static final String ITEMOUT="5020191023000001";
     public static final String ITEMOUT="5020191023000001";
 
 
-    public static final String AGENT_HAS_LIST_AUDITUSER = "";
+    //審核人員 审核人员
+    public static final String AGENT_HAS_LIST_AUDITUSER = "502019102639930001";
 
 
 }
 }