system-clients 3.2.0 → 3.2.1-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/server/LoadData.vue +55 -55
- package/src/components/server/ModifyPw.vue +107 -106
- package/src/components/server/ResSelectGroup.vue +6 -4
- package/src/filiale/qianneng/ModifyPw.vue +107 -0
- package/src/filiale/qianneng/sale.js +7 -0
- package/src/plugins/GetLoginInfoService.js +16 -16
- package/src/plugins/validation.js +8 -0
- package/src/system.js +8 -1
- package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
package/package.json
CHANGED
@@ -1,55 +1,55 @@
|
|
1
|
-
<template>
|
2
|
-
<div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
|
3
|
-
<!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
|
4
|
-
<h2 style="margin: 0" v-if="show">参数加载失败,请检查网络状态和服务状态...</h2>
|
5
|
-
</div>
|
6
|
-
</template>
|
7
|
-
|
8
|
-
<script>
|
9
|
-
export default {
|
10
|
-
title: '加载参数',
|
11
|
-
data () {
|
12
|
-
return {
|
13
|
-
msg: '',
|
14
|
-
show: false
|
15
|
-
}
|
16
|
-
},
|
17
|
-
props: {
|
18
|
-
componentName: {}
|
19
|
-
},
|
20
|
-
async ready () {
|
21
|
-
this.$nextTick(() => {
|
22
|
-
window.addEventListener('message', messageEvent => {
|
23
|
-
try {
|
24
|
-
const data = messageEvent.data
|
25
|
-
console.log('接收到数据', data)
|
26
|
-
this.$login = Object.assign(this.$login, data.login)
|
27
|
-
this.$appdata = Object.assign(this.$appdata, data.appdata)
|
28
|
-
if (!data.page) {
|
29
|
-
this.$showMessage('没有功能连接, 请配置!')
|
30
|
-
return
|
31
|
-
}
|
32
|
-
this.$goto(data.page)
|
33
|
-
} catch (e) {
|
34
|
-
console.log('登陆异常', e)
|
35
|
-
}
|
36
|
-
})
|
37
|
-
})
|
38
|
-
}
|
39
|
-
}
|
40
|
-
</script>
|
41
|
-
<style media="screen">
|
42
|
-
.loadingdata {
|
43
|
-
position: fixed;
|
44
|
-
background: #fff;
|
45
|
-
opacity: 0.6;
|
46
|
-
top: 0;
|
47
|
-
width: 100%;
|
48
|
-
}
|
49
|
-
.loaderror {
|
50
|
-
opacity: 1;
|
51
|
-
}
|
52
|
-
.loadsuccess {
|
53
|
-
display: none;
|
54
|
-
}
|
55
|
-
</style>
|
1
|
+
<template>
|
2
|
+
<div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
|
3
|
+
<!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
|
4
|
+
<h2 style="margin: 0" v-if="show">参数加载失败,请检查网络状态和服务状态...</h2>
|
5
|
+
</div>
|
6
|
+
</template>
|
7
|
+
|
8
|
+
<script>
|
9
|
+
export default {
|
10
|
+
title: '加载参数',
|
11
|
+
data () {
|
12
|
+
return {
|
13
|
+
msg: '',
|
14
|
+
show: false
|
15
|
+
}
|
16
|
+
},
|
17
|
+
props: {
|
18
|
+
componentName: {}
|
19
|
+
},
|
20
|
+
async ready () {
|
21
|
+
this.$nextTick(() => {
|
22
|
+
window.addEventListener('message', messageEvent => {
|
23
|
+
try {
|
24
|
+
const data = messageEvent.data
|
25
|
+
console.log('接收到数据', data)
|
26
|
+
this.$login = Object.assign(this.$login, data.login)
|
27
|
+
this.$appdata = Object.assign(this.$appdata, data.appdata)
|
28
|
+
if (!data.page) {
|
29
|
+
this.$showMessage('没有功能连接, 请配置!')
|
30
|
+
return
|
31
|
+
}
|
32
|
+
this.$goto(data.page)
|
33
|
+
} catch (e) {
|
34
|
+
console.log('登陆异常', e)
|
35
|
+
}
|
36
|
+
})
|
37
|
+
})
|
38
|
+
}
|
39
|
+
}
|
40
|
+
</script>
|
41
|
+
<style media="screen">
|
42
|
+
.loadingdata {
|
43
|
+
position: fixed;
|
44
|
+
background: #fff;
|
45
|
+
opacity: 0.6;
|
46
|
+
top: 0;
|
47
|
+
width: 100%;
|
48
|
+
}
|
49
|
+
.loaderror {
|
50
|
+
opacity: 1;
|
51
|
+
}
|
52
|
+
.loadsuccess {
|
53
|
+
display: none;
|
54
|
+
}
|
55
|
+
</style>
|
@@ -1,106 +1,107 @@
|
|
1
|
-
<template>
|
2
|
-
<div>
|
3
|
-
<validator name="v">
|
4
|
-
<modal :show.sync="show" v-ref:modal backdrop="false">
|
5
|
-
<header slot="modal-header" class="modal-header">
|
6
|
-
<button type="button" class="close" @click="rest"><span>×</span></button>
|
7
|
-
<h4 class="modal-title">修改密码</h4>
|
8
|
-
</header>
|
9
|
-
<article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
|
10
|
-
<div class="has-feedback form-group"
|
11
|
-
:class="{'has-warning':$v.password.required,'has-error': $v.password.required,
|
12
|
-
'has-success':!$v.password.required}">
|
13
|
-
<label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码: </label>
|
14
|
-
<div class="col-sm-4">
|
15
|
-
<input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
|
16
|
-
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
|
17
|
-
<span v-if="$v.password.required">不能为空</span>
|
18
|
-
</div>
|
19
|
-
</div>
|
20
|
-
<div class="has-feedback form-group"
|
21
|
-
:class="{'has-warning':$v.newpassword.required,'has-error'
|
22
|
-
'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
|
23
|
-
<label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码: </label>
|
24
|
-
<div class="col-sm-4">
|
25
|
-
<input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
|
26
|
-
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
|
27
|
-
<span v-if="$v.newpassword.required">不能为空</span>
|
28
|
-
<span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)"
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
<
|
36
|
-
|
37
|
-
<
|
38
|
-
<span v-if="$v.affirmpassword.required"
|
39
|
-
<span v-if="$v.affirmpassword.
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
<button type="button" class="btn btn-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
import
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
// let res = yield self.$post('rs/
|
62
|
-
// let res = yield self.$
|
63
|
-
//
|
64
|
-
|
65
|
-
self.$
|
66
|
-
|
67
|
-
|
68
|
-
self.deliver.
|
69
|
-
self.deliver.
|
70
|
-
self.
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
this.
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
1
|
+
<template>
|
2
|
+
<div>
|
3
|
+
<validator name="v">
|
4
|
+
<modal :show.sync="show" v-ref:modal backdrop="false">
|
5
|
+
<header slot="modal-header" class="modal-header">
|
6
|
+
<button type="button" class="close" @click="rest"><span>×</span></button>
|
7
|
+
<h4 class="modal-title">修改密码</h4>
|
8
|
+
</header>
|
9
|
+
<article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
|
10
|
+
<div class="has-feedback form-group"
|
11
|
+
:class="{'has-warning':$v.password.required,'has-error': $v.password.required,
|
12
|
+
'has-success':!$v.password.required}">
|
13
|
+
<label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码: </label>
|
14
|
+
<div class="col-sm-4">
|
15
|
+
<input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
|
16
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
|
17
|
+
<span v-if="$v.password.required">不能为空</span>
|
18
|
+
</div>
|
19
|
+
</div>
|
20
|
+
<div class="has-feedback form-group"
|
21
|
+
:class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.strongpassword || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
|
22
|
+
'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword&&!$v.newpassword.minlength && !$v.newpassword.chinesePassword}">
|
23
|
+
<label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码: </label>
|
24
|
+
<div class="col-sm-4">
|
25
|
+
<input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true, minlength: 6,chinesePassword: true}'>
|
26
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.strongpassword && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
|
27
|
+
<span v-if="$v.newpassword.required">不能为空</span>
|
28
|
+
<span v-if="($v.newpassword.strongpassword||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码长度不能小于六位,且必须包含英文大小写、阿拉伯数字、字符</span>
|
29
|
+
<span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
|
30
|
+
</div>
|
31
|
+
</div>
|
32
|
+
<div class="has-feedback form-group"
|
33
|
+
:class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
|
34
|
+
'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
|
35
|
+
<label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码: </label>
|
36
|
+
<div class="col-sm-4">
|
37
|
+
<input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
|
38
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
|
39
|
+
<span v-if="$v.affirmpassword.required">不能为空</span>
|
40
|
+
<span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
|
41
|
+
</div>
|
42
|
+
</div>
|
43
|
+
</article>
|
44
|
+
|
45
|
+
<footer slot="modal-footer" class="modal-footer">
|
46
|
+
<button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
|
47
|
+
<button type="button" class="btn btn-default" @click='rest'>取消</button>
|
48
|
+
</footer>
|
49
|
+
</modal>
|
50
|
+
</validator>
|
51
|
+
</div>
|
52
|
+
|
53
|
+
|
54
|
+
</template>
|
55
|
+
<script>
|
56
|
+
import co from 'co'
|
57
|
+
import validator from '../../plugins/validation';
|
58
|
+
|
59
|
+
let saveGen = function * (self) {
|
60
|
+
self.deliver.ename = self.functions.ename
|
61
|
+
// let res = yield self.$post('rs/user/entity', {data: self.deliver})
|
62
|
+
// let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
|
63
|
+
// let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
|
64
|
+
// Util.f.password = self.deliver.newpassword
|
65
|
+
let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
|
66
|
+
self.$login.f.password = self.deliver.newpassword
|
67
|
+
if (res.data) {
|
68
|
+
self.deliver.password = ''
|
69
|
+
self.deliver.newpassword = ''
|
70
|
+
self.deliver.affirmpassword = ''
|
71
|
+
self.show = false
|
72
|
+
}
|
73
|
+
}
|
74
|
+
export default {
|
75
|
+
title: '系统管理-密码修改',
|
76
|
+
data () {
|
77
|
+
return {
|
78
|
+
deliver: {
|
79
|
+
password: '',
|
80
|
+
newpassword: '',
|
81
|
+
affirmpassword: ''
|
82
|
+
},
|
83
|
+
functions: this.$login.f
|
84
|
+
}
|
85
|
+
},
|
86
|
+
props: ['show'],
|
87
|
+
methods: {
|
88
|
+
confirm () {
|
89
|
+
let gen = saveGen(this)
|
90
|
+
co(gen)
|
91
|
+
},
|
92
|
+
rest () {
|
93
|
+
this.show = false
|
94
|
+
this.deliver = {password: '', newpassword: '', affirmpassword: ''}
|
95
|
+
}
|
96
|
+
}
|
97
|
+
}
|
98
|
+
</script>
|
99
|
+
<style>
|
100
|
+
/*修改密码body界面样式*/
|
101
|
+
.modifystyle {
|
102
|
+
background: #FCFEEE;
|
103
|
+
}
|
104
|
+
.modifystyle span{
|
105
|
+
color: red;
|
106
|
+
}
|
107
|
+
</style>
|
@@ -80,6 +80,7 @@ export default {
|
|
80
80
|
orgresid:[this.$login.f.orgid],
|
81
81
|
depresid:[],
|
82
82
|
userresid:[],
|
83
|
+
operatorsid: [],
|
83
84
|
sliceArea: [],
|
84
85
|
slice_area:[],
|
85
86
|
companyshow:false,
|
@@ -176,14 +177,15 @@ export default {
|
|
176
177
|
this.userresid=obj
|
177
178
|
this.returnOrg();
|
178
179
|
},
|
179
|
-
getuser(obj) {
|
180
|
-
this.obj.operatornames =
|
180
|
+
getuser(obj,val) {
|
181
|
+
this.obj.operatornames = val
|
182
|
+
this.operatorsid = obj
|
181
183
|
this.returnOrg(obj);
|
182
184
|
},
|
183
185
|
getarea(val) {
|
184
186
|
this.slice_area=val
|
185
|
-
if(this.
|
186
|
-
this.returnOrg(this.
|
187
|
+
if(this.operatorsid){
|
188
|
+
this.returnOrg(this.operatorsid);
|
187
189
|
}else{
|
188
190
|
this.returnOrg();
|
189
191
|
}
|
@@ -0,0 +1,107 @@
|
|
1
|
+
<template>
|
2
|
+
<div>
|
3
|
+
<validator name="v">
|
4
|
+
<modal :show.sync="show" v-ref:modal backdrop="false">
|
5
|
+
<header slot="modal-header" class="modal-header">
|
6
|
+
<button type="button" class="close" @click="rest"><span>×</span></button>
|
7
|
+
<h4 class="modal-title">修改密码</h4>
|
8
|
+
</header>
|
9
|
+
<article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
|
10
|
+
<div class="has-feedback form-group"
|
11
|
+
:class="{'has-warning':$v.password.required,'has-error': $v.password.required,
|
12
|
+
'has-success':!$v.password.required}">
|
13
|
+
<label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码: </label>
|
14
|
+
<div class="col-sm-4">
|
15
|
+
<input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
|
16
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
|
17
|
+
<span v-if="$v.password.required">不能为空</span>
|
18
|
+
</div>
|
19
|
+
</div>
|
20
|
+
<div class="has-feedback form-group"
|
21
|
+
:class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
|
22
|
+
'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength && !$v.newpassword.chinesePassword}">
|
23
|
+
<label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码: </label>
|
24
|
+
<div class="col-sm-4">
|
25
|
+
<input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
|
26
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
|
27
|
+
<span v-if="$v.newpassword.required">不能为空</span>
|
28
|
+
<span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
|
29
|
+
<span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
|
30
|
+
</div>
|
31
|
+
</div>
|
32
|
+
<div class="has-feedback form-group"
|
33
|
+
:class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
|
34
|
+
'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
|
35
|
+
<label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码: </label>
|
36
|
+
<div class="col-sm-4">
|
37
|
+
<input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
|
38
|
+
<span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
|
39
|
+
<span v-if="$v.affirmpassword.required">不能为空</span>
|
40
|
+
<span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
|
41
|
+
</div>
|
42
|
+
</div>
|
43
|
+
</article>
|
44
|
+
|
45
|
+
<footer slot="modal-footer" class="modal-footer">
|
46
|
+
<button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
|
47
|
+
<button type="button" class="btn btn-default" @click='rest'>取消</button>
|
48
|
+
</footer>
|
49
|
+
</modal>
|
50
|
+
</validator>
|
51
|
+
</div>
|
52
|
+
|
53
|
+
|
54
|
+
</template>
|
55
|
+
<script>
|
56
|
+
import co from 'co'
|
57
|
+
import validator from '../../plugins/validation';
|
58
|
+
|
59
|
+
let saveGen = function * (self) {
|
60
|
+
self.deliver.ename = self.functions.ename
|
61
|
+
// let res = yield self.$post('rs/user/entity', {data: self.deliver})
|
62
|
+
// let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
|
63
|
+
// let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
|
64
|
+
// Util.f.password = self.deliver.newpassword
|
65
|
+
let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
|
66
|
+
self.$login.f.password = self.deliver.newpassword
|
67
|
+
if (res.data) {
|
68
|
+
self.deliver.password = ''
|
69
|
+
self.deliver.newpassword = ''
|
70
|
+
self.deliver.affirmpassword = ''
|
71
|
+
self.show = false
|
72
|
+
}
|
73
|
+
}
|
74
|
+
export default {
|
75
|
+
title: '系统管理-密码修改',
|
76
|
+
data () {
|
77
|
+
return {
|
78
|
+
deliver: {
|
79
|
+
password: '',
|
80
|
+
newpassword: '',
|
81
|
+
affirmpassword: ''
|
82
|
+
},
|
83
|
+
functions: this.$login.f
|
84
|
+
}
|
85
|
+
},
|
86
|
+
props: ['show'],
|
87
|
+
methods: {
|
88
|
+
confirm () {
|
89
|
+
let gen = saveGen(this)
|
90
|
+
co(gen)
|
91
|
+
},
|
92
|
+
rest () {
|
93
|
+
this.show = false
|
94
|
+
this.deliver = {password: '', newpassword: '', affirmpassword: ''}
|
95
|
+
}
|
96
|
+
}
|
97
|
+
}
|
98
|
+
</script>
|
99
|
+
<style>
|
100
|
+
/*修改密码body界面样式*/
|
101
|
+
.modifystyle {
|
102
|
+
background: #FCFEEE;
|
103
|
+
}
|
104
|
+
.modifystyle span{
|
105
|
+
color: red;
|
106
|
+
}
|
107
|
+
</style>
|
@@ -81,22 +81,22 @@ let loginGen = async function (name, password) {
|
|
81
81
|
Vue.$login.f.f_gasman = []
|
82
82
|
console.log('抄表员模块',error)
|
83
83
|
}
|
84
|
-
//
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
84
|
+
// 获取安装人
|
85
|
+
try {
|
86
|
+
let getInstallman = await Vue.resetpost('/rs/search', {
|
87
|
+
source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
|
88
|
+
userid: Vue.$login.f.id
|
89
|
+
}, {resolveMsg: null, rejectMsg: null})
|
90
|
+
console.log('获取安装员', getInstallman)
|
91
|
+
let installman = []
|
92
|
+
for (let i = 0; i < getInstallman.data.length; i++) {
|
93
|
+
installman.push(getInstallman.data[i])
|
94
|
+
}
|
95
|
+
Vue.$login.f.f_installman = installman
|
96
|
+
}catch (error) {
|
97
|
+
Vue.$login.f.f_installman =[]
|
98
|
+
console.log('安装人模块',error)
|
99
|
+
}
|
100
100
|
// 获取换表员
|
101
101
|
// try {
|
102
102
|
// let getChangeMeterman = await Vue.resetpost('/rs/search', {
|
@@ -5,3 +5,11 @@ Vue.use(Validator)
|
|
5
5
|
Vue.validator('strongpassword', function (val) {
|
6
6
|
return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
|
7
7
|
});
|
8
|
+
Vue.validator('chinesePassword', function (val) {
|
9
|
+
var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
|
10
|
+
return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
|
11
|
+
});
|
12
|
+
// 潜能要求8~16位数字字母组合;
|
13
|
+
Vue.validator('numbersAndLetter8to16', function (val) {
|
14
|
+
return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
|
15
|
+
});
|
package/src/system.js
CHANGED
@@ -26,7 +26,7 @@ import ResSelectGroup from './components/server/ResSelectGroup'
|
|
26
26
|
//资源选择测试
|
27
27
|
import TestResSelect from './components/server/TestResSelect'
|
28
28
|
import RoleSelector from "./components/server/RoleSelector";
|
29
|
-
export default function (val) {
|
29
|
+
export default function (val, filiale) {
|
30
30
|
//验证码开关赋值
|
31
31
|
if(val!=null){
|
32
32
|
GetLoginInfoService.Verification=val
|
@@ -90,4 +90,11 @@ export default function (val) {
|
|
90
90
|
|
91
91
|
//省市区、街道、小区、楼栋级联查询
|
92
92
|
Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
|
93
|
+
|
94
|
+
if (filiale) {
|
95
|
+
let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
|
96
|
+
for (let key in filialeComp) {
|
97
|
+
Vue.component(key, filialeComp[key])
|
98
|
+
}
|
99
|
+
}
|
93
100
|
}
|
Binary file
|
Binary file
|