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

wuxw

2020-02-19 96af3b4d08bce8b15f7f605ed8bdd061c884ad18

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

 WebService/src/main/resources/components/inspectionPlanPackage/add-inspectionPlan/addInspectionPlan.html

@@ -112,7 +112,7 @@
                                <button class="btn btn-primary float-right" type="button"
                                        v-on:click="saveInspectionPlanInfo()"><i class="fa fa-check"></i>&nbsp;保存
                                </button>
                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="cleanInspectionPlanAddModel()"
                                        data-dismiss="modal">取消
                                </button>
                            </div>

 WebService/src/main/resources/components/inspectionPlanPackage/add-inspectionPlan/addInspectionPlan.js

@@ -227,6 +227,9 @@
                    });
            },
            clearAddInspectionPlanInfo: function () {
                var states =  vc.component.addInspectionPlanInfo.states;
                var inspectionPlanPeriods = vc.component.addInspectionPlanInfo.inspectionPlanPeriods;
                var signTypes = vc.component.addInspectionPlanInfo.signTypes;
                vc.component.addInspectionPlanInfo = {
                    inspectionPlanName: '',
                    inspectionRouteId: '',
@@ -237,8 +240,15 @@
                    signType:'',
                    state:'',
                    remark: '',

                    states:states,
                    signTypes:signTypes,
                    inspectionPlanPeriods:inspectionPlanPeriods
                };
            },
            cleanInspectionPlanAddModel:function(){
                vc.component.clearAddInspectionPlanInfo();
                //员工select2
                vc.emit('addInspectionPlan', 'inspectionRouteSelect2', 'clearInspectionRoute', {});
            }
        }
    });

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

@@ -14,21 +14,21 @@
                                           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="editInspectionPlanInfo.inspectionRouteId" type="text"-->
<!--                                           placeholder="必填，请填写巡检路线" class="form-control">-->
                                    <div class="col-sm-10">
                                        <vc:create name="inspectionRouteSelect2"
                                                   parentModal="editInspectionPlanModel"
                                                   callBackListener="editInspectionPlanInfo"
                                                   callBackFunction="notify"
                                                   namespace="editInspectionPlan"
                                        ></vc:create>
                                    </div>
                                </div>
                            </div>
<!--                            <div class="form-group row">-->
<!--                                <label class="col-sm-2 col-form-label">巡检路线</label>-->
<!--                                <div class="col-sm-10">-->
<!--&lt;!&ndash;                                    <input v-model="editInspectionPlanInfo.inspectionRouteId" type="text"&ndash;&gt;-->
<!--&lt;!&ndash;                                           placeholder="必填，请填写巡检路线" class="form-control">&ndash;&gt;-->
<!--                                    <div class="col-sm-10">-->
<!--                                        <vc:create name="inspectionRouteSelect2"-->
<!--                                                   parentModal="editInspectionPlanModel"-->
<!--                                                   callBackListener="editInspectionPlanInfo"-->
<!--                                                   callBackFunction="notify"-->
<!--                                                   namespace="editInspectionPlan"-->
<!--                                        ></vc:create>-->
<!--                                    </div>-->
<!--                                </div>-->
<!--                            </div>-->
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">执行周期</label>
                                <div class="col-sm-10">

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

@@ -63,11 +63,11 @@
                    staffName: vc.component.editInspectionPlanInfo.staffName,
                });

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




 WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-select2/inspectionRouteSelect2.js

@@ -27,10 +27,12 @@
        _initEvent: function () {
            vc.on('inspectionRouteSelect2', 'setInspectionRoute', function (_param) {
                vc.copyObject(_param, this.inspectionRouteSelect2Info);
                $("#inspectionRouteSelector").val(null).trigger('change');
                var name = _param.routeName.split(",");
                var ids = _param.inspectionRouteId.split(",");
                for( var i = 0; i < name.length; i++){
                    var option = new Option(name[i],ids[i], true, true);
                    console.log(option);
                    this.inspectionRouteSelect2Info.inspectionRouteSelector.append(option);
                }
                //var option = new Option(_param.routeName, _param.inspectionRouteId, true, true);
@@ -105,8 +107,13 @@
                $('#inspectionRouteSelector').on("select2:unselect", function (evt) {
                    //这里是取消选中触发的事件
                    //如配置allowClear: true后，触发
                    this.inspectionRouteSelect2Info.inspectionRouteId = '-1';
                    this.inspectionRouteSelect2Info.routeName = '';
                    var inspectionRouteIds= $('#inspectionRouteSelector').select2('val');
                    var routeIds = '';
                    for( var i = 0; i < inspectionRouteIds.length; i++){
                        routeIds +=","+inspectionRouteIds[i];
                    }
                    this.inspectionRouteSelect2Info.inspectionRouteId = routeIds.substr(1);
                    //this.inspectionRouteSelect2Info.routeName = '';

                });
            },