Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2020-02-19 b1b52d61acedccd6fdd58b32dcd04ebf14a96f38

 WebService/src/main/resources/components/inspectionPlanPackage/edit-inspectionPlan/editInspectionPlan.js

@@ -23,7 +23,8 @@
                departmentId:'',
                departmentName:'',
                createUserId:'',
                createUserName:''
                createUserName:'',
                inspectionRouteName:''
            }
        },
        _initMethod: function () {
@@ -42,7 +43,6 @@
            vc.component._initEditInspectionPlanDateInfo();
            vc.on('editInspectionPlan', 'openEditInspectionPlanModal', function (_params) {
                vc.component.refreshEditInspectionPlanInfo();
                $('#editInspectionPlanModel').modal('show');
                vc.copyObject(_params, vc.component.editInspectionPlanInfo);
                vc.component.editInspectionPlanInfo.communityId = vc.getCurrentCommunity().communityId;
                //公司select2
@@ -53,8 +53,8 @@

                //部门select2
                vc.emit('editInspectionPlan', 'departmentSelect2', 'setDepartment', {
                    orgId: vc.component.editInspectionPlanInfo.departmentId,
                    orgName: vc.component.editInspectionPlanInfo.departmentName,
                    departmentId: vc.component.editInspectionPlanInfo.departmentId,
                    departmentName: vc.component.editInspectionPlanInfo.departmentName,
                });

                //员工select2
@@ -62,6 +62,17 @@
                    staffId: vc.component.editInspectionPlanInfo.staffId,
                    staffName: vc.component.editInspectionPlanInfo.staffName,
                });

                //传输数据到machineSelect2组件
                vc.emit('editInspectionPlan', 'inspectionRouteSelect2', 'setInspectionRoute', {
                    inspectionRouteId: vc.component.editInspectionPlanInfo.inspectionRouteId,
                    routeName: vc.component.editInspectionPlanInfo.inspectionRouteName,
                });




                $('#editInspectionPlanModel').modal('show');



@@ -234,7 +245,8 @@
                    departmentId:'',
                    departmentName:'',
                    createUserId:'',
                    createUserName:''
                    createUserName:'',
                    inspectionRouteName:''
                };
                vc.component.editInspectionPlanInfo.signTypes = signTypes;
                vc.component.editInspectionPlanInfo.states = states;