address-client 3.2.113-yangchun → 3.2.113
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/.gradle/8.5/checksums/checksums.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/file-system.probe +0 -0
- package/build/dev-server.js +14 -3
- package/build/versionCheck.js +31 -0
- package/package.json +5 -4
- package/src/components/AddAreaMsg.vue +481 -470
- package/src/components/AddCommunityManageMsg.vue +3 -3
- package/src/components/AddStreetManageMsg.vue +3 -3
- package/src/components/AddStreetOrPcd.vue +17 -21
- package/src/components/AddressAddAddress.vue +14 -14
- package/src/components/AddressFiles.vue +1 -1
- package/src/components/AddressList.vue +16 -9
- package/src/components/AddressTree.vue +5 -5
- package/src/components/AreaFiles.vue +1 -1
- package/src/components/AreaList.vue +5 -5
- package/src/components/AreaManage.vue +1 -1
- package/src/components/AreaTree.vue +5 -5
- package/src/components/Basch.vue +1 -1
- package/src/components/BatchOrders.vue +6 -6
- package/src/components/BuildingList.vue +2 -2
- package/src/components/CityList.vue +4 -3
- package/src/components/CommunityAreaList.vue +1 -1
- package/src/components/CommunityManageList.vue +4 -4
- package/src/components/NewAddressInfo.vue +4 -4
- package/src/components/StreetList.vue +5 -4
- package/src/components/StreetManageList.vue +4 -4
- package/src/components/UserAddress.vue +33 -44
- package/src/components/UserAddressChange.vue +1 -1
- package/src/components/selectAddress/BatchList.vue +6 -6
- package/src/filiale/WEINAN/AddAreaMsg.vue +5 -5
- package/src/filiale/WEINAN/AddressList.vue +9 -9
- package/src/filiale/WEINAN/AreaList.vue +5 -5
- package/src/filiale/WEINAN/AreaUserList.vue +3 -3
- package/src/filiale/WEINAN/UserAddress.vue +5 -5
- package/src/filiale/bayan/AddAreaMsg.vue +782 -0
- package/src/filiale/bayan/AddStreetOrPcd.vue +348 -0
- package/src/filiale/bayan/AddressList.vue +641 -0
- package/src/filiale/bayan/AreaList.vue +431 -0
- package/src/filiale/bayan/StreetList.vue +245 -0
- package/src/filiale/bayan/UserAddress.vue +924 -0
- package/src/filiale/bayan/sale.js +17 -0
- package/src/filiale/chengtou/UserAddress.vue +6 -6
- package/src/filiale/dongguan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/gaomi/AddressList.vue +6 -6
- package/src/filiale/gaomi/UserAddress.vue +5 -5
- package/src/filiale/gongyi/AddAreaMsg.vue +4 -4
- package/src/filiale/gongyi/UserAddress.vue +5 -5
- package/src/filiale/haile/AddressList.vue +9 -9
- package/src/filiale/jingwei/UserAddress.vue +5 -5
- package/src/filiale/lixianV3/AreaList.vue +5 -5
- package/src/filiale/macheng/AddAreaMsg.vue +4 -4
- package/src/filiale/macheng/AddStreetOrPcd.vue +3 -3
- package/src/filiale/macheng/AddressList.vue +9 -9
- package/src/filiale/macheng/AreaList.vue +4 -4
- package/src/filiale/macheng/StreetList.vue +3 -3
- package/src/filiale/macheng/UserAddress.vue +5 -5
- package/src/filiale/meihekou/UserAddress.vue +6 -6
- package/src/filiale/qianneng/AddAreaMsg.vue +11 -7
- package/src/filiale/qianneng/AddStreetOrPcd.vue +5 -5
- package/src/filiale/qianneng/AddressList.vue +10 -10
- package/src/filiale/qianneng/AreaList.vue +6 -6
- package/src/filiale/qianneng/UserAddress.vue +22 -22
- package/src/filiale/qinhua/AddAreaMsg.vue +7 -7
- package/src/filiale/qinhua/AddressList.vue +9 -9
- package/src/filiale/qinhua/AreaList.vue +6 -6
- package/src/filiale/qinhua/StreetList.vue +4 -4
- package/src/filiale/qinhua/UserAddress.vue +6 -6
- package/src/filiale/rizhao/UserAddress.vue +6 -6
- package/src/filiale/rongcheng/AddressList.vue +5 -5
- package/src/filiale/rongcheng/UserAddress.vue +5 -5
- package/src/filiale/shanggao/AddAreaMsg.vue +7 -7
- package/src/filiale/shanggao/AddStreetOrPcd.vue +5 -5
- package/src/filiale/shanggao/AddressList.vue +9 -9
- package/src/filiale/shanggao/AreaList.vue +6 -6
- package/src/filiale/shanggao/BuildingList.vue +2 -2
- package/src/filiale/shanggao/StreetList.vue +4 -4
- package/src/filiale/shanggao/UserAddress.vue +7 -7
- package/src/filiale/shanxian/AddAreaMsg.vue +7 -7
- package/src/filiale/shanxian/AddressList.vue +9 -9
- package/src/filiale/shanxian/AreaList.vue +6 -6
- package/src/filiale/shanxian/UserAddress.vue +6 -6
- package/src/filiale/shaoguan/AddAreaMsg.vue +4 -4
- package/src/filiale/shaoguan/UserAddress.vue +5 -5
- package/src/filiale/tongchuan/AddAreaMsg.vue +4 -4
- package/src/filiale/tongchuan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/tongchuan/AddressList.vue +5 -5
- package/src/filiale/tongchuan/AreaList.vue +4 -4
- package/src/filiale/tongchuan/CityList.vue +3 -3
- package/src/filiale/tongchuan/StreetList.vue +4 -4
- package/src/filiale/tongchuan/UserAddress.vue +6 -6
- package/src/filiale/wuhai/UserAddress.vue +5 -5
- package/src/filiale/xihu/AreaList.vue +409 -0
- package/src/filiale/xihu/StreetList.vue +238 -0
- package/src/filiale/xihu/sale.js +14 -0
- package/src/filiale/xinkang/AddAreaMsg.vue +8 -8
- package/src/filiale/xinkang/AreaList.vue +5 -5
- package/src/filiale/yangchun/AddAreaMsg.vue +11 -11
- package/src/filiale/zhongsheng/AddressList.vue +10 -10
- package/src/filiale/zhongsheng/AreaList.vue +7 -7
- package/src/filiale/zhongyi/AddAreaMsg.vue +7 -7
- package/src/filiale/zhoukou/AddAreaMsg.vue +5 -5
- package/src/filiale/zhoukou/AddressList.vue +5 -5
- package/src/filiale/zhoukou/AreaList.vue +4 -4
- package/src/filiale/zhoukou/UserAddress.vue +6 -6
- package/src/main.js +3 -3
|
@@ -117,7 +117,7 @@ export default {
|
|
|
117
117
|
methods: {
|
|
118
118
|
async communityyanzheng() {
|
|
119
119
|
console.log(this.communitymodel.f_community_code)
|
|
120
|
-
let res = await this.$resetpost('
|
|
120
|
+
let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
|
|
121
121
|
data: {
|
|
122
122
|
items: '*',
|
|
123
123
|
tablename: 't_community',
|
|
@@ -147,7 +147,7 @@ export default {
|
|
|
147
147
|
this.streetlist = []
|
|
148
148
|
console.log("街道准备")
|
|
149
149
|
let HttpReset = new HttpResetClass()
|
|
150
|
-
HttpReset.load('POST', '
|
|
150
|
+
HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
151
151
|
data: {
|
|
152
152
|
items: '*',
|
|
153
153
|
tablename: 't_street',
|
|
@@ -189,7 +189,7 @@ export default {
|
|
|
189
189
|
this.communitymodel.f_depname = this.$login.f.deps
|
|
190
190
|
this.communitymodel.f_street = this.findbyid(this.streetlist, this.communitymodel.f_street_id).f_street
|
|
191
191
|
console.log('获取社区model', this.communitymodel)
|
|
192
|
-
await this.$resetpost('
|
|
192
|
+
await this.$resetpost('api/af-revenue/logic/address_updateCommunityManage', this.communitymodel)
|
|
193
193
|
},
|
|
194
194
|
cancel() {
|
|
195
195
|
this.clearData()
|
|
@@ -101,7 +101,7 @@ export default {
|
|
|
101
101
|
methods: {
|
|
102
102
|
async streetyanzheng() {
|
|
103
103
|
console.log(this.streetmanagemodel.f_street_manage_number.length)
|
|
104
|
-
let res = await this.$resetpost('
|
|
104
|
+
let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
|
|
105
105
|
data: {
|
|
106
106
|
items: '*',
|
|
107
107
|
tablename: 't_street_manage',
|
|
@@ -130,7 +130,7 @@ export default {
|
|
|
130
130
|
initdata() {
|
|
131
131
|
console.log("省市区准备")
|
|
132
132
|
let HttpReset = new HttpResetClass()
|
|
133
|
-
HttpReset.load('POST', '
|
|
133
|
+
HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
134
134
|
data: {
|
|
135
135
|
items: '*',
|
|
136
136
|
tablename: 't_pcd',
|
|
@@ -172,7 +172,7 @@ export default {
|
|
|
172
172
|
this.streetmanagemodel.f_depname = this.$login.f.deps
|
|
173
173
|
this.streetmanagemodel.f_pcd = this.findbyid(this.pcdslist, this.streetmanagemodel.f_pcd_id).f_pcd
|
|
174
174
|
console.log('获取街道model', this.streetmanagemodel)
|
|
175
|
-
await this.$resetpost('
|
|
175
|
+
await this.$resetpost('api/af-revenue/logic/address_updateStreetManage', this.streetmanagemodel)
|
|
176
176
|
},
|
|
177
177
|
cancel() {
|
|
178
178
|
this.clearData()
|
|
@@ -150,23 +150,18 @@
|
|
|
150
150
|
methods: {
|
|
151
151
|
async streetyanzheng(){
|
|
152
152
|
console.log(this.streetmodel.f_street_number.length)
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
if (res.data.length>0){
|
|
166
|
-
if (res.data[0].id != this.streetmodel.id) {
|
|
167
|
-
this.$showAlert('当前编号已存在', 'warning', 2000)
|
|
168
|
-
this.streetmodel.f_street_number = ''
|
|
169
|
-
}
|
|
153
|
+
let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
|
|
154
|
+
data: {
|
|
155
|
+
items: '*',
|
|
156
|
+
tablename: 't_street',
|
|
157
|
+
orderitem: 'id',
|
|
158
|
+
condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
|
|
159
|
+
}
|
|
160
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
161
|
+
if (res.data.length>0){
|
|
162
|
+
if (res.data[0].id != this.streetmodel.id) {
|
|
163
|
+
this.$showAlert('当前编号已存在', 'warning', 2000)
|
|
164
|
+
this.streetmodel.f_street_number = ''
|
|
170
165
|
}
|
|
171
166
|
}
|
|
172
167
|
},
|
|
@@ -176,7 +171,7 @@
|
|
|
176
171
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
177
172
|
this.pcdmodel.f_pcd_number = ''
|
|
178
173
|
}else{
|
|
179
|
-
let res =await this.$resetpost('
|
|
174
|
+
let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
|
|
180
175
|
data: {
|
|
181
176
|
items: '*',
|
|
182
177
|
tablename: 't_pcd',
|
|
@@ -196,7 +191,7 @@
|
|
|
196
191
|
initpcds(pconditon){
|
|
197
192
|
console.log("省市区准备")
|
|
198
193
|
let HttpReset = new HttpResetClass()
|
|
199
|
-
HttpReset.load('POST', '
|
|
194
|
+
HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
200
195
|
data: {
|
|
201
196
|
items: '*',
|
|
202
197
|
tablename: 't_pcd',
|
|
@@ -245,6 +240,7 @@
|
|
|
245
240
|
async confirm(){
|
|
246
241
|
if(this.areatype=='省市区'){
|
|
247
242
|
await this.savepcd()
|
|
243
|
+
this.$refs.addpcd.search()
|
|
248
244
|
}
|
|
249
245
|
if(this.areatype=='街道'){
|
|
250
246
|
await this.savestreet()
|
|
@@ -262,7 +258,7 @@
|
|
|
262
258
|
this.pcdmodel.f_depid = this.$login.f.depids
|
|
263
259
|
this.pcdmodel.f_depname = this.$login.f.deps
|
|
264
260
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
265
|
-
await this.$resetpost('
|
|
261
|
+
await this.$resetpost('api/af-revenue/logic/address_updatepcd', this.pcdmodel)
|
|
266
262
|
},
|
|
267
263
|
//保存街道
|
|
268
264
|
async savestreet(){
|
|
@@ -275,7 +271,7 @@
|
|
|
275
271
|
this.streetmodel.f_depname = this.$login.f.deps
|
|
276
272
|
this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
|
|
277
273
|
console.log('获取街道model', this.streetmodel)
|
|
278
|
-
await this.$resetpost('
|
|
274
|
+
await this.$resetpost('api/af-revenue/logic/address_updatestreet', this.streetmodel)
|
|
279
275
|
},
|
|
280
276
|
cancel(){
|
|
281
277
|
this.cleardara()
|
|
@@ -72,10 +72,10 @@
|
|
|
72
72
|
//新增 || 修改
|
|
73
73
|
if(val.id != null) {
|
|
74
74
|
console.log("asyncAddChild=" , val)
|
|
75
|
-
result = await self.$resetpost(`
|
|
75
|
+
result = await self.$resetpost(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
|
|
76
76
|
// 添加小区 t_area
|
|
77
77
|
if(val.f_type=='小区') {
|
|
78
|
-
let parent = await self.$resetpost(`
|
|
78
|
+
let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: val.id + ""}, {resolveMsg: null})
|
|
79
79
|
await self.$refs.newaddressinfo.confirm(result.data.id, parent.data)
|
|
80
80
|
}
|
|
81
81
|
} else {
|
|
@@ -95,11 +95,11 @@
|
|
|
95
95
|
throw err = new Error( '该地址已存在' )
|
|
96
96
|
} else {
|
|
97
97
|
console.log("调剂的速度val: ", val)
|
|
98
|
-
result = await self.$resetpost(`
|
|
98
|
+
result = await self.$resetpost(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
|
|
99
99
|
// 添加小区 t_area
|
|
100
100
|
console.log("result=" , result)
|
|
101
101
|
if(result.data && val.f_type=='小区') {
|
|
102
|
-
let parent = await self.$resetpost(`
|
|
102
|
+
let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: result.data.id+""}, {resolveMsg: null})
|
|
103
103
|
await self.$refs.newaddressinfo.confirm(result.data.id, parent.data)
|
|
104
104
|
}
|
|
105
105
|
}
|
|
@@ -111,9 +111,9 @@
|
|
|
111
111
|
let data = {data: {f_parentId: null, condition: `id='${self.f_parentid}'`}}
|
|
112
112
|
let result
|
|
113
113
|
if(num == 1){ //添加
|
|
114
|
-
result = await self.$resetpost('
|
|
114
|
+
result = await self.$resetpost('api/af-revenue/sql/address_getSelf', {data: {id: self.f_parentid}}, {resolveMsg: null})
|
|
115
115
|
} else { //修改
|
|
116
|
-
result = await self.$resetpost('
|
|
116
|
+
result = await self.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: self.model.id}}, {resolveMsg: null})
|
|
117
117
|
}
|
|
118
118
|
if(result.data.length > 0) {
|
|
119
119
|
self.parent = result.data[0]
|
|
@@ -245,9 +245,9 @@
|
|
|
245
245
|
// 添加
|
|
246
246
|
async addinit(val){
|
|
247
247
|
let http = new HttpResetClass()
|
|
248
|
-
let res = await http.load('POST', '
|
|
248
|
+
let res = await http.load('POST', 'api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
|
|
249
249
|
this.parent = res.data.length > 0 ? res.data[0]: {}
|
|
250
|
-
let parent = await http.load('POST', `
|
|
250
|
+
let parent = await http.load('POST', `api/af-revenue/logic/address_parent`, {id: val+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错!!'})
|
|
251
251
|
this.areatype = parent.data.f_area
|
|
252
252
|
},
|
|
253
253
|
// 初始化
|
|
@@ -255,9 +255,9 @@
|
|
|
255
255
|
let data = {data: {f_parentId: null, condition: `id='${this.f_parentid}'`}}
|
|
256
256
|
let result
|
|
257
257
|
if(num == 1){ //添加
|
|
258
|
-
result = await this.$resetpost('
|
|
258
|
+
result = await this.$resetpost('api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
|
|
259
259
|
} else { //修改
|
|
260
|
-
result = await this.$resetpost('
|
|
260
|
+
result = await this.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null})
|
|
261
261
|
}
|
|
262
262
|
if(result.data.length > 0) {
|
|
263
263
|
this.parent = result.data[0]
|
|
@@ -345,7 +345,7 @@
|
|
|
345
345
|
this.isselected = true
|
|
346
346
|
this.$parent.showAddress = !this.$parent.showAddress
|
|
347
347
|
let http = new HttpResetClass()
|
|
348
|
-
http.load('POST', '
|
|
348
|
+
http.load('POST', 'api/af-revenue/logic/address_batch', {id: id.id+"", json: batchs}, {rejectMsg:'批量上传出错', resolveMsg: '地址导入完成'}, 0).then(() => {
|
|
349
349
|
this.$showMessage('导入完成。。!', ['confirm']).then((res) => {
|
|
350
350
|
if (res === 'confirm') {
|
|
351
351
|
this.initModel()
|
|
@@ -356,7 +356,7 @@
|
|
|
356
356
|
}
|
|
357
357
|
})
|
|
358
358
|
// let http = new HttpResetClass()
|
|
359
|
-
// await http.load('POST', `
|
|
359
|
+
// await http.load('POST', `api/af-revenue/logic/address_batch`, {id: id.id+"", json: batchs})
|
|
360
360
|
// this.isselected = true
|
|
361
361
|
// this.initModel()
|
|
362
362
|
// this.$parent.showAddress = !this.$parent.showAddress
|
|
@@ -383,12 +383,12 @@
|
|
|
383
383
|
//
|
|
384
384
|
async getParent(val) {
|
|
385
385
|
let http = new HttpResetClass()
|
|
386
|
-
let parent = await http.load('POST', `
|
|
386
|
+
let parent = await http.load('POST', `api/af-revenue/logic/address_parent`, {id: val.id+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错!!'})
|
|
387
387
|
this.areatype = parent.data.f_area
|
|
388
388
|
|
|
389
389
|
this.model = Object.assign({}, this.model, val)
|
|
390
390
|
|
|
391
|
-
let res = await http.load('POST', '
|
|
391
|
+
let res = await http.load('POST', 'api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null, rejectMsg:'请求address_getParent报错!!'})
|
|
392
392
|
if(res.data.length > 0) {
|
|
393
393
|
this.parent = res.data[0]
|
|
394
394
|
} else {
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
// 是否支持一对多
|
|
103
103
|
oneToMany: false
|
|
104
104
|
},
|
|
105
|
-
model: new PagedList('
|
|
105
|
+
model: new PagedList('api/af-revenue/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
|
|
106
106
|
//分公司id串
|
|
107
107
|
// f_filialeids: this.$login.f.orgid,
|
|
108
108
|
filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
@click="$parent.$parent.importAddress('完善')">完善地址</button>
|
|
45
45
|
<export-excel :data="$parent.$parent.getCondition"
|
|
46
46
|
:field="$parent.$parent.getfield"
|
|
47
|
-
sqlurl="
|
|
47
|
+
sqlurl="api/af-revenue/logic/exportfile"
|
|
48
48
|
sql-name="addressGetAddress"
|
|
49
49
|
template-name='地址管理查询导出'
|
|
50
50
|
:choose-col="true"></export-excel>
|
|
@@ -132,6 +132,11 @@
|
|
|
132
132
|
close-on-select>
|
|
133
133
|
</v-select>
|
|
134
134
|
</div>
|
|
135
|
+
<div :class="$parent.$parent.style">
|
|
136
|
+
<label class="font_normal_body">用户名称</label>
|
|
137
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" style="width:60%"
|
|
138
|
+
condition="f_user_name = '{}'" placeholder="用户名称"/>
|
|
139
|
+
</div>
|
|
135
140
|
</div>
|
|
136
141
|
</div>
|
|
137
142
|
</criteria>
|
|
@@ -139,6 +144,7 @@
|
|
|
139
144
|
<template partial='head'>
|
|
140
145
|
<th><nobr>序号</nobr></th>
|
|
141
146
|
<th><nobr>客户编号</nobr></th>
|
|
147
|
+
<th><nobr>客户名称</nobr></th>
|
|
142
148
|
<th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
|
|
143
149
|
<th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
|
|
144
150
|
<th><nobr>街道/乡镇</nobr></th>
|
|
@@ -157,6 +163,7 @@
|
|
|
157
163
|
<template partial='body'>
|
|
158
164
|
<td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
|
|
159
165
|
<td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
|
|
166
|
+
<td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
|
|
160
167
|
<td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
|
|
161
168
|
<td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
|
|
162
169
|
<td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
|
|
@@ -257,7 +264,7 @@
|
|
|
257
264
|
data () {
|
|
258
265
|
return {
|
|
259
266
|
criteriaShow: false,
|
|
260
|
-
model: new PagedList('
|
|
267
|
+
model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
261
268
|
config: {
|
|
262
269
|
// 导出列要和查询列相同
|
|
263
270
|
excelHeaders: {
|
|
@@ -390,11 +397,11 @@
|
|
|
390
397
|
async delete(row){
|
|
391
398
|
if(row.id >= 0){
|
|
392
399
|
var id = row.id
|
|
393
|
-
let userfiles = await this.$resetpost('
|
|
400
|
+
let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
394
401
|
if(userfiles.data.length){
|
|
395
402
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
396
403
|
}else{
|
|
397
|
-
this.$resetdelete('
|
|
404
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
398
405
|
this.$dispatch('cancel')
|
|
399
406
|
})
|
|
400
407
|
}
|
|
@@ -456,7 +463,7 @@
|
|
|
456
463
|
f_depname: this.$login.f.deps,
|
|
457
464
|
f_filialeid: this.f_filialeids
|
|
458
465
|
}
|
|
459
|
-
this.$resetpost('
|
|
466
|
+
this.$resetpost('api/af-revenue/logic/modifyBatch',modifyBatchData)
|
|
460
467
|
this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
|
|
461
468
|
this.showModify = false
|
|
462
469
|
this.$refs.paged.$refs.grid.selectInit()
|
|
@@ -472,7 +479,7 @@
|
|
|
472
479
|
async initpcds(pconditon){
|
|
473
480
|
this.pcdslist = []
|
|
474
481
|
let HttpReset = new HttpResetClass()
|
|
475
|
-
let req = await HttpReset.load('POST', '
|
|
482
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
476
483
|
data: {
|
|
477
484
|
items: '*',
|
|
478
485
|
tablename: 't_pcd',
|
|
@@ -496,7 +503,7 @@
|
|
|
496
503
|
async initstreets(pconditon){
|
|
497
504
|
this.streetslist = []
|
|
498
505
|
let HttpReset = new HttpResetClass()
|
|
499
|
-
let req = await HttpReset.load('POST', '
|
|
506
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
500
507
|
data: {
|
|
501
508
|
items: '*',
|
|
502
509
|
tablename: 't_street',
|
|
@@ -519,7 +526,7 @@
|
|
|
519
526
|
async initareas(pconditon){
|
|
520
527
|
this.areaslist = []
|
|
521
528
|
let HttpReset = new HttpResetClass()
|
|
522
|
-
let req = await HttpReset.load('POST', '
|
|
529
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
523
530
|
data: {
|
|
524
531
|
items: '*',
|
|
525
532
|
tablename: 't_area',
|
|
@@ -596,7 +603,7 @@
|
|
|
596
603
|
type :this.imptype
|
|
597
604
|
}
|
|
598
605
|
console.log("filepath="+JSON.stringify(data))
|
|
599
|
-
await this.$resetpost(`
|
|
606
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
600
607
|
this.isbusy = false
|
|
601
608
|
if(res.data.type=="success"){
|
|
602
609
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
@@ -369,7 +369,7 @@
|
|
|
369
369
|
id: this.f_location.f_locationId+"",
|
|
370
370
|
type: this.f_location.f_locationType
|
|
371
371
|
}
|
|
372
|
-
let res = await this.$resetpost(`
|
|
372
|
+
let res = await this.$resetpost(`api/af-revenue/logic/address_search`, {data: {condition: condition, login: login}},{resolveMsg: null})
|
|
373
373
|
this.model = res.data
|
|
374
374
|
//刷新dom
|
|
375
375
|
await new Promise(resolve => {
|
|
@@ -441,7 +441,7 @@
|
|
|
441
441
|
}
|
|
442
442
|
// 导入地址
|
|
443
443
|
let asyncImport = async function (self, data) {
|
|
444
|
-
let result = await self.$resetpost(`
|
|
444
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_import`,data, {resolveMsg: '导入成功', rejectMsg: '导入失败', silent: true}, 0)
|
|
445
445
|
return result
|
|
446
446
|
}
|
|
447
447
|
// 获取根地址
|
|
@@ -461,15 +461,15 @@
|
|
|
461
461
|
}
|
|
462
462
|
// 删除地址
|
|
463
463
|
let asyncDelete = async function(self, row, type) {
|
|
464
|
-
let result = await self.$resetpost(`
|
|
464
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
|
|
465
465
|
if(type == '小区') {
|
|
466
|
-
await self.$resetpost(`
|
|
466
|
+
await self.$resetpost(`api/af-revenue/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
|
|
467
467
|
}
|
|
468
468
|
return result
|
|
469
469
|
}
|
|
470
470
|
//查询地址
|
|
471
471
|
let asyncQuery = async function(self, condition, login) {
|
|
472
|
-
let result = await self.$resetpost(`
|
|
472
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_query`, {data: {condition: condition, login: login}},{resolveMsg: null})
|
|
473
473
|
return result
|
|
474
474
|
}
|
|
475
475
|
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
47
47
|
<export-excel :data="$parent.$parent.getCondition"
|
|
48
48
|
:field="$parent.$parent.getfield"
|
|
49
|
-
sqlurl="
|
|
49
|
+
sqlurl="api/af-revenue/logic/exportfile"
|
|
50
50
|
sql-name="manage_getarealist"
|
|
51
51
|
template-name='小区信息查询导出'
|
|
52
52
|
:choose-col="true"></export-excel>
|
|
@@ -191,7 +191,7 @@
|
|
|
191
191
|
return {
|
|
192
192
|
showDelete: false,
|
|
193
193
|
criteriaShow: false,
|
|
194
|
-
model: new PagedList('
|
|
194
|
+
model: new PagedList('api/af-revenue/sql/address_getarealist',20),
|
|
195
195
|
selectDataLen: 0,
|
|
196
196
|
addflag: false,
|
|
197
197
|
addtitle:'',
|
|
@@ -251,7 +251,7 @@
|
|
|
251
251
|
async delete(row){
|
|
252
252
|
if(row.id >= 0){
|
|
253
253
|
var id = row.id
|
|
254
|
-
let useraredss = await this.$resetpost('
|
|
254
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
255
255
|
{data: {
|
|
256
256
|
items: 'f_residential_area_id',
|
|
257
257
|
tablename: 't_user_address',
|
|
@@ -261,7 +261,7 @@
|
|
|
261
261
|
if(useraredss.data.length>0){
|
|
262
262
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
263
263
|
}else{
|
|
264
|
-
this.$resetdelete('
|
|
264
|
+
this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
265
265
|
this.$dispatch('cancel')
|
|
266
266
|
})
|
|
267
267
|
}
|
|
@@ -332,7 +332,7 @@
|
|
|
332
332
|
}
|
|
333
333
|
let oldAreaIds = this.getRowData
|
|
334
334
|
console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
|
|
335
|
-
this.$resetpost('
|
|
335
|
+
this.$resetpost('api/af-revenue/logic/batchDelete',{
|
|
336
336
|
data:{
|
|
337
337
|
oldAreaIds:oldAreaIds,
|
|
338
338
|
f_operator: this.$login.f.name,
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
|
|
68
68
|
}
|
|
69
69
|
if(this.$refs.addareamsg.filtName()){
|
|
70
|
-
|
|
70
|
+
this.$refs.addareamsg.areamodel.selladd='0'}else {
|
|
71
71
|
this.$refs.addareamsg.areamodel.selladd='1'
|
|
72
72
|
}
|
|
73
73
|
// this.$refs.addareamsg.initdata(obj.val)
|
|
@@ -376,7 +376,7 @@
|
|
|
376
376
|
id: this.f_location.f_locationId+"",
|
|
377
377
|
type: this.f_location.f_locationType
|
|
378
378
|
}
|
|
379
|
-
let res = await this.$resetpost(`
|
|
379
|
+
let res = await this.$resetpost(`api/af-revenue/logic/address_search`, {data: {condition: condition, login: login}},{resolveMsg: null})
|
|
380
380
|
this.model = res.data
|
|
381
381
|
//刷新dom
|
|
382
382
|
await new Promise(resolve => {
|
|
@@ -448,7 +448,7 @@
|
|
|
448
448
|
}
|
|
449
449
|
// 导入地址
|
|
450
450
|
let asyncImport = async function (self, data) {
|
|
451
|
-
let result = await self.$resetpost(`
|
|
451
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_import`,data, {resolveMsg: '导入成功', rejectMsg: '导入失败', silent: true}, 0)
|
|
452
452
|
return result
|
|
453
453
|
}
|
|
454
454
|
// 获取根地址
|
|
@@ -468,15 +468,15 @@
|
|
|
468
468
|
}
|
|
469
469
|
// 删除地址
|
|
470
470
|
let asyncDelete = async function(self, row, type) {
|
|
471
|
-
let result = await self.$resetpost(`
|
|
471
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
|
|
472
472
|
if(type == '小区') {
|
|
473
|
-
await self.$resetpost(`
|
|
473
|
+
await self.$resetpost(`api/af-revenue/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
|
|
474
474
|
}
|
|
475
475
|
return result
|
|
476
476
|
}
|
|
477
477
|
//查询地址
|
|
478
478
|
let asyncQuery = async function(self, condition, login) {
|
|
479
|
-
let result = await self.$resetpost(`
|
|
479
|
+
let result = await self.$resetpost(`api/af-revenue/logic/address_query`, {data: {condition: condition, login: login}},{resolveMsg: null})
|
|
480
480
|
return result
|
|
481
481
|
}
|
|
482
482
|
|
package/src/components/Basch.vue
CHANGED
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
batchs.push({type: '门牌号', names: this.name_m})
|
|
60
60
|
}
|
|
61
61
|
console.log(batchs)
|
|
62
|
-
await this.$resetpost(`
|
|
62
|
+
await this.$resetpost(`api/af-revenue/logic/address_batch`, {id: this.id, json: batchs})
|
|
63
63
|
this.$emit('addChild')
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -140,7 +140,7 @@
|
|
|
140
140
|
data () {
|
|
141
141
|
return {
|
|
142
142
|
criteriaShow: false,
|
|
143
|
-
model: new PagedList('
|
|
143
|
+
model: new PagedList('api/af-revenue/sql/address_getUserAddress',20,{}),
|
|
144
144
|
addflag: false,
|
|
145
145
|
addtitle:'',
|
|
146
146
|
|
|
@@ -195,12 +195,12 @@
|
|
|
195
195
|
async delete(row){
|
|
196
196
|
if(row.id){
|
|
197
197
|
var id = row.id
|
|
198
|
-
let service = await this.$resetpost('
|
|
199
|
-
let userfiles = await this.$resetpost('
|
|
198
|
+
let service = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
|
|
199
|
+
let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
200
200
|
if(service.data.length || userfiles.data.length){
|
|
201
201
|
this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
|
|
202
202
|
}else{
|
|
203
|
-
this.$resetdelete('
|
|
203
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
204
204
|
this.$dispatch('cancel')
|
|
205
205
|
})
|
|
206
206
|
}
|
|
@@ -244,7 +244,7 @@
|
|
|
244
244
|
this.all = true
|
|
245
245
|
console.log(this.$refs.paged.$refs.cri.condition,"=============")
|
|
246
246
|
let HttpReset = new HttpResetClass()
|
|
247
|
-
await HttpReset.load('POST', '
|
|
247
|
+
await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
|
|
248
248
|
data: {
|
|
249
249
|
condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
|
|
250
250
|
}
|
|
@@ -292,7 +292,7 @@
|
|
|
292
292
|
user:this.$login.f
|
|
293
293
|
}
|
|
294
294
|
console.log("filepath="+JSON.stringify(data))
|
|
295
|
-
await this.$resetpost(`
|
|
295
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
296
296
|
this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
|
|
297
297
|
//关闭上传框
|
|
298
298
|
this.closeFile()
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
export default {
|
|
64
64
|
data () {
|
|
65
65
|
return {
|
|
66
|
-
model: new PagedList('
|
|
66
|
+
model: new PagedList('api/af-revenue/sql/address_getbuildinglist',20),
|
|
67
67
|
addflag: false,
|
|
68
68
|
getfield: {},
|
|
69
69
|
f_orgid: ''
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
},
|
|
88
88
|
async delete(row){
|
|
89
89
|
if(row.id >= 0 ){
|
|
90
|
-
let useraredss = await this.$resetpost('
|
|
90
|
+
let useraredss = await this.$resetpost('api/af-revenue/logic/address_deletebuilding', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: null})
|
|
91
91
|
this.search()
|
|
92
92
|
}
|
|
93
93
|
},
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
export default {
|
|
58
58
|
data () {
|
|
59
59
|
return {
|
|
60
|
-
model: new PagedList('
|
|
60
|
+
model: new PagedList('api/af-revenue/sql/address_getcitylist',20),
|
|
61
61
|
addflag: false,
|
|
62
62
|
getfield: {},
|
|
63
63
|
f_orgid: ''
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
async delete(row){
|
|
80
80
|
if(row.id >= 0 ){
|
|
81
81
|
var id = row.id
|
|
82
|
-
let useraredss = await this.$resetpost('
|
|
82
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
83
83
|
{data: {
|
|
84
84
|
items: 'f_pcd_id',
|
|
85
85
|
tablename: 't_street',
|
|
@@ -89,7 +89,8 @@
|
|
|
89
89
|
if(useraredss.data.length>0){
|
|
90
90
|
this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
|
|
91
91
|
}else{
|
|
92
|
-
this.$resetdelete('
|
|
92
|
+
this.$resetdelete('api/af-revenue/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
93
|
+
this.search()
|
|
93
94
|
this.$dispatch('cancel')
|
|
94
95
|
})
|
|
95
96
|
}
|
|
@@ -46,7 +46,7 @@ export default {
|
|
|
46
46
|
data () {
|
|
47
47
|
return {
|
|
48
48
|
criteriaShow: false,
|
|
49
|
-
model: new PagedList('
|
|
49
|
+
model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20, {
|
|
50
50
|
tablename: `'t_area'`,
|
|
51
51
|
items: `'f_residential_area,f_area_address'`,
|
|
52
52
|
orderitem: `'f_area_address desc'`
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
39
39
|
<export-excel :data="$parent.$parent.getCondition"
|
|
40
40
|
:field="$parent.$parent.getfield"
|
|
41
|
-
sqlurl="
|
|
41
|
+
sqlurl="api/af-revenue/logic/exportfile"
|
|
42
42
|
sql-name="manage_getCommunityManageList"
|
|
43
43
|
template-name='社区信息查询导出'
|
|
44
44
|
:choose-col="true"></export-excel>
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
data () {
|
|
121
121
|
return {
|
|
122
122
|
criteriaShow: false,
|
|
123
|
-
model: new PagedList('
|
|
123
|
+
model: new PagedList('api/af-revenue/sql/address_getCommunityManageList',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_community_name desc'`}),
|
|
124
124
|
addflag: false,
|
|
125
125
|
getfield: {},
|
|
126
126
|
//排序
|
|
@@ -168,7 +168,7 @@
|
|
|
168
168
|
async delete(row){
|
|
169
169
|
if(row.id >= 0 ){
|
|
170
170
|
var id = row.id
|
|
171
|
-
let useraredss = await this.$resetpost('
|
|
171
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
172
172
|
{data: {
|
|
173
173
|
items: 'id',
|
|
174
174
|
tablename: 't_area',
|
|
@@ -178,7 +178,7 @@
|
|
|
178
178
|
if(useraredss.data.length>0){
|
|
179
179
|
this.$showAlert('该社区下已有小区信息,无法删除!','warning',1000)
|
|
180
180
|
}else{
|
|
181
|
-
this.$resetdelete('
|
|
181
|
+
this.$resetdelete('api/af-revenue/entity/t_community', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
182
182
|
this.$dispatch('cancel')
|
|
183
183
|
})
|
|
184
184
|
}
|