是
否
@@ -1187,6 +1194,13 @@ export default {
// this.userDeptTree()// 获取部门树
this.deptGetOrgList(); //获取公司列表
this.getAgentList(); //获取代理商列表
+ this.userDict(
+ {
+ dictKey: localStorage.getItem('orgType'),
+ dictType: 3,
+ },
+ "userRoleList"
+ );
},
methods: {
// 区域改变
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 7962da2..970a171 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -133,7 +133,7 @@
筛选相关:
筛选
@@ -232,8 +232,8 @@
>更换账号
- 管理系统运营人员
- 管理代理商运营
+ 系统运营
+ 售后运营
绑定代理商
删除
@@ -529,7 +529,7 @@ export default {
if (value) {
if (!/^1[3456789]\d{9}$/.test(value)) {
// alert("手机号码不合法,请重新输入");
- callback(new Error("手机号码不合法,请重新输入"));
+ callback(new Error("手机号格式错误,请重新输入"));
}
}
callback();
@@ -543,7 +543,7 @@ export default {
this.passFlag=false
if (!/^1[3456789]\d{9}$/.test(value)) {
// alert("手机号码不合法,请重新输入");
- callback(new Error("手机号码不合法,请重新输入"));
+ callback(new Error("手机号格式错误,请重新输入"));
}else{
// 验证电话号码
this.$api.api.verPhone(value).then((res) => {
@@ -660,6 +660,10 @@ export default {
value: "2",
label: "演示",
},
+ {
+ value: "3",
+ label: "测试",
+ },
],
currentPage: 1,
size: 10,
@@ -859,6 +863,10 @@ export default {
// this.optionsoperationalPeople = res.data;
// });
},
+ screen(){
+ this.currentPage=1
+ this.zkhousePage()
+ },
addSurequxiao() {
this.dialogVisible = false;
},
@@ -1008,7 +1016,7 @@ export default {
});
},
// 时间改变
- timeChange(e) {
+ timeChange(e) {
console.log(e);
this.ruleForm.startWorking = e[0];
this.ruleForm.endWorking = e[1];
diff --git a/vue.config.js b/vue.config.js
index 180e0a5..87daeff 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://zwfakg.natappfree.cc' //王笑
+// const url = 'http://jrcd6b.natappfree.cc' //王笑
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
From b3c869ee64fd5128015b62a2f92d21c144e47931 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 9 Nov 2021 16:47:37 +0800
Subject: [PATCH 3/5] init
---
package.json | 1 +
src/api/modules/api.js | 6 +++++-
src/main.js | 1 -
src/page/check/chose.vue | 2 ++
src/page/check/index.vue | 3 ++-
src/page/index/tags.vue | 5 ++++-
src/page/login/userlogin.vue | 1 +
vue.config.js | 4 ++--
8 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 76951d6..cd460d1 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
"vue": "^2.6.10",
"vue-audio-player": "0.0.2",
"vue-axios": "^2.1.2",
+ "vue-bus": "^1.2.1",
"vue-clipboard2": "^0.3.0",
"vue-cron": "^1.0.9",
"vue-echarts": "^4.0.1",
diff --git a/src/api/modules/api.js b/src/api/modules/api.js
index 7f6cde6..0d0ead5 100644
--- a/src/api/modules/api.js
+++ b/src/api/modules/api.js
@@ -306,7 +306,11 @@ export function findHouseByUser(query) {
return request({
url: '/autoSR/zkhouse/findHouseByUser',
method:'get',
- params:query
+ params:{
+ agentId:localStorage.getItem('agentId'),
+ orgCode:localStorage.getItem('orgCode'),
+ ...query
+ }
})
}
// 楼盘绑定
diff --git a/src/main.js b/src/main.js
index 6c9e086..47833fd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,6 @@ Vue.use(AVUE, {
size: 'small',
menuType: 'text'
})
-
// 注册全局容器
Vue.component('basicContainer', basicContainer)
diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index 501f628..8a41f11 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -355,9 +355,11 @@ export default {
localStorage.setItem("houseId", item.id);
}
this.$router.push({ path: "/wel" });
+ localStorage.setItem('allClose',true)
},
goback() {
this.$router.back();
+ localStorage.setItem('allClose',false)
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
diff --git a/src/page/check/index.vue b/src/page/check/index.vue
index b64025c..5e90277 100644
--- a/src/page/check/index.vue
+++ b/src/page/check/index.vue
@@ -87,6 +87,7 @@ export default {
// 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面
if (this.backFlag) {
this.$router.back();
+ localStorage.setItem('allClose',false)
} else {
this.$confirm("是否退出系统, 是否继续?", "提示", {
confirmButtonText: "确定",
@@ -240,7 +241,7 @@ export default {
// 楼盘后台
// this.$router.push({ path: "/chose", query: { flag: 3 } });
}
-
+ localStorage.setItem('allClose',true)
// this.$router.push({ path: "/chose" });
},
},
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index 99ce409..de4fdf4 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -69,12 +69,15 @@
},
contextmenuFlag() {
window.addEventListener('mousedown', this.watchContextmenu)
- }
+ },
},
created() {
},
mounted() {
this.setActive()
+ if(localStorage.getItem('allClose')){
+ this.closeAllTags()
+ }
},
computed: {
...mapGetters(['tagWel', 'tagList', 'tag', 'website']),
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index d31d809..03bed4b 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -119,6 +119,7 @@ export default {
this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
// this.$router.push({ path: this.tagWel.value });
this.info = getStore({ name: "userInfo" });
+ localStorage.setItem('allClose',false)
that.$api.api.getTab().then((res) => {
// console.log(res)
// 循环数组,给定各种标志
diff --git a/vue.config.js b/vue.config.js
index 87daeff..1108632 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,11 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65:9999' //测试
+// 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://jrcd6b.natappfree.cc' //王笑
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
From 404e00061669e05f60c251a8e16fee9c5a6754f9 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 9 Nov 2021 16:53:17 +0800
Subject: [PATCH 4/5] init
---
src/page/index/tags.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index de4fdf4..d7ffe70 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -75,7 +75,8 @@
},
mounted() {
this.setActive()
- if(localStorage.getItem('allClose')){
+ console.log(localStorage.getItem('allClose'));
+ if(localStorage.getItem('allClose')=='true'){
this.closeAllTags()
}
},
From d2fb0120893151d2d24818afd694c1477bcb06f6 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 9 Nov 2021 20:34:04 +0800
Subject: [PATCH 5/5] init
---
src/views/Customer/AgentManagement.vue | 2 +-
src/views/Customer/CompanyRecord.vue | 2 +-
src/views/admin/user/index.vue | 38 ++++++++++++++++++++++++--
src/views/building/index.vue | 4 +--
vue.config.js | 4 +--
5 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index f684d51..6d62f19 100644
--- a/src/views/Customer/AgentManagement.vue
+++ b/src/views/Customer/AgentManagement.vue
@@ -403,7 +403,7 @@ export default {
options: [
{
value: "0",
- label: "服务器内",
+ label: "服务中",
},
{
value: "1",
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index 19e5169..fad475a 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -538,7 +538,7 @@ export default {
if(valid){
// console.log(valid,this.operaForm);
this.$api.api.zkoperationrecordSaveCompany({
- orgType:this.idx==0?'1':'2',
+ orgType:2,
accountIds:this.operaForm.operationalPeople.join(','),
orgId: this.operaForm.orgId,
operationType:this.idx==0?'1':'2'
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 5909709..98907ff 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -554,6 +554,25 @@
+
+
+
+
+
+
+
{
console.log(res);
this.houseVisible = false;
+ this.roleList();
});
} else {
// 省市json串
@@ -1565,10 +1589,9 @@ export default {
.then((res) => {
console.log(res);
this.houseVisible = false;
+ this.roleList();
});
}
-
- this.roleList();
},
// 楼盘绑定解绑
// bindhouse(e){
@@ -2125,9 +2148,18 @@ export default {
this.formTwo.houseId=row.houseId
this.formTwo.newRoleId=row.roleId
this.formTwo.deptId=row.deptId
+ this.formTwo.userRoleType=row.userRoleType+''
console.log(this.formTwo);
// 获取角色列表
this.typeChange1(row)
+ this.userDict(
+ {
+ dictKey:row.orgType,
+ dictType: 3,
+ },
+ "userRoleTypeList"
+ );
+
// 获取部门列表
this.dialogFormVisibleTwo=true
},
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 970a171..25dd572 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -640,11 +640,11 @@ export default {
options1: [
{
value: "0",
- label: "服务器内",
+ label: "服务中",
},
{
value: "1",
- label: "已失效",
+ label: "已过期",
},
],
options: [
diff --git a/vue.config.js b/vue.config.js
index 1108632..87daeff 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,11 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
+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://jrcd6b.natappfree.cc' //王笑
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']