sasp-admin 0.2.63 → 0.2.64

package/src/views/org/sysOrgPosUserDetail.vue

@@ -555,43 +555,10 @@
 </template>
 
 <script>
-
+    import sysOrgUserDetailMixins from './js/sysOrgUserDetailMixins'
     export default {
         name: "sys-org-pos-user-detail",
-        props: {
-            orgId: {type: String, default: ''},
-            orgDim: {type: String, default: ''},
-            orgObjReal: {
-                type: Object, default: function () {
-                    return {}
-                }
-            },
-            orgTypeObj: {
-                type: Object, default: function () {
-                    return {}
-                }
-            },
-            areaOptions: {
-                type:Array,
-                default:() => {return [];}
-            },
-            pageSetting: {
-                type: Object, default: function () {
-                    return {}
-                }
-            },
-            areaSetting:{
-                type:Boolean,default:true
-            },
-            useRefresh:{
-                type:Boolean,default:false
-            },
-            refreshOrgId:{
-                type:Boolean,default:false
-            },
-            updateCallBack: {type: Function, default: null},
-            sysDataObj:{type:Object,default:() => {return {};}}
-        },
+        mixins: [sysOrgUserDetailMixins],
         data() {
             let vm = this;
             let validUserRepeat = (rule, value, callback) => { // 重名验证
@@ -641,40 +608,6 @@
                     initNoSearch: true,
                     //afterRemoveSuccess:this.posRemoveSuc,
                 }),
-                cascadeOptions: [], // 地区选项
-                cascadeOptionsClone:[],
-                activeTabs: '1',
-                activeName: ['0'], // 默认不激活组织信息吧，如果想默认展开就设为1
-                activePosName: ['1'], // 默认激活岗位信息
-                dimObj: {}, // id与纬度名称对应关系
-                chooseUserDialog: false,
-                formOrgName: "", // 当前组织的名称
-                orgClassifyArr: [{value: '0', label: '普通部门'}, {value: '1', label: '处室'}, {value: '2', label: '安监局'}],
-                classify: "", // 部门分类
-                userTypeMap: {
-                    'ent': '企业用户', 'gov': '政府用户',
-                    'sup': '开发用户', 'dev': '开发用户',
-                },
-                userStatusMap: {
-                    10: "正常", 20: "锁定", 30: "暂时锁定"
-                },
-                entDim: "",
-                sysEntDim: "",
-                orderDialog: false, // 排序对话框
-                posUserArr: [], // 岗位用户排序数组
-                userTypeOptions: [], // 用户类型下拉框
-                typeOptions: [], // 所有用户类型
-                addUserDialog: false, // 添加用户对话框
-                addUserForm: {},
-                statusOptions: [
-                    {value: '10', label: "正常"},
-                    {value: '20', label: "锁定"}
-                ], // 用户状态下拉框
-                updateOrder: true, // 是调整用户顺序还是选择用户时添加数据
-                posTreeParam: {
-                    "order": "PARENT_POS_ID,SORT",
-                    "orgId": "$"
-                },
                 rules: {
                     userAccount: [
                         {
@@ -708,78 +641,12 @@
                     userType: this.plValidate('required'),
                     userQQ: this.plValidate('qq'),
                     userEmail: this.plValidate('email'),
-                },
-                posTreeProper: {'label': 'name','children':'children'},
-                posBaseForm: {}, // 岗位基本信息
-                posId: "", // 当前选择的岗位id
-                setPos: false, // 当前从用户列表选择的是岗位还是组织
-                menuVisible: false, // 右击菜单出现的办法
-                addPosDialog: false, // 添加岗位的对话框
-                addPosForm: {}, // 添加岗位的表单数据
-                orgLocation: null, // 组织所在地区
-                loading:false,
-                top:0,
-                left:0,
-                parentPosTree:[], // 上级岗位树
-                manyOrg:false, // 一人多岗
-                multipleSelection:[],
-                multipleSelectionIds:[],
-                createPushRoleArr:[], // 推送角色
-                orgObj:{}
+                }
             }
         },
         created() {
             let vm = this;
-            this.orgObj = this.orgObjReal || {};
-            document.onkeyup = function (e) { // 右键菜单快捷键
-                if(vm.menuVisible){
-                    let key = e.key.toLowerCase();
-                    switch (key) {
-                        case "a":
-                            vm.menuVisible = false;
-                            vm.handleRightSelect('addChild');
-                            break;
-                        case "c":
-                            vm.menuVisible = false;
-                            vm.handleRightSelect('addSame');
-                            break;
-                        case "r":
-                            vm.menuVisible = false;
-                            vm.handleRightSelect('removeCurrent');
-                            break;
-                        case "d":
-                            vm.menuVisible = false;
-                            vm.handleRightSelect('removeCheck');
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            };
-            vm.axios.post(vm.api.sysOrgDimension.find).then(function (res) {
-                res.data.forEach(function (dimension) {
-                    vm.dimObj[dimension["id"]] = dimension["dimName"];
-                })
-            });
-            vm.axios.post(vm.api.param.getSysParams, {"key": "entDim"}).then(function (res) {
-                vm.entDim = res.data["entDim"];
-                vm.axios.post(vm.api.param.getSysParams, {"key": "sysEntDim.id"}).then(function (paramRes) {
-                    vm.sysEntDim = paramRes.data["sysEntDim.id"];
-                });
-            });
-            vm.axios.post(vm.api.param.getSysParams, {"key": "manyOrg"}).then(function (res) {
-                let resData = res.data || {};
-                vm.manyOrg = resData["manyOrg"] == "是";
-            });
-            vm.axios.post(vm.api.param.getSysParams,{key:"SysUserType"}).then(function (res) { // 是否可以修改用户详情，获取用户的类型
-                let result = res.data;
-                if(typeof(result) != Object && typeof(result) != "object"){
-                    result = JSON.parse(result.replace(/'/g, '"'));
-                }
-                for (let [key, value] of Object.entries(result)) {
-                    vm.typeOptions.push({"label": value, "value": key})
-                }
-            });
+            vm.commonInit();
             vm.init();
             // vm.initCreatePushRole();
         },
@@ -818,42 +685,6 @@
             }
         },
         methods: {
-            initCreatePushRole(){
-                let loginUser = this.USER_GLOBAL.getLoginUser() || {};
-                this.axios.post(this.api.role.find,{"created":loginUser.id,"pushRole":"1"}).then(res => {
-                    this.createPushRoleArr = res.data || [];
-                })
-            },
-            buildParentTree(){
-                let vm = this;
-                vm.parentPosTree = [];
-                if(vm.orgObj.orgParentTree){
-                    vm.axios.post(vm.api.sysPos.find,{"parentPosIds":vm.orgObj.orgParentTree}).then(res => {
-                        let arr = [];
-                        (res.data || []).forEach(item => {
-                            arr.push({
-                                "id":item.id,
-                                "label":item.posName,
-                                "parentId":item.parentPosId
-                            })
-                        });
-                        vm.parentPosTree = vm.COMMON_FUNC.buildElTree(arr);
-                        //递归去除
-                        function clearTreeChildren(parentPosTreeArr) {
-                            (parentPosTreeArr || []).forEach(item =>{
-                                if(item.children){
-                                    if(item.children.length == 0){
-                                        delete item['children'];
-                                    }else {
-                                        clearTreeChildren(item.children);
-                                    }
-                                }
-                            })
-                        }
-                        clearTreeChildren(vm.parentPosTree);
-                    })
-                }
-            },
             init() {
                 let vm = this;
                 vm.orgId && (vm.posTreeParam["orgId"] = vm.orgId) && (vm.posCrud.searchForm["orgId"] = vm.orgId);
@@ -1146,455 +977,9 @@
                     vm.$emit("saveRollBack",obj);
                 })
             },
-            formatterColumn(row, column, cellValue) { // 格式化列
-                let vm = this;
-                if (column.property == 'userType') {
-                    return vm.userTypeMap[cellValue];
-                } else if (column.property == 'userStatus') {
-                    return vm.userStatusMap[cellValue];
-                } else {
-                    return cellValue;
-                }
-            },
-            /**
-             * 岗位信息
-             */
-            posTreeCallBack(posTreeVm) { // 岗位初始化全部展开
-                let nodesMap = posTreeVm.getAllNode();
-                let chooseFirstData = {};
-                let chooseFirstNode = {};
-                if((posTreeVm.data || []).length > 0){
-                    chooseFirstData = posTreeVm.data[0];
-                }
-                for (let [key, node] of Object.entries(nodesMap)) {
-                    node.expanded = true;
-                    if(chooseFirstData.id && node.data.id == chooseFirstData.id){
-                        chooseFirstNode = node;
-                        node.isCurrent = true;
-                    }
-                }
-                if(chooseFirstData.id){
-                    this.posNodeClick(chooseFirstData,chooseFirstNode);
-                }
-            },
-            posDealTree(data) {
-                let vm = this;
-                data.forEach(function (pos) {
-                    pos["name"] = pos["posName"];
-                    if (pos["isMainpos"] === '1') {
-                        pos["name"] = pos["posName"] + "[主岗位]";
-                        pos["className"] = vm.pageSetting["posMainIcon"] || "saspiconfont pl-icon-yonghu";
-                    } else {
-                        pos["className"] = vm.pageSetting["posIcon"] || "saspiconfont pl-icon-account";
-                    }
-                });
-            },
-            posNodeClick(data, node) { // 岗位树节点点击事件
-                let vm = this;
-                vm.posId = data.id;
-                vm.posBaseForm = Object.assign({}, data);
-                if(!vm.posBaseForm || vm.posBaseForm.parentPosId == '-1'){
-                    vm.posBaseForm.parentPosId = null;
-                }
-                vm.menuVisible = false;
-            },
-            posTreeRightClick(event, data, node) {
-                let vm = this;
-                let expand = node.expanded;
-                let target = window.event.target;
-                if (target.tagName === 'DIV') {
-                    target.click(); // 右键时点击当前节点
-                } else {
-                    let pNode = target.parentNode;
-                    if (target.className === 'el-checkbox__inner') { // 右击checkBox
-                        pNode.parentNode.parentNode.click();
-                    } else { // 右击下拉图标
-                        pNode.click();
-                    }
-                }
-                node.expanded = expand; // 右击仅选中当前节点保持当前节点展开情况不变
-                if (vm.objectID !== data.id) {
-                    vm.objectID = data.id;
-                    vm.menuVisible = true;
-                } else {
-                    vm.menuVisible = !vm.menuVisible;
-                }
-
-                vm.left = window.event.clientX + "px";
-                vm.top = window.event.clientY + "px";
-            },
-            savePos() { // 保存岗位数据addPosForm
-                let vm = this;
-                vm.$refs.addPosRef.validate(function (valid) {
-                    if (valid) {
-                        if (vm.addPosForm.isMainpos == "1") { // 设置为主岗位时检索当前组织下是否有主岗位
-                            vm.axios.post(vm.api.sysPos.find, {
-                                "orgId": vm.orgId,
-                                "isMainpos": "1"
-                            }).then(function (res) {
-                                let result = res.data;
-                                if ((result || []).length > 0 && result[0].id !== vm.addPosForm.id) {
-                                    let msg = "目前此组织内已存在主岗位[" + result[0].posName + "],是否确定设置此岗位为主岗位(系统会自动把[" + result[0].posName + "]设置为普通岗位)？";
-                                    vm.$confirm(msg, '警告', {
-                                        confirmButtonText: '确定',
-                                        cancelButtonText: '取消',
-                                    }).then(async function () {
-                                        vm.addPosDialog = false;
-                                        await vm.axios.post(vm.api.sysPos.update, {
-                                            "id": result[0].id,
-                                            "isMainpos": "0"
-                                        });
-                                        vm.addPosData();
-                                    }).catch(() => {
-                                        vm.$message({
-                                            duration: 1000,
-                                            type: 'info',
-                                            message: '已取消'
-                                        });
-                                    });
-                                } else {
-                                    vm.addPosDialog = false;
-                                    vm.addPosData();
-                                }
-                            })
-                        } else {
-                            vm.addPosDialog = false;
-                            vm.addPosData();
-                        }
-                    }
-                })
-            },
-            addPosData() { // 添加岗位数据
-                let vm = this;
-                if(!vm.addPosForm.parentPosId){
-                    vm.addPosForm.parentPosId = '-1';
-                }
-                vm.axios.post(vm.api.sysPos.add, vm.addPosForm).then(function (res) {
-                    vm.$message({
-                        duration: 1200,
-                        message: res.data.operateMessage,
-                        type: "success"
-                    });
-                    vm.$refs.posTreeRef.init();
-                })
-            },
-            handleRightSelect(key) {
-                let vm = this;
-                switch (key) {
-                    case "addChild":
-                    case "addSame":
-                        vm.addNode(key);
-                        break;
-                    case "removeCurrent":
-                        vm.removeCurrentNode();
-                        break;
-                    case "removeCheck":
-                        vm.removeNode();
-                        break;
-                    default:
-                        console.log("未检测到当前操作的对应方法！");
-                        break;
-                }
-            },
-            addNode(key) { // addPosForm
-                let vm = this;
-                if (!vm.orgId || vm.orgId == "$") {
-                    vm.$message("请选择左侧组织后继续操作！");
-                    return;
-                }
-                vm.addPosForm = {"isMainpos": "0"};
-                key = key ? key : "addChild";
-                let data = vm.$refs.posTreeRef.getTreeCurrentNode();
-                vm.addPosForm["orgId"] = vm.orgId;
-                vm.addPosForm["orgName"] = vm.orgObj["orgName"];
-                if (key == "addChild") {
-                    if (!data) { // 直接添加未选择任何节点,默认第一级
-                        vm.addPosForm["parentPosId"] = null;
-                        vm.addPosForm["parentPosTree"] = "-1";
-                        vm.addPosForm["layer"] = "1";
-                    } else {
-                        vm.addPosForm["parentPosId"] = data.id;
-                        vm.addPosForm["parentPosTree"] = data["parentPosTree"] + "," + data["id"];
-                        vm.addPosForm["parentPosName"] = data.posName;
-                        vm.addPosForm["layer"] = Number(data["layer"]) + 1;
-                    }
-                    vm.addPosForm["sort"] = vm.getMaxOrder("child");
-                } else { // 添加同级数据
-                    vm.addPosForm["parentPosId"] = data["parentPosId"];
-                    if(vm.addPosForm["parentPosId"] == "-1"){
-                        vm.addPosForm["parentPosId"] = null;
-                    }
-                    vm.addPosForm["parentPosTree"] = data["parentPosTree"];
-                    vm.addPosForm["parentPosName"] = data.parentPosName;
-                    vm.addPosForm["layer"] = data["layer"];
-                    vm.addPosForm["sort"] = vm.getMaxOrder("same");
-                }
-                vm.addPosDialog = true;
-                vm.$nextTick(function () {
-                    vm.$refs.addPosRef.clearValidate();
-                })
-            },
-            getMaxOrder(type) {
-                let vm = this;
-                let currentNode = vm.$refs.posTreeRef.getTreeCurrentNode();
-                let sort = 1;
-                let arr = [];
-                if (type == "same") {
-                    let nodesMap = vm.$refs.posTreeRef.getAllNode();
-                    if (!currentNode.parentPosId || currentNode.parentPosId == "-1") {
-                        for (let [key, node] of Object.entries(nodesMap)) {
-                            if (node.level == 1) {
-                                arr.push(node.data);
-                            }
-                        }
-                    } else {
-                        // 是下级
-                        if(nodesMap[currentNode.parentPosId]){
-                            arr = nodesMap[currentNode.parentPosId].data.children;
-                        }else{ // 第一级
-                            Object.keys(nodesMap).forEach(key => {
-                                if(nodesMap[key].level == 1){
-                                    arr.push(nodesMap[key].data);
-                                }
-                            })
-                        }
-                    }
-                }
-                if (type == "child") {
-                    arr = (currentNode || {}).children;
-                }
-                (arr || []).forEach(function (each) {
-                    sort = sort > Number(each["sort"]) ? sort : Number(each["sort"]);
-                });
-                return ++sort;
-            },
-            removeCurrentNode() { // 删除当前节点
-                let vm = this;
-                vm.$confirm('确定删除当前节点?', '警告', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                }).then(function () {
-                    let currentNode = vm.$refs.posTreeRef.getTreeCurrentNode();
-                    let removeNodeArr = vm.$refs.posTreeRef.getCurrentChildren(currentNode, []);
-                    vm.axios.post(vm.api.sysPos.delete, {"ids": removeNodeArr.join(",")}).then(function (res) {
-                        if (res.data.operateSuccess) {
-                            vm.$refs.posTreeRef.defaultTreeRemove(removeNodeArr.join(","));
-                            //同步修改下级岗位中
-                            vm.axios.post(vm.api.sysPos.updateParentPos, {"parentPosIds": removeNodeArr.join(",")});
-
-                        }
-                        vm.$message({
-                                duration: 1000,
-                                type: 'success',
-                                message: res.data.operateMessage
-                            }
-                        );
-                    });
-                }).catch(function () {
-                    vm.$message({
-                        duration: 1000,
-                        type: 'info',
-                        message: '已取消'
-                    });
-                });
-            },
-            removeNode() { // 刪除勾選節點
-                let vm = this;
-                let removeArr = vm.$refs.posTreeRef.getTreeCheckedNodes("key");
-                if (removeArr.length == 0) {
-                    vm.$message("请勾选需要删除的节点！");
-                    return;
-                }
-                vm.$confirm('确定删除已勾选节点?', '警告', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                }).then(function () {
-                    vm.loading = true;
-                    vm.axios.post(vm.api.sysPos.delete, {"ids": removeArr.join(",")}).then(function (res) {
-                        if (res.data.operateSuccess) {
-                            vm.$refs.posTreeRef.defaultTreeRemove(removeArr.join(","));
-                        }
-                        vm.loading = false;
-                        vm.$message({
-                                duration: 1000,
-                                type: 'success',
-                                message: res.data.operateMessage
-                            }
-                        );
-                        vm.init();
-                    })
-                }).catch(function () {
-                    vm.$message({
-                        duration: 1000,
-                        type: 'info',
-                        message: '已取消'
-                    });
-                });
-            },
-            updatePosInfo() { // 更新岗位信息
-                let vm = this;
-                if (!vm.posId) {
-                    vm.$message("请选择左侧岗位后再操作！");
-                    return;
-                }
-                vm.$refs.posBaseRef.validate(function (valid) {
-                    if (valid) {
-                        if (vm.posBaseForm.isMainpos == "1") { // 设置为主岗位时检索当前组织下是否有主岗位
-                            vm.axios.post(vm.api.sysPos.find, {
-                                "orgId": vm.orgId,
-                                "isMainpos": "1"
-                            }).then(function (res) {
-                                let result = res.data;
-                                if ((result || []).length > 0 && result[0].id != vm.posBaseForm.id) {
-                                    let msg = "目前此组织内已存在主岗位[" + result[0].posName + "],是否确定设置此岗位为主岗位(系统会自动把[" + result[0].posName + "]设置为普通岗位)？";
-                                    vm.$confirm(msg, '警告', {
-                                        confirmButtonText: '确定',
-                                        cancelButtonText: '取消',
-                                    }).then(function () {
-                                        vm.submitPosForm();
-                                        vm.axios.post(vm.api.sysPos.update, {
-                                            "id": result[0].id,
-                                            "isMainpos": "0"
-                                        });
-                                        let nodesMap = vm.$refs.posTreeRef.getAllNode();
-                                        let oldMainPosData = nodesMap[result[0].id].data;
-                                        oldMainPosData.isMainpos = "0"; // 修改树中的数据
-                                        oldMainPosData["name"] = oldMainPosData["posName"]; // 修改树中的数据
-                                        oldMainPosData["className"] = vm.pageSetting["posIcon"] || "saspiconfont pl-icon-account";
-                                    }).catch(() => {
-                                        vm.$message({
-                                            duration: 1000,
-                                            type: 'info',
-                                            message: '已取消'
-                                        });
-                                    });
-                                } else {
-                                    vm.submitPosForm();
-                                }
-                            })
-                        } else {
-                            vm.submitPosForm();
-                        }
-                    }
-                });
-            },
-            posRemoveSuc(){
-                this.posBaseForm = {};
-            },
-            submitPosForm() { // 提交岗位表单数据
-                let vm = this;
-                let obj = {};
-                obj["id"] = vm.posBaseForm["id"];
-                obj["posName"] = vm.posBaseForm["posName"];
-                obj["isMainpos"] = vm.posBaseForm["isMainpos"];
-                obj["parentPosId"] = vm.posBaseForm["parentPosId"] || "-1";
-                vm.axios.post(vm.api.sysPos.update, obj).then(function (res) {
-                    vm.$message({
-                        duration: 1200,
-                        message: res.data.operateMessage,
-                        type: "success"
-                    });
-                    if (obj["isMainpos"] == "1") {
-                        obj["name"] = obj["posName"] + "[主岗位]";
-                    } else {
-                        obj["name"] = obj["posName"];
-                    }
-                    let currentNode = vm.$refs.posTreeRef.getTreeCurrentNode();
-                    for (let [key, value] of Object.entries(obj)) { // 更新树中的数据
-                        currentNode[key] = value;
-                    }
-                    if (obj["isMainpos"] == "1") {
-                        currentNode["className"] = vm.pageSetting["posMainIcon"] || "saspiconfont pl-icon-yonghu";
-                    }else{
-                        currentNode["className"] = vm.pageSetting["posIcon"] || "saspiconfont pl-icon-account";
-                    }
-                })
-            },
-            addMainPosChange(value){
-                let vm = this;
-                if(value == '1' && vm.addPosForm.layer != '1'){
-                    vm.$message("非一级岗位不能设置为主岗位！");
-                    vm.addPosForm.isMainpos = "0";
-                }
-            },
-            mainPosChange(value) { // 主岗位变化时判断是否可以进行变更
-                let vm = this;
-                let currentNode = vm.$refs.posTreeRef.getTreeCurrentNode();
-                if (!currentNode) { // 未选择树，不操作
-                    return;
-                }
-                if (value == "1" && currentNode.layer != '1') {
-                    vm.$message("非一级岗位不能设置为主岗位！");
-                    vm.posBaseForm.isMainpos = "0";
-                }
-            },
-            activePosRow(row) {
-                this.activeRow(row, this.posCrud.tableRef);
-            },
-            activeUserRow(row) {
-                this.activeRow(row, this.userCrud.tableRef);
-                this.tableSelect([],row);
-            },
             activeOrgRow(row) {
                 this.activeRow(row, this.crud.tableRef);
             },
-            activeRow(row, ref) { // 行点击选中当前行
-                this.$refs[ref].toggleRowSelection(row);
-            },
-            //复选框选中/取消事件
-            tableSelect(selection, row) {
-                if (this.multipleSelection.length > 0) {
-                    let index = this.multipleSelectionIds.indexOf(row.id);
-                    if (this.multipleSelectionIds.indexOf(row.id) == -1) {
-                        this.multipleSelection.push(row);
-                        this.multipleSelectionIds.push(row.id);
-                    } else {
-                        this.multipleSelectionIds.splice(index, 1);
-                        this.multipleSelection.splice(index, 1);
-                    }
-                } else {
-                    this.multipleSelection.push(row);
-                    this.multipleSelectionIds.push(row.id);
-                }
-            },
-            userSelectAll(selection) {
-                var vm = this;
-                var rows = vm.userCrud.dataStore.records;
-                if (selection.length > 0) {
-                    //全选
-                    selection.forEach(item => {
-                        this.userSelectAllPush(item);
-                    });
-                } else {
-                    //取消全选
-                    rows.forEach(item => {
-                        this.userSelectAllCancel(item);
-                    })
-                }
-            },
-            userSelectAllPush(row) {
-                if (this.multipleSelectionIds.indexOf(row.id) == -1) {
-                    this.multipleSelection.push(row);
-                    this.multipleSelectionIds.push(row.id);
-                }
-            },
-            userSelectAllCancel(row) {
-                let index = this.multipleSelectionIds.indexOf(row.id);
-                if (this.multipleSelectionIds.indexOf(row.id) != -1) {
-                    this.multipleSelectionIds.splice(index, 1);
-                    this.multipleSelection.splice(index, 1);
-                }
-            },
-            userSearch() {
-                let vm = this;
-                vm.$nextTick(() => {
-                    vm.userCrud.dataStore.records.forEach(item => {
-                        if (vm.multipleSelectionIds.indexOf(item.id) > -1) {
-                            vm.$refs[vm.userCrud.tableRef].toggleRowSelection(item);
-                        }
-                    })
-                });
-            }
         }
     }
 </script>

package/src/views/org/sysOrgTree.vue

@@ -500,10 +500,8 @@
                         if (currentData[elem]) {
                             regionArr.push(currentData[elem]);
                         } else {
-                            if (!currentData["province"]) {
-                                if(vm.cascadeOptions[0]){
-                                    regionArr.push(vm.cascadeOptions[0].id);
-                                }
+                            if (!currentData["province"]&&vm.cascadeOptions[0]) {
+                              regionArr.push(vm.cascadeOptions[0].id);
                             }
                             break;
                         }