加入userName

wuxw

2020-01-14 69e2baf5518079bfc16cfadc2fb29842fb3de85d

 WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js

@@ -21,6 +21,8 @@
                unitId: '',
                unitName: '',
                roomId: '',
                locationTypeCd: '',
                locationObjId: '',
                roomName: ''
            }
        },
@@ -39,6 +41,10 @@

                if (_param.hasOwnProperty("unitId")) {
                    vc.component.addMachineInfo.unitId = _param.unitId;
                }

                if(_param.hasOwnProperty("roomId")){
                    vc.component.addMachineInfo.roomId = _param.roomId;
                }
            });
        },
@@ -113,17 +119,45 @@
                                param: "64",
                                errInfo: "设备MAC 格式错误"
                            }
                        ],
                    'addMachineInfo.locationTypeCd':
                        [
                            {
                                limit: "required",
                                param: "",
                                errInfo: "请选择设备位置"
                            }
                        ],
                    'addMachineInfo.locationObjId':
                        [
                            {
                                limit: "required",
                                param: "",
                                errInfo: "请选择位置"
                            }
                        ]
                });
            },
            saveMachineInfo: function () {
                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
                if (vc.component.addMachineInfo.locationTypeCd != '2000' && vc.component.addMachineInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                } else if (vc.component.addMachineInfo.locationTypeCd == '2000') {
                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.unitId;
                } else if (vc.component.addMachineInfo.locationTypeCd == '3000') {
                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
                } else {
                    vc.toast("设备位置值错误");
                    return;
                }

                if (!vc.component.addMachineValidate()) {
                    vc.message(vc.validate.errInfo);
                    vc.toast(vc.validate.errInfo);

                    return;
                }

                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;

                //不提交数据将数据 回调给侦听处理
                if (vc.notNull($props.callBackListener)) {
                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addMachineInfo);