From bc0de4533221f17a65124f4812cad6290c2a8c93 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Wed, 10 Nov 2021 11:25:49 +0800 Subject: [PATCH 1/2] init --- src/api/modules/api.js | 8 ++++ src/views/Equipment/index.vue | 79 +++++++++++++++++++---------------- src/views/Equipment/state.vue | 10 ++--- vue.config.js | 2 +- 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 0d0ead5..c0d5e37 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -572,6 +572,14 @@ export function equipmentAdd(data) { data }) } +// 验收设备 +export function equipmentAcceptance(data) { + return request({ + url: 'autoSR/zk/equipment/acceptance', + method:'post', + data + }) +} // 归还设备 export function equipmentUnbind(data) { return request({ diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 7366c6e..95ae9a3 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -367,37 +367,38 @@ 归还 - 转写方式 - 自动转写 验收 恢复正常 - 绑定 - 删除 @@ -1199,23 +1200,31 @@ export default { }); }, //验收 - acceptance() { + acceptance(row) { this.$confirm("确认验收吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) .then(() => { - this.$message({ - type: "success", - message: "验收成功!", - }); + this.$api.api + .equipmentAcceptance({ + imeis: row.imei, + }) + .then((res) => { + this.$message({ + type: "success", + message: "验收成功!", + }); + this.equipmentManagement(); + }); }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消验收", - }); + .catch((err) => { + // this.$message({ + // type: "info", + // message: "已取消验收", + // }); + console.log(err); }); }, // 自动转写开关 @@ -1244,10 +1253,10 @@ export default { }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消", - }); + // this.$message({ + // type: "info", + // message: "已取消", + // }); }); }, // 转写开关 @@ -1278,10 +1287,10 @@ export default { }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消", - }); + // this.$message({ + // type: "info", + // message: "已取消", + // }); }); }, //归还 @@ -1305,10 +1314,10 @@ export default { }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消归还", - }); + // this.$message({ + // type: "info", + // message: "已取消归还", + // }); }); }, //删除 @@ -1332,10 +1341,10 @@ export default { }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消删除", - }); + // this.$message({ + // type: "info", + // message: "已取消删除", + // }); }); }, handleSizeChange(val) { diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index 037d8fd..184d33e 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -280,7 +280,7 @@ align="center" > @@ -330,11 +330,9 @@ diff --git a/vue.config.js b/vue.config.js index 87daeff..5a08e91 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -// const url = 'http://jrcd6b.natappfree.cc' //王笑 +// const url = 'http://yuuapd.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css'] From c4e6334d135bf2f78958a1ed0924a4f0d248b2a2 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Wed, 10 Nov 2021 17:55:14 +0800 Subject: [PATCH 2/2] init --- src/api/modules/api.js | 8 + src/page/index/top/index.vue | 4 +- src/views/Customer/AgentManagement.vue | 4 +- src/views/Customer/CompanyRecord.vue | 8 +- src/views/Equipment/state.vue | 10 +- src/views/admin/app/index.vue | 300 +++++++++++++++++++++++++ src/views/admin/user/index.vue | 46 ++-- src/views/building/index.vue | 13 +- vue.config.js | 4 +- 9 files changed, 365 insertions(+), 32 deletions(-) create mode 100644 src/views/admin/app/index.vue diff --git a/src/api/modules/api.js b/src/api/modules/api.js index c0d5e37..8c5a569 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -968,3 +968,11 @@ export function receptionStatistics(query) { params:query }) } +// 小程序菜单管理 +export function apiTree(query) { + return request({ + url: 'admin/menu/apiTree', + method:'get', + params:query + }) +} diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 95140a9..7704e2a 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -118,9 +118,9 @@ 首页 - + 界面设置 diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index 6d62f19..df37abf 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -123,8 +123,8 @@ width="150" align="center"> diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index fad475a..eef7db3 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -4,10 +4,10 @@
-
代理商名称：
+
公司名称：
@@ -49,13 +49,13 @@ align="center" > - - + --> +
+ +
+
+
+ 新增 +
+
+
+ + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + +
+ 取 消 + 保存 +
+ +
+ + + + + diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 98907ff..8d7ed80 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -314,7 +314,7 @@ >编辑 - - + + @@ -489,7 +489,7 @@ - + - + 是 否 @@ -555,7 +555,7 @@ - + - +
取 消 @@ -692,8 +692,8 @@ clearable placeholder="请选择" > - - + + @@ -937,7 +937,7 @@ export default { if (value) { if (!/^1[3456789]\d{9}$/.test(value)) { // alert("手机号码不合法，请重新输入"); - callback(new Error("手机号码不合法，请重新输入")); + callback(new Error("手机号格式错误，请重新输入")); } } callback(); @@ -985,6 +985,7 @@ export default { fourthList: [], allCityList: [], managerList: [], + houseUserRoleType:'', bindFlag: "0", treeClick: "", //点击样式 keywork: "", //搜索关键字 @@ -1068,6 +1069,7 @@ export default { userRoleType:'', }, userRoleTypeList:[], + userRoleList:[], phoneFlag: false, rolesOptions: [], checkHouse: [], @@ -1110,6 +1112,7 @@ export default { houseVisible: false, deptTreeList: [], //部门树 roelFlag: false, + losorgType:localStorage.getItem('orgType'), systemFlag: true, //判断是否为系统用户 accountId: "", passwordForm: { @@ -1665,6 +1668,7 @@ export default { async gochosehouse(row) { console.log(row); this.code = row; + this.houseUserRoleType=row.userRoleType this.accountId = row.accountId; this.houseVisible = true; // 判断是否有绑定以及绑定方式 @@ -1798,9 +1802,17 @@ export default { handleSelectionChange1(e) { this.checkHouse = []; console.log(e); + if(this.houseUserRoleType==6&&e.length>1){ + // 单选 + this.$refs.multipleTable.clearSelection(); + this.$message.warning('您只能选择一个楼盘') + + return + } e.map((item) => { this.checkHouse.push(item.id); }); + }, delIds() { console.log(this.checkRole); @@ -2123,6 +2135,7 @@ export default { if (idx == 0) { this.$api.api .findRoleByOrgCode({ + orgType:this.form.orgType, orgCode: e, }) .then((res) => { @@ -2131,6 +2144,7 @@ export default { } else { this.$api.api .findRoleByOrgCode({ + orgType:this.form.orgType, agentId: e, }) .then((res) => { @@ -2143,6 +2157,7 @@ export default { this.formTwo.username=row.username this.formTwo.showPhoneStatus=row.showPhoneStatus this.formTwo.roleId=row.roleId + this.form.orgType=row.orgType this.formTwo.accountId=row.accountId this.formTwo.orgType=row.orgType this.formTwo.houseId=row.houseId @@ -2152,7 +2167,7 @@ export default { console.log(this.formTwo); // 获取角色列表 this.typeChange1(row) - this.userDict( + this.userDict( { dictKey:row.orgType, dictType: 3, @@ -2171,6 +2186,7 @@ export default { .then(res=>{ this.$message.success('修改成功') this.dialogFormVisibleTwo=false + this.roleList(); }) } }) @@ -2193,6 +2209,7 @@ export default { this.orgFlag = false; this.$api.api .findRoleByOrgCode({ + orgType:this.form.orgType, orgCode: null, agentId: null, }) @@ -2205,7 +2222,7 @@ export default { this.orgCodeChange(row.agentId, 1); } else if (row.orgType == 2) { // 公司 选择公司和角色 - this.orgFlag = true; + this.orgFlag = false; this.orgCodeChange(row.orgCode, 0); } else { // 楼盘 选择公司 角色 角色身份 @@ -2227,6 +2244,7 @@ export default { // this.agentFlag = false; this.$api.api .findRoleByOrgCode({ + orgType:this.form.orgType, orgCode: null, agentId: null, }) diff --git a/src/views/building/index.vue b/src/views/building/index.vue index 25dd572..b1c15af 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -75,7 +75,7 @@
-
使用状态：
+
服务状态：
- - + -