address-client 1.5.18 → 1.5.20-bjzr
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/build/dev-server.js +49 -10
- package/build.gradle +1 -1
- package/package.json +2 -2
- package/src/components/AddressFiles.vue +145 -145
- package/src/components/AddressList.vue +216 -206
- package/src/components/AddressManage.vue +91 -91
- package/src/components/AreaList.vue +2 -0
- package/src/components/UserAddress.vue +1 -1
- package/.npmignore +0 -9
- package/AddressClient.iml +0 -13
- package/build/.npmignore +0 -1
- package/yarn.lock +0 -7463
package/build/dev-server.js
CHANGED
|
@@ -10,25 +10,64 @@ var proxy = httpProxy.createProxyServer()
|
|
|
10
10
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
+
var fuwu='http://111.19.162.41:8300',bendi='http://111.19.162.41:8300'
|
|
13
14
|
var proxyTable = {
|
|
14
|
-
|
|
15
|
-
target:
|
|
15
|
+
'/file': {
|
|
16
|
+
target: fuwu
|
|
16
17
|
},
|
|
18
|
+
// 查找资源服务数据
|
|
17
19
|
'/rs/search': {
|
|
18
|
-
target:
|
|
20
|
+
target: fuwu
|
|
19
21
|
},
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
// 用户登录服务地址
|
|
23
|
+
'/rs/user': {
|
|
24
|
+
target: fuwu
|
|
25
|
+
},
|
|
26
|
+
'/rs/path/getParams': {
|
|
27
|
+
target: fuwu
|
|
22
28
|
},
|
|
23
29
|
'/rs/logic/getInitData': {
|
|
24
|
-
target:
|
|
30
|
+
target: fuwu
|
|
31
|
+
},
|
|
32
|
+
'/rs/data': {
|
|
33
|
+
target: fuwu
|
|
34
|
+
},
|
|
35
|
+
'/rs/license': {
|
|
36
|
+
target: fuwu
|
|
37
|
+
},
|
|
38
|
+
'/rs/db': {
|
|
39
|
+
target: fuwu
|
|
40
|
+
},
|
|
41
|
+
'/excel': {
|
|
42
|
+
target: fuwu
|
|
43
|
+
},
|
|
44
|
+
|
|
45
|
+
'/rs/logic/getSaleInitData': {
|
|
46
|
+
target: fuwu
|
|
47
|
+
},
|
|
48
|
+
'/rs/logic/getLogin': {
|
|
49
|
+
target: fuwu
|
|
50
|
+
},
|
|
51
|
+
'/rs/config': {
|
|
52
|
+
target: bendi
|
|
53
|
+
},
|
|
54
|
+
'/rs/sql/getLicenseById': {
|
|
55
|
+
target: fuwu
|
|
56
|
+
},
|
|
57
|
+
'/rs/Invoice': {
|
|
58
|
+
target: fuwu
|
|
59
|
+
},
|
|
60
|
+
'/rs/report': {
|
|
61
|
+
target: fuwu
|
|
25
62
|
},
|
|
26
63
|
'/rs/vue': {
|
|
27
|
-
target:
|
|
28
|
-
}
|
|
64
|
+
target: fuwu
|
|
65
|
+
},
|
|
66
|
+
'/rs/images': {
|
|
67
|
+
target: fuwu
|
|
68
|
+
},
|
|
29
69
|
'/rs': {
|
|
30
|
-
target:
|
|
31
|
-
//target: 'http://127.0.0.1:8099/address'
|
|
70
|
+
target: bendi
|
|
32
71
|
}
|
|
33
72
|
}
|
|
34
73
|
|
package/build.gradle
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "address-client",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.20-bjzr",
|
|
4
4
|
"description": "地址管理前台组件",
|
|
5
5
|
"author": "wanbochao",
|
|
6
6
|
"license": "ISC",
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"mocha": "^3.2.0",
|
|
73
73
|
"ncp": "^2.0.0",
|
|
74
74
|
"rimraf": "^2.5.0",
|
|
75
|
-
"sale-client": "^1.
|
|
75
|
+
"sale-client": "^1.7.6-0.8",
|
|
76
76
|
"selenium-server": "2.52.0",
|
|
77
77
|
"sinon": "^2.1.0",
|
|
78
78
|
"sinon-chai": "^2.8.0",
|
|
@@ -1,145 +1,145 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div style="widows: auto;">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged :pager="false">
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:cri>
|
|
5
|
-
<div novalidate class="select-overspread form-horizontal auto" partial>
|
|
6
|
-
<div class="row">
|
|
7
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
8
|
-
<input type="text" class="form-control" v-model="model.f_residential_arearea"
|
|
9
|
-
condition="f_residential_area like '%{}%'" placeholder="小区"/>
|
|
10
|
-
</div>
|
|
11
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
12
|
-
<input type="text" class="form-control" v-model="model.f_building"
|
|
13
|
-
condition="f_building like '%{}%'" placeholder="楼号"/>
|
|
14
|
-
</div>
|
|
15
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
16
|
-
<input type="text" class="form-control" v-model="model.f_unit"
|
|
17
|
-
condition="f_unit like '%{}%'" placeholder="单元"/>
|
|
18
|
-
</div>
|
|
19
|
-
</div>
|
|
20
|
-
<div class="row">
|
|
21
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
22
|
-
<input type="text" class="form-control" v-model="model.f_floor"
|
|
23
|
-
condition="f_floor like '%{}%'" placeholder="楼层"/>
|
|
24
|
-
</div>
|
|
25
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
26
|
-
<input type="text" class="form-control" v-model="model.f_room"
|
|
27
|
-
condition="f_room like '%{}%'" placeholder="门牌号"/>
|
|
28
|
-
</div>
|
|
29
|
-
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
30
|
-
<v-select :value.sync="model.file_num" :options='$parent.$parent.filenums' placeholder='表具数'
|
|
31
|
-
close-on-select
|
|
32
|
-
v-model='model.file_num' condition="file_num {}"></v-select>
|
|
33
|
-
</div>
|
|
34
|
-
</div>
|
|
35
|
-
<div class="row">
|
|
36
|
-
<div class="col-sm-6 form-group" style="padding-right: 5px">
|
|
37
|
-
<input type="text" class="form-control" v-model="model.f_address"
|
|
38
|
-
condition="f_address like '%{}%'" placeholder="详细地址"/>
|
|
39
|
-
</div>
|
|
40
|
-
<div style="text-align:right;">
|
|
41
|
-
<button class="btn btn-success" @click="search()" >查询</button>
|
|
42
|
-
</div>
|
|
43
|
-
</div>
|
|
44
|
-
|
|
45
|
-
</div>
|
|
46
|
-
</criteria>
|
|
47
|
-
|
|
48
|
-
<data-grid :model="model" partial='list' v-ref:grid>
|
|
49
|
-
<template partial='head'>
|
|
50
|
-
<tr>
|
|
51
|
-
<th><nobr>详细地址</nobr></th>
|
|
52
|
-
<th><nobr>表具数</nobr></th>
|
|
53
|
-
<th><nobr>操作</nobr></th>
|
|
54
|
-
</tr>
|
|
55
|
-
</template>
|
|
56
|
-
<template partial='body'>
|
|
57
|
-
<tr>
|
|
58
|
-
<td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
|
|
59
|
-
<td style="text-align:center"><nobr>{{row.file_num}}</nobr></td>
|
|
60
|
-
<td style="text-align:center">
|
|
61
|
-
<div v-if="row.file_num > 0 && !row.f_userinfo_id">
|
|
62
|
-
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'complete')">完善档案</button>
|
|
63
|
-
</div>
|
|
64
|
-
<div v-if="row.file_num === 0">
|
|
65
|
-
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
|
|
66
|
-
</div>
|
|
67
|
-
<div v-if="row.file_num > 0 && row.f_userinfo_id && $parent.$parent.$parent.config.oneToMany">
|
|
68
|
-
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
|
|
69
|
-
</div>
|
|
70
|
-
</td>
|
|
71
|
-
</tr>
|
|
72
|
-
</template>
|
|
73
|
-
<template partial='foot'></template>
|
|
74
|
-
</data-grid>
|
|
75
|
-
</criteria-paged>
|
|
76
|
-
</div>
|
|
77
|
-
</template>
|
|
78
|
-
|
|
79
|
-
<script>
|
|
80
|
-
import { PagedList, HttpResetClass } from 'vue-client'
|
|
81
|
-
|
|
82
|
-
let readySync = async function (self) {
|
|
83
|
-
|
|
84
|
-
await self.$refs.paged.$refs.cri.search()
|
|
85
|
-
|
|
86
|
-
// 获取地址管理特殊文件
|
|
87
|
-
let http = new HttpResetClass()
|
|
88
|
-
|
|
89
|
-
let getConfig = await http.load('GET', '/rs/vue/AddressList.json', {}, {resolveMsg: null, rejectMsg: null})
|
|
90
|
-
|
|
91
|
-
if (getConfig) {
|
|
92
|
-
Object.assign(self.config, self.config, getConfig.data)
|
|
93
|
-
}
|
|
94
|
-
console.log('获取到的地址配置文件', self.config)
|
|
95
|
-
}
|
|
96
|
-
export default {
|
|
97
|
-
data () {
|
|
98
|
-
return {
|
|
99
|
-
config: {
|
|
100
|
-
// 是否支持一对多
|
|
101
|
-
oneToMany: true
|
|
102
|
-
},
|
|
103
|
-
model: new PagedList('rs/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
|
|
104
|
-
//分公司id串
|
|
105
|
-
f_filialeids: this.$login.f.f_orgids,
|
|
106
|
-
filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]
|
|
107
|
-
}
|
|
108
|
-
},
|
|
109
|
-
ready(){
|
|
110
|
-
readySync(this)
|
|
111
|
-
},
|
|
112
|
-
methods: {
|
|
113
|
-
selfsearch(args){
|
|
114
|
-
//添加分公司查询条件
|
|
115
|
-
args.condition = `${args.condition} and f_filialeids = '${this.f_filialeids}'`
|
|
116
|
-
console.log(args)
|
|
117
|
-
//执行查询
|
|
118
|
-
this.model.search(args.condition, args.model, args.condValue)
|
|
119
|
-
},
|
|
120
|
-
//清空
|
|
121
|
-
clear(){
|
|
122
|
-
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
123
|
-
this.$refs.paged.$refs.cri.model[key] = ''
|
|
124
|
-
})
|
|
125
|
-
},
|
|
126
|
-
create(row, action){
|
|
127
|
-
|
|
128
|
-
console.log('点击的动作', action)
|
|
129
|
-
|
|
130
|
-
if (row.file_num > 0 && action === 'add') {
|
|
131
|
-
// 属于一址多表
|
|
132
|
-
this.$showMessage('该地址下已存在表具信息，确定要新加一个新表具吗？', ['confirm', 'cancel']).then((res) => {
|
|
133
|
-
if (res === 'confirm') {
|
|
134
|
-
//发出事件,用于建档或修正档案
|
|
135
|
-
this.$dispatch('buildfiles',row)
|
|
136
|
-
}
|
|
137
|
-
})
|
|
138
|
-
} else {
|
|
139
|
-
this.$dispatch('buildfiles',row)
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
</script>
|
|
1
|
+
<template>
|
|
2
|
+
<div style="widows: auto;">
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged :pager="false">
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:cri>
|
|
5
|
+
<div novalidate class="select-overspread form-horizontal auto" partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
8
|
+
<input type="text" class="form-control" v-model="model.f_residential_arearea"
|
|
9
|
+
condition="f_residential_area like '%{}%'" placeholder="小区"/>
|
|
10
|
+
</div>
|
|
11
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
12
|
+
<input type="text" class="form-control" v-model="model.f_building"
|
|
13
|
+
condition="f_building like '%{}%'" placeholder="楼号"/>
|
|
14
|
+
</div>
|
|
15
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
16
|
+
<input type="text" class="form-control" v-model="model.f_unit"
|
|
17
|
+
condition="f_unit like '%{}%'" placeholder="单元"/>
|
|
18
|
+
</div>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="row">
|
|
21
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
22
|
+
<input type="text" class="form-control" v-model="model.f_floor"
|
|
23
|
+
condition="f_floor like '%{}%'" placeholder="楼层"/>
|
|
24
|
+
</div>
|
|
25
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
26
|
+
<input type="text" class="form-control" v-model="model.f_room"
|
|
27
|
+
condition="f_room like '%{}%'" placeholder="门牌号"/>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-4 form-group" style="padding-right: 5px">
|
|
30
|
+
<v-select :value.sync="model.file_num" :options='$parent.$parent.filenums' placeholder='表具数'
|
|
31
|
+
close-on-select
|
|
32
|
+
v-model='model.file_num' condition="file_num {}"></v-select>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
<div class="row">
|
|
36
|
+
<div class="col-sm-6 form-group" style="padding-right: 5px">
|
|
37
|
+
<input type="text" class="form-control" v-model="model.f_address"
|
|
38
|
+
condition="f_address like '%{}%'" placeholder="详细地址"/>
|
|
39
|
+
</div>
|
|
40
|
+
<div style="text-align:right;">
|
|
41
|
+
<button class="btn btn-success" @click="search()" >查询</button>
|
|
42
|
+
</div>
|
|
43
|
+
</div>
|
|
44
|
+
|
|
45
|
+
</div>
|
|
46
|
+
</criteria>
|
|
47
|
+
|
|
48
|
+
<data-grid :model="model" partial='list' v-ref:grid>
|
|
49
|
+
<template partial='head'>
|
|
50
|
+
<tr>
|
|
51
|
+
<th><nobr>详细地址</nobr></th>
|
|
52
|
+
<th><nobr>表具数</nobr></th>
|
|
53
|
+
<th><nobr>操作</nobr></th>
|
|
54
|
+
</tr>
|
|
55
|
+
</template>
|
|
56
|
+
<template partial='body'>
|
|
57
|
+
<tr>
|
|
58
|
+
<td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
|
|
59
|
+
<td style="text-align:center"><nobr>{{row.file_num}}</nobr></td>
|
|
60
|
+
<td style="text-align:center">
|
|
61
|
+
<div v-if="row.file_num > 0 && !row.f_userinfo_id">
|
|
62
|
+
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'complete')">完善档案</button>
|
|
63
|
+
</div>
|
|
64
|
+
<div v-if="row.file_num === 0">
|
|
65
|
+
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
|
|
66
|
+
</div>
|
|
67
|
+
<div v-if="row.file_num > 0 && row.f_userinfo_id && $parent.$parent.$parent.config.oneToMany">
|
|
68
|
+
<button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
|
|
69
|
+
</div>
|
|
70
|
+
</td>
|
|
71
|
+
</tr>
|
|
72
|
+
</template>
|
|
73
|
+
<template partial='foot'></template>
|
|
74
|
+
</data-grid>
|
|
75
|
+
</criteria-paged>
|
|
76
|
+
</div>
|
|
77
|
+
</template>
|
|
78
|
+
|
|
79
|
+
<script>
|
|
80
|
+
import { PagedList, HttpResetClass } from 'vue-client'
|
|
81
|
+
|
|
82
|
+
let readySync = async function (self) {
|
|
83
|
+
|
|
84
|
+
await self.$refs.paged.$refs.cri.search()
|
|
85
|
+
|
|
86
|
+
// 获取地址管理特殊文件
|
|
87
|
+
let http = new HttpResetClass()
|
|
88
|
+
|
|
89
|
+
let getConfig = await http.load('GET', '/rs/vue/AddressList.json', {}, {resolveMsg: null, rejectMsg: null})
|
|
90
|
+
|
|
91
|
+
if (getConfig) {
|
|
92
|
+
Object.assign(self.config, self.config, getConfig.data)
|
|
93
|
+
}
|
|
94
|
+
console.log('获取到的地址配置文件', self.config)
|
|
95
|
+
}
|
|
96
|
+
export default {
|
|
97
|
+
data () {
|
|
98
|
+
return {
|
|
99
|
+
config: {
|
|
100
|
+
// 是否支持一对多
|
|
101
|
+
oneToMany: true
|
|
102
|
+
},
|
|
103
|
+
model: new PagedList('rs/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
|
|
104
|
+
//分公司id串
|
|
105
|
+
f_filialeids: this.$login.f.f_orgids,
|
|
106
|
+
filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]
|
|
107
|
+
}
|
|
108
|
+
},
|
|
109
|
+
ready(){
|
|
110
|
+
readySync(this)
|
|
111
|
+
},
|
|
112
|
+
methods: {
|
|
113
|
+
selfsearch(args){
|
|
114
|
+
//添加分公司查询条件
|
|
115
|
+
args.condition = `${args.condition} and f_filialeids = '${this.f_filialeids}'`
|
|
116
|
+
console.log(args)
|
|
117
|
+
//执行查询
|
|
118
|
+
this.model.search(args.condition, args.model, args.condValue)
|
|
119
|
+
},
|
|
120
|
+
//清空
|
|
121
|
+
clear(){
|
|
122
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
123
|
+
this.$refs.paged.$refs.cri.model[key] = ''
|
|
124
|
+
})
|
|
125
|
+
},
|
|
126
|
+
create(row, action){
|
|
127
|
+
|
|
128
|
+
console.log('点击的动作', action)
|
|
129
|
+
|
|
130
|
+
if (row.file_num > 0 && action === 'add') {
|
|
131
|
+
// 属于一址多表
|
|
132
|
+
this.$showMessage('该地址下已存在表具信息，确定要新加一个新表具吗？', ['confirm', 'cancel']).then((res) => {
|
|
133
|
+
if (res === 'confirm') {
|
|
134
|
+
//发出事件,用于建档或修正档案
|
|
135
|
+
this.$dispatch('buildfiles',row)
|
|
136
|
+
}
|
|
137
|
+
})
|
|
138
|
+
} else {
|
|
139
|
+
this.$dispatch('buildfiles',row)
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
</script>
|