| @@ -127,6 +127,8 @@ | |||||
| <el-select | <el-select | ||||
| v-model="area" | v-model="area" | ||||
| v-if="info.selectHouseType == 2" | v-if="info.selectHouseType == 2" | ||||
| clearable | |||||
| filterable | |||||
| placeholder="请选择" | placeholder="请选择" | ||||
| class="div-inp" | class="div-inp" | ||||
| > | > | ||||
| @@ -77,22 +77,22 @@ RouterPlugin.install = function(router, store) { | |||||
| meta: propsConfig.meta || 'meta' | meta: propsConfig.meta || 'meta' | ||||
| } | } | ||||
| // console.log(propsConfig,propsDefault,'参数一'); | // console.log(propsConfig,propsDefault,'参数一'); | ||||
| console.log(this.routerList,'123'); | |||||
| // console.log(this.routerList,'123'); | |||||
| // 当路由地址为空时返回 | // 当路由地址为空时返回 | ||||
| if (aMenu.length === 0) return | if (aMenu.length === 0) return | ||||
| // 循环地址数组 | // 循环地址数组 | ||||
| for (let i = 0; i < aMenu.length; i++) { | for (let i = 0; i < aMenu.length; i++) { | ||||
| const oMenu = aMenu[i] | const oMenu = aMenu[i] | ||||
| console.log(oMenu[propsDefault.path],'这里是地址'); | |||||
| // console.log(oMenu[propsDefault.path],'这里是地址'); | |||||
| // 在这里时还可以进行下一步,但是this.routerList[]值不知何处取得 | // 在这里时还可以进行下一步,但是this.routerList[]值不知何处取得 | ||||
| console.log(this.routerList.includes(oMenu[propsDefault.path])); | |||||
| // console.log(this.routerList.includes(oMenu[propsDefault.path])); | |||||
| // 判断路由地址的是否包括routerList[building] 如果没有则返回 为去重操作? | // 判断路由地址的是否包括routerList[building] 如果没有则返回 为去重操作? | ||||
| // if (this.routerList.includes(oMenu[propsDefault.path])) return | |||||
| if (this.routerList.includes(oMenu[propsDefault.path])) return | |||||
| // console.log(3); | // console.log(3); | ||||
| // 定义地址 | // 定义地址 | ||||
| const path = (() => { | const path = (() => { | ||||
| // 此为获得的路由地址 | // 此为获得的路由地址 | ||||
| console.log(oMenu[propsDefault.path]); | |||||
| // console.log(oMenu[propsDefault.path]); | |||||
| if (!oMenu[propsDefault.path]) { | if (!oMenu[propsDefault.path]) { | ||||
| // 如果没有返回 | // 如果没有返回 | ||||
| return | return | ||||
| @@ -162,7 +162,6 @@ RouterPlugin.install = function(router, store) { | |||||
| return this.formatRoutes(children, false) | return this.formatRoutes(children, false) | ||||
| })() | })() | ||||
| } | } | ||||
| console.log(2); | |||||
| // 将路由地址放入aRouter | // 将路由地址放入aRouter | ||||
| aRouter.push(oRouter) | aRouter.push(oRouter) | ||||
| } | } | ||||
| @@ -178,9 +177,11 @@ RouterPlugin.install = function(router, store) { | |||||
| // 如果不是则返回 | // 如果不是则返回 | ||||
| return aRouter | return aRouter | ||||
| } | } | ||||
| console.log(aRouter,'内容'); | |||||
| // 在这里将数据重新赋值为空 就可以了 关键不知道为啥,案例来说可以? | |||||
| this.routerList=[] | |||||
| // console.log(aRouter,'内容'); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| console.log(RouterPlugin,'配置'); | |||||
| // console.log(RouterPlugin,'配置'); | |||||
| export default RouterPlugin | export default RouterPlugin | ||||
| @@ -20,7 +20,7 @@ | |||||
| </div> | </div> | ||||
| <div class="label">服务状态:</div> | <div class="label">服务状态:</div> | ||||
| <div> | <div> | ||||
| <el-select v-model="serviceStatus" placeholder="请选择" class="div-inp"> | |||||
| <el-select v-model="serviceStatus" clearable filterable placeholder="请选择" class="div-inp"> | |||||
| <el-option | <el-option | ||||
| v-for="item in options" | v-for="item in options" | ||||
| :key="item.value" | :key="item.value" | ||||
| @@ -761,10 +761,10 @@ export default { | |||||
| } | } | ||||
| }) | }) | ||||
| }).catch(() => { | }).catch(() => { | ||||
| this.$message({ | |||||
| type: 'info', | |||||
| message: '已取消删除' | |||||
| }); | |||||
| // this.$message({ | |||||
| // type: 'info', | |||||
| // message: '已取消删除' | |||||
| // }); | |||||
| }); | }); | ||||
| }, | }, | ||||
| @@ -282,7 +282,7 @@ | |||||
| </el-select> | </el-select> | ||||
| </el-form-item> --> | </el-form-item> --> | ||||
| <el-form-item label="角色描述:" prop="roleDesc"> | <el-form-item label="角色描述:" prop="roleDesc"> | ||||
| <el-input v-model="form.roleDesc" type="textarea"></el-input> | |||||
| <el-input v-model="form.roleDesc" type="textarea" maxlength="50" show-word-limit ></el-input> | |||||
| </el-form-item> | </el-form-item> | ||||
| </el-form> | </el-form> | ||||
| <div slot="footer" class="dialog-footer"> | <div slot="footer" class="dialog-footer"> | ||||
| @@ -708,7 +708,7 @@ | |||||
| <div style="line-height: 15px; margin-right: 10px">绑定方式</div> | <div style="line-height: 15px; margin-right: 10px">绑定方式</div> | ||||
| <el-radio-group v-model="bindFlag" @change="radioChange"> | <el-radio-group v-model="bindFlag" @change="radioChange"> | ||||
| <el-radio label="0">指定楼盘绑定</el-radio> | <el-radio label="0">指定楼盘绑定</el-radio> | ||||
| <el-radio label="1">按区域绑定</el-radio> | |||||
| <el-radio v-if="code.userRoleType!=6" label="1">按区域绑定</el-radio> | |||||
| </el-radio-group> | </el-radio-group> | ||||
| </div> | </div> | ||||
| <div v-if="bindFlag == 0" class="con"> | <div v-if="bindFlag == 0" class="con"> | ||||
| @@ -1734,10 +1734,12 @@ export default { | |||||
| console.log("这里是单个楼盘勾选"); | console.log("这里是单个楼盘勾选"); | ||||
| this.bindFlag = "0"; | this.bindFlag = "0"; | ||||
| } | } | ||||
| if (row.selectHouseType == 2) { | |||||
| else if (row.selectHouseType == 2) { | |||||
| this.bindFlag = "1"; | this.bindFlag = "1"; | ||||
| console.log("这里是区域选择"); | console.log("这里是区域选择"); | ||||
| this.userAreaFind(row.accountId, row.username); | this.userAreaFind(row.accountId, row.username); | ||||
| }else{ | |||||
| this.bindFlag = "0"; | |||||
| } | } | ||||
| this.gethouseList(); | this.gethouseList(); | ||||
| // 获取区域列表 | // 获取区域列表 | ||||
| @@ -1032,7 +1032,7 @@ export default { | |||||
| }, | }, | ||||
| del(row) { | del(row) { | ||||
| console.log(row, "删除"); | console.log(row, "删除"); | ||||
| this.$confirm(`是否删除区域?`, "提示", { | |||||
| this.$confirm(`是否删除此楼盘?`, "提示", { | |||||
| confirmButtonText: "确定", | confirmButtonText: "确定", | ||||
| cancelButtonText: "取消", | cancelButtonText: "取消", | ||||
| distinguishCancelAndClose: true, | distinguishCancelAndClose: true, | ||||