address-client 3.2.84 → 3.2.86
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 +24 -12
- package/package.json +3 -3
- package/src/address.js +6 -0
- package/src/components/AddStreetManageMsg.vue +204 -0
- package/src/components/AddStreetOrPcd.vue +361 -320
- package/src/components/StreetList.vue +3 -0
- package/src/components/StreetManage.vue +68 -0
- package/src/components/StreetManageList.vue +225 -0
- package/src/filiale/qianneng/UserAddress.vue +17 -12
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -10,13 +10,13 @@ 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 str = 'http://127.0.0.1:
|
|
14
|
-
var str3= 'http://
|
|
13
|
+
var str = 'http://127.0.0.1:8488', str2= 'http://192.168.50.4:8400/'
|
|
14
|
+
var str3= 'http://192.168.50.4:8400/'
|
|
15
15
|
var proxyTable = {
|
|
16
|
-
'/rs/
|
|
17
|
-
target:
|
|
18
|
-
secure:true,
|
|
19
|
-
changeOrigin:true
|
|
16
|
+
'/rs/entity': {
|
|
17
|
+
target: str
|
|
18
|
+
// secure:true,
|
|
19
|
+
// changeOrigin:true
|
|
20
20
|
// target: 'http://127.0.0.1:8080'
|
|
21
21
|
},
|
|
22
22
|
'/webapps':{
|
|
@@ -40,12 +40,12 @@ var proxyTable = {
|
|
|
40
40
|
secure:true,
|
|
41
41
|
changeOrigin:true
|
|
42
42
|
},
|
|
43
|
-
'/rs/logic':{
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
},
|
|
43
|
+
// '/rs/logic':{
|
|
44
|
+
// target: str3,
|
|
45
|
+
// secure:true,
|
|
46
|
+
// changeOrigin:true
|
|
47
|
+
// // target: 'http://127.0.0.1:8080'
|
|
48
|
+
// },
|
|
49
49
|
'/rs/vue': {
|
|
50
50
|
target: str3,
|
|
51
51
|
secure:true,
|
|
@@ -72,6 +72,18 @@ var proxyTable = {
|
|
|
72
72
|
secure:true,
|
|
73
73
|
changeOrigin:true
|
|
74
74
|
},
|
|
75
|
+
'/rs/sql': {
|
|
76
|
+
target: str
|
|
77
|
+
// secure: true,
|
|
78
|
+
// changeOrigin:true
|
|
79
|
+
// target: 'http://127.0.0.1:8080'
|
|
80
|
+
},
|
|
81
|
+
'/rs/logic': {
|
|
82
|
+
target: str
|
|
83
|
+
// secure: true,
|
|
84
|
+
// changeOrigin:true
|
|
85
|
+
// target: 'http://127.0.0.1:8080'
|
|
86
|
+
},
|
|
75
87
|
'/rs': {
|
|
76
88
|
// target: 'http://192.168.50.199:8300'
|
|
77
89
|
target: str3,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "address-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.86",
|
|
4
4
|
"description": "地址管理前台组件",
|
|
5
5
|
"author": "wanbochao",
|
|
6
6
|
"license": "ISC",
|
|
@@ -78,8 +78,8 @@
|
|
|
78
78
|
"sinon-chai": "^2.8.0",
|
|
79
79
|
"style": "0.0.3",
|
|
80
80
|
"style-loader": "^0.20.3",
|
|
81
|
-
"ldap-clients": "3.0.
|
|
82
|
-
"system-clients": "3.2.
|
|
81
|
+
"ldap-clients": "3.0.48",
|
|
82
|
+
"system-clients": "3.2.68",
|
|
83
83
|
"url-loader": "^0.5.7",
|
|
84
84
|
"vue-client": "1.24.98",
|
|
85
85
|
"vue-hot-reload-api": "^1.2.0",
|
package/src/address.js
CHANGED
|
@@ -49,6 +49,12 @@ export default function (filiale) {
|
|
|
49
49
|
Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
|
|
50
50
|
// 地址管理琉璃
|
|
51
51
|
Vue.component('address-list-liuli', (resolve) => { require(['./components/AddressListLiuLi'], resolve) })
|
|
52
|
+
// 街道办管理
|
|
53
|
+
Vue.component('street-manage-manage', (resolve) => { require(['./components/StreetManage'], resolve) })
|
|
54
|
+
// 街道办列表
|
|
55
|
+
Vue.component('street-manage-list', (resolve) => { require(['./components/StreetManageList'], resolve) })
|
|
56
|
+
// 新增/修改 街道办信息
|
|
57
|
+
Vue.component('add-street-manage-msg', (resolve) => { require(['./components/AddStreetManageMsg'], resolve) })
|
|
52
58
|
// 分公司特殊页面注册替换
|
|
53
59
|
if (filiale) {
|
|
54
60
|
let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="span">
|
|
3
|
+
<validator name='v'>
|
|
4
|
+
<p class="bg-info text-center" style="padding: 8px;">{{ businesstype }}街道办</p>
|
|
5
|
+
<div class="auto select-overspread form-horizontal">
|
|
6
|
+
<div style="text-align:right;margin-top:6px;" class="col-sm-12">
|
|
7
|
+
<!-- 街道办-->
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-6 form-group "
|
|
10
|
+
:class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
|
|
11
|
+
<label class="font_normal_body">省 市 区</label>
|
|
12
|
+
<input type="text" v-show="false" v-model="streetmanagemodel.f_pcd_id"
|
|
13
|
+
v-validate:f_pcd_id='{required: true }'>
|
|
14
|
+
<v-select
|
|
15
|
+
:value.sync="streetmanagemodel.f_pcd_id" :value-single="true"
|
|
16
|
+
:options='pcdslist' placeholder='请选择'
|
|
17
|
+
close-on-select search="true" @change="pcdChange">
|
|
18
|
+
</v-select>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="col-sm-6 form-group "
|
|
21
|
+
:class="[$v.f_street_manage_name.required ? 'has-error' : 'has-success']">
|
|
22
|
+
<label class="font_normal_body">街道办名称</label>
|
|
23
|
+
<input type="text" v-model="streetmanagemodel.f_street_manage_name"
|
|
24
|
+
class="input_search" style="width:60%" placeholder="街道办名称"
|
|
25
|
+
v-validate:f_street_manage_name='{required: true }'>
|
|
26
|
+
</div>
|
|
27
|
+
<div class="col-sm-6 form-group"
|
|
28
|
+
:class="[$v.f_street_manage_number.required ? 'has-error' : 'has-success']">
|
|
29
|
+
<label class="font_normal_body">街道办编号</label>
|
|
30
|
+
<input type="text" v-model="streetmanagemodel.f_street_manage_number"
|
|
31
|
+
@change="streetyanzheng"
|
|
32
|
+
class="input_search" style="width:60%" placeholder="街道办编号"
|
|
33
|
+
v-validate:f_street_manage_number='{required: true }'>
|
|
34
|
+
</div>
|
|
35
|
+
<!-- <div class="col-sm-6 form-group "-->
|
|
36
|
+
<!-- :class="[$v.f_iscity.required ? 'has-error' : 'has-success']">-->
|
|
37
|
+
<!-- <label class="font_normal_body">地区类型</label>-->
|
|
38
|
+
<!-- <input type="text" v-show="false" v-model="streetmanagemodel.f_iscity"-->
|
|
39
|
+
<!-- v-validate:f_iscity='{required: true }'>-->
|
|
40
|
+
<!-- <v-select-->
|
|
41
|
+
<!-- :value.sync="streetmanagemodel.f_iscity" :value-single="true"-->
|
|
42
|
+
<!-- :options='iscity' placeholder='请选择'-->
|
|
43
|
+
<!-- close-on-select>-->
|
|
44
|
+
<!-- </v-select>-->
|
|
45
|
+
<!-- </div>-->
|
|
46
|
+
<div class="col-sm-12 form-group">
|
|
47
|
+
<label class="font_normal_body " style="">备  注</label>
|
|
48
|
+
<textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;"
|
|
49
|
+
v-model="streetmanagemodel.f_comments"></textarea>
|
|
50
|
+
</div>
|
|
51
|
+
</div>
|
|
52
|
+
<div class="row">
|
|
53
|
+
<div style="margin-top:40px;text-align:right;">
|
|
54
|
+
<button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
|
|
55
|
+
<button class="button_clear button_spacing" @click="cancel()">取消</button>
|
|
56
|
+
</div>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
</div>
|
|
60
|
+
</validator>
|
|
61
|
+
</div>
|
|
62
|
+
</template>
|
|
63
|
+
|
|
64
|
+
<script>
|
|
65
|
+
import {HttpResetClass} from 'vue-client'
|
|
66
|
+
|
|
67
|
+
// let getAreaConfig = async function (self) {
|
|
68
|
+
// // 获取气价里面的配置
|
|
69
|
+
// await self.$getConfig(self, 'StreetManage')
|
|
70
|
+
// console.log('原地址配置', self.config)
|
|
71
|
+
// console.log('获取地址配置', self.config)
|
|
72
|
+
// Object.assign(self.model, self.config)
|
|
73
|
+
// }
|
|
74
|
+
export default {
|
|
75
|
+
title: '街道办信息添加',
|
|
76
|
+
data() {
|
|
77
|
+
return {
|
|
78
|
+
//初始化省市区数据
|
|
79
|
+
config: {
|
|
80
|
+
hasnumber: true
|
|
81
|
+
},
|
|
82
|
+
pcdslist: [],
|
|
83
|
+
//街道办
|
|
84
|
+
streetmanagemodel: {
|
|
85
|
+
f_pcd_id: '',
|
|
86
|
+
f_street_manage_id: '',
|
|
87
|
+
slice_area: null,
|
|
88
|
+
f_slice_area: null,
|
|
89
|
+
f_adjustable_id: null,
|
|
90
|
+
f_street_manage_name: '',
|
|
91
|
+
f_comments: '',
|
|
92
|
+
f_street_manage_number: ''
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
props: ['f_filialeids', 'businesstype'],
|
|
97
|
+
ready() {
|
|
98
|
+
this.initdata()
|
|
99
|
+
// getAreaConfig(this)
|
|
100
|
+
},
|
|
101
|
+
methods: {
|
|
102
|
+
async streetyanzheng() {
|
|
103
|
+
console.log(this.streetmanagemodel.f_street_manage_number.length)
|
|
104
|
+
let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
105
|
+
data: {
|
|
106
|
+
items: '*',
|
|
107
|
+
tablename: 't_street_manage',
|
|
108
|
+
orderitem: 'id',
|
|
109
|
+
condition: `f_street_manage_number = '${this.streetmanagemodel.f_street_manage_number}'`
|
|
110
|
+
}
|
|
111
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
112
|
+
if (res.data.length > 0) {
|
|
113
|
+
if (res.data[0].id != this.streetmanagemodel.id) {
|
|
114
|
+
this.$showAlert('当前编号已存在', 'warning', 2000)
|
|
115
|
+
this.streetmanagemodel.f_street_manage_number = ''
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
},
|
|
119
|
+
//根据名字找数据
|
|
120
|
+
findbyid(list, name) {
|
|
121
|
+
var result
|
|
122
|
+
list.forEach((row, n) => {
|
|
123
|
+
if (name == row.id) {
|
|
124
|
+
result = row.data
|
|
125
|
+
}
|
|
126
|
+
})
|
|
127
|
+
return result
|
|
128
|
+
},
|
|
129
|
+
//初始化数据
|
|
130
|
+
initdata() {
|
|
131
|
+
console.log("省市区准备")
|
|
132
|
+
let HttpReset = new HttpResetClass()
|
|
133
|
+
HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
134
|
+
data: {
|
|
135
|
+
items: '*',
|
|
136
|
+
tablename: 't_pcd',
|
|
137
|
+
orderitem: 'id',
|
|
138
|
+
condition: ` f_filialeid = '${this.f_filialeids}'`
|
|
139
|
+
}
|
|
140
|
+
}, {resolveMsg: null, rejectMsg: '获取地址失败!'}).then((req) => {
|
|
141
|
+
let redata = []
|
|
142
|
+
req.data.forEach((row, n) => {
|
|
143
|
+
redata[n] = {
|
|
144
|
+
label: row.f_pcd,
|
|
145
|
+
value: row.id,
|
|
146
|
+
data: row,
|
|
147
|
+
id: row.id
|
|
148
|
+
}
|
|
149
|
+
})
|
|
150
|
+
this.pcdslist = redata
|
|
151
|
+
})
|
|
152
|
+
},
|
|
153
|
+
//省/市/区变化
|
|
154
|
+
pcdChange(val) {
|
|
155
|
+
console.log("省/市/区变化", val)
|
|
156
|
+
this.$resetValidation()
|
|
157
|
+
},
|
|
158
|
+
//保存
|
|
159
|
+
async confirm() {
|
|
160
|
+
await this.savestreet()
|
|
161
|
+
this.clearData()
|
|
162
|
+
this.$dispatch('confirm')
|
|
163
|
+
},
|
|
164
|
+
//保存街道
|
|
165
|
+
async savestreet() {
|
|
166
|
+
this.streetmanagemodel.f_filialeid = this.f_filialeids
|
|
167
|
+
this.streetmanagemodel.f_operator = this.$login.f.name
|
|
168
|
+
this.streetmanagemodel.f_operatorid = this.$login.f.id
|
|
169
|
+
this.streetmanagemodel.f_orgid = this.$login.f.orgid
|
|
170
|
+
this.streetmanagemodel.f_orgname = this.$login.f.orgs
|
|
171
|
+
this.streetmanagemodel.f_depid = this.$login.f.depids
|
|
172
|
+
this.streetmanagemodel.f_depname = this.$login.f.deps
|
|
173
|
+
this.streetmanagemodel.f_pcd = this.findbyid(this.pcdslist, this.streetmanagemodel.f_pcd_id).f_pcd
|
|
174
|
+
console.log('获取街道model', this.streetmanagemodel)
|
|
175
|
+
await this.$resetpost('rs/logic/address_updateStreetManage', this.streetmanagemodel)
|
|
176
|
+
},
|
|
177
|
+
cancel() {
|
|
178
|
+
this.clearData()
|
|
179
|
+
this.$dispatch('cancel')
|
|
180
|
+
},
|
|
181
|
+
clearData() {
|
|
182
|
+
this.streetmanagemodel = {
|
|
183
|
+
f_pcd_id: '',
|
|
184
|
+
f_slice_area: '',
|
|
185
|
+
f_adjustable_id: '',
|
|
186
|
+
f_street_manage_name: '',
|
|
187
|
+
f_street_manage_number: '',
|
|
188
|
+
f_comments: ''
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
},
|
|
193
|
+
watch: {
|
|
194
|
+
'f_filialeids'() {
|
|
195
|
+
if (this.streetmanagemodel.f_filialeid) {
|
|
196
|
+
if (this.streetmanagemodel.f_filialeid != this.f_filialeids) {
|
|
197
|
+
this.$dispatch('cancel')
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
this.initdata()
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
</script>
|