address-client 3.2.104 → 3.2.105-ls
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 +174 -185
- package/package.json +3 -4
- package/src/components/AddAreaMsg.vue +7 -7
- package/src/components/AddCommunityManageMsg.vue +3 -3
- package/src/components/AddStreetManageMsg.vue +3 -3
- package/src/components/AddStreetOrPcd.vue +22 -16
- package/src/components/AddressAddAddress.vue +14 -14
- package/src/components/AddressFiles.vue +1 -1
- package/src/components/AddressList.vue +9 -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/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 +240 -241
- package/src/components/StreetManageList.vue +4 -4
- package/src/components/UserAddress.vue +903 -903
- 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 +435 -435
- package/src/filiale/WEINAN/AreaUserList.vue +3 -3
- package/src/filiale/WEINAN/UserAddress.vue +5 -5
- 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/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 +7 -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 +7 -7
- 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 +392 -379
- 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/xinkang/AddAreaMsg.vue +8 -8
- package/src/filiale/xinkang/AreaList.vue +5 -5
- package/src/filiale/yangchun/AddAreaMsg.vue +756 -756
- package/src/filiale/yangchun/sale.js +7 -7
- 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 +2 -3
- package/build/versionCheck.js +0 -31
- package/src/filiale/lixianV3/AreaList.vue +0 -416
- package/src/filiale/lixianV3/sale.js +0 -12
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
42
42
|
<export-excel :data="$parent.$parent.getCondition"
|
|
43
43
|
:field="$parent.$parent.getfield"
|
|
44
|
-
sqlurl="
|
|
44
|
+
sqlurl="rs/logic/exportfile"
|
|
45
45
|
sql-name="manage_getarealist"
|
|
46
46
|
template-name='小区信息查询导出'
|
|
47
47
|
:choose-col="true"></export-excel>
|
|
@@ -201,7 +201,7 @@
|
|
|
201
201
|
f_slice_area: '',
|
|
202
202
|
f_residential_area: ''
|
|
203
203
|
},
|
|
204
|
-
model: new PagedList('
|
|
204
|
+
model: new PagedList('rs/sql/address_getarealist',20),
|
|
205
205
|
addflag: false,
|
|
206
206
|
addtitle:'',
|
|
207
207
|
getfield: {},
|
|
@@ -256,7 +256,7 @@
|
|
|
256
256
|
async delete(row){
|
|
257
257
|
if(row.id >= 0){
|
|
258
258
|
var id = row.id
|
|
259
|
-
let useraredss = await this.$resetpost('
|
|
259
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
260
260
|
{data: {
|
|
261
261
|
items: 'f_residential_area_id',
|
|
262
262
|
tablename: 't_user_address',
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
if(useraredss.data.length>0){
|
|
267
267
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
268
268
|
}else{
|
|
269
|
-
this.$resetdelete('
|
|
269
|
+
this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
270
270
|
this.$dispatch('cancel')
|
|
271
271
|
})
|
|
272
272
|
}
|
|
@@ -309,7 +309,7 @@
|
|
|
309
309
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
310
310
|
this.showDelete = true
|
|
311
311
|
let condition = `a.f_orgid = '${this.$login.f.orgid}'`
|
|
312
|
-
let req = await this.$resetpost('
|
|
312
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
313
313
|
data: {
|
|
314
314
|
condition: condition
|
|
315
315
|
}
|
|
@@ -341,7 +341,7 @@
|
|
|
341
341
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
342
342
|
oldAreaIds[n] = row.id
|
|
343
343
|
})
|
|
344
|
-
this.$resetpost('
|
|
344
|
+
this.$resetpost('rs/logic/batchDelete',{
|
|
345
345
|
data:{
|
|
346
346
|
areamodel:this.areamodel,
|
|
347
347
|
oldAreaIds:oldAreaIds,
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
19
19
|
<export-excel :data="$parent.$parent.getCondition"
|
|
20
20
|
:field="$parent.$parent.getfield"
|
|
21
|
-
sqlurl="
|
|
21
|
+
sqlurl="rs/logic/exportfile"
|
|
22
22
|
sql-name="manage_getstreetlist"
|
|
23
23
|
template-name='街道信息查询导出'
|
|
24
24
|
:choose-col="true"></export-excel>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
data () {
|
|
117
117
|
return {
|
|
118
118
|
criteriaShow: false,
|
|
119
|
-
model: new PagedList('
|
|
119
|
+
model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
|
|
120
120
|
addflag: false,
|
|
121
121
|
getfield: {},
|
|
122
122
|
//排序
|
|
@@ -161,7 +161,7 @@
|
|
|
161
161
|
async delete(row){
|
|
162
162
|
if(row.id >= 0 ){
|
|
163
163
|
var id = row.id
|
|
164
|
-
let useraredss = await this.$resetpost('
|
|
164
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
165
165
|
{data: {
|
|
166
166
|
items: 'f_street_id',
|
|
167
167
|
tablename: 't_area',
|
|
@@ -171,7 +171,7 @@
|
|
|
171
171
|
if(useraredss.data.length>0){
|
|
172
172
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
173
173
|
}else{
|
|
174
|
-
this.$resetdelete('
|
|
174
|
+
this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
175
175
|
this.$dispatch('cancel')
|
|
176
176
|
})
|
|
177
177
|
}
|
|
@@ -432,7 +432,7 @@
|
|
|
432
432
|
// this.model.f_residential_area_id = null
|
|
433
433
|
// this.model.f_residential_area = null
|
|
434
434
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and (a.f_orgid = '${this.$login.f.orgid}' or a.f_orgid ='1111')`
|
|
435
|
-
let req = await this.$resetpost('
|
|
435
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
436
436
|
data: {
|
|
437
437
|
condition: condition
|
|
438
438
|
}
|
|
@@ -493,7 +493,7 @@
|
|
|
493
493
|
async initpcds(pconditon){
|
|
494
494
|
this.pcdslist = []
|
|
495
495
|
let HttpReset = new HttpResetClass()
|
|
496
|
-
let req = await HttpReset.load('POST', '
|
|
496
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
497
497
|
data: {
|
|
498
498
|
items: '*',
|
|
499
499
|
tablename: 't_pcd',
|
|
@@ -516,7 +516,7 @@
|
|
|
516
516
|
async initstreets(pconditon){
|
|
517
517
|
this.streetslist = []
|
|
518
518
|
let HttpReset = new HttpResetClass()
|
|
519
|
-
let req = await HttpReset.load('POST', '
|
|
519
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
520
520
|
data: {
|
|
521
521
|
items: '*',
|
|
522
522
|
tablename: 't_street',
|
|
@@ -542,7 +542,7 @@
|
|
|
542
542
|
// }
|
|
543
543
|
this.areaslist = []
|
|
544
544
|
let HttpReset = new HttpResetClass()
|
|
545
|
-
let req = await HttpReset.load('POST', '
|
|
545
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
546
546
|
data: {
|
|
547
547
|
items: '*',
|
|
548
548
|
tablename: 't_area',
|
|
@@ -720,7 +720,7 @@
|
|
|
720
720
|
}
|
|
721
721
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
722
722
|
if (res === 'confirm') {
|
|
723
|
-
this.$resetpost('
|
|
723
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
724
724
|
this.cleardara()
|
|
725
725
|
this.$dispatch('confirm')
|
|
726
726
|
})
|
|
@@ -773,7 +773,7 @@
|
|
|
773
773
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
774
774
|
this.model.f_address = this.model.f_street + this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
775
775
|
}
|
|
776
|
-
await this.$resetpost('
|
|
776
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
777
777
|
},
|
|
778
778
|
cancel(){
|
|
779
779
|
this.cleardara()
|
|
@@ -435,7 +435,7 @@
|
|
|
435
435
|
if(this.model.f_iscity) {
|
|
436
436
|
condition = condition + ` and f_iscity = '${this.model.f_iscity}'`
|
|
437
437
|
}
|
|
438
|
-
let req = await this.$resetpost('
|
|
438
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
439
439
|
data: {
|
|
440
440
|
condition: condition
|
|
441
441
|
}
|
|
@@ -496,7 +496,7 @@
|
|
|
496
496
|
async initpcds(pconditon){
|
|
497
497
|
this.pcdslist = []
|
|
498
498
|
let HttpReset = new HttpResetClass()
|
|
499
|
-
let req = await HttpReset.load('POST', '
|
|
499
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
500
500
|
data: {
|
|
501
501
|
items: '*',
|
|
502
502
|
tablename: 't_pcd',
|
|
@@ -519,7 +519,7 @@
|
|
|
519
519
|
async initstreets(pconditon){
|
|
520
520
|
this.streetslist = []
|
|
521
521
|
let HttpReset = new HttpResetClass()
|
|
522
|
-
let req = await HttpReset.load('POST', '
|
|
522
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
523
523
|
data: {
|
|
524
524
|
items: '*',
|
|
525
525
|
tablename: 't_street',
|
|
@@ -545,7 +545,7 @@
|
|
|
545
545
|
// }
|
|
546
546
|
this.areaslist = []
|
|
547
547
|
let HttpReset = new HttpResetClass()
|
|
548
|
-
let req = await HttpReset.load('POST', '
|
|
548
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
549
549
|
data: {
|
|
550
550
|
items: '*',
|
|
551
551
|
tablename: 't_area',
|
|
@@ -723,7 +723,7 @@
|
|
|
723
723
|
}
|
|
724
724
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
725
725
|
if (res === 'confirm') {
|
|
726
|
-
this.$resetpost('
|
|
726
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
727
727
|
this.cleardara()
|
|
728
728
|
this.$dispatch('confirm')
|
|
729
729
|
})
|
|
@@ -776,7 +776,7 @@
|
|
|
776
776
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
777
777
|
this.model.f_address = this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
778
778
|
}
|
|
779
|
-
await this.$resetpost('
|
|
779
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
780
780
|
},
|
|
781
781
|
cancel(){
|
|
782
782
|
this.cleardara()
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
<button class="button_export button_spacing" @click="$parent.$parent.importAddress">导入地址</button>
|
|
44
44
|
<export-excel :data="$parent.$parent.getCondition"
|
|
45
45
|
:field="$parent.$parent.getfield"
|
|
46
|
-
sqlurl="
|
|
46
|
+
sqlurl="rs/logic/exportfile"
|
|
47
47
|
sql-name="addressGetAddress"
|
|
48
48
|
template-name='地址管理查询导出'
|
|
49
49
|
:choose-col="true"></export-excel>
|
|
@@ -192,7 +192,7 @@
|
|
|
192
192
|
data () {
|
|
193
193
|
return {
|
|
194
194
|
criteriaShow: false,
|
|
195
|
-
model: new PagedList('
|
|
195
|
+
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
196
196
|
config: {
|
|
197
197
|
//导出列要和查询列相同
|
|
198
198
|
excelHeaders: {
|
|
@@ -288,11 +288,11 @@
|
|
|
288
288
|
async delete(row){
|
|
289
289
|
if(row.id){
|
|
290
290
|
var id = row.id
|
|
291
|
-
let userfiles = await this.$resetpost('
|
|
291
|
+
let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
292
292
|
if(userfiles.data.length){
|
|
293
293
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
294
294
|
}else{
|
|
295
|
-
this.$resetdelete('
|
|
295
|
+
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
296
296
|
this.$dispatch('cancel')
|
|
297
297
|
})
|
|
298
298
|
}
|
|
@@ -331,7 +331,7 @@
|
|
|
331
331
|
user:this.$login.f
|
|
332
332
|
}
|
|
333
333
|
console.log("filepath="+JSON.stringify(data))
|
|
334
|
-
await this.$resetpost(`
|
|
334
|
+
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
335
335
|
if(res.data.type=="success"){
|
|
336
336
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
337
337
|
}else{
|
|
@@ -403,7 +403,7 @@
|
|
|
403
403
|
async initpcds(pconditon){
|
|
404
404
|
this.pcdslist = []
|
|
405
405
|
let HttpReset = new HttpResetClass()
|
|
406
|
-
let req = await HttpReset.load('POST', '
|
|
406
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
407
407
|
data: {
|
|
408
408
|
items: '*',
|
|
409
409
|
tablename: 't_pcd',
|
|
@@ -426,7 +426,7 @@
|
|
|
426
426
|
async initstreets(pconditon){
|
|
427
427
|
this.streetslist = []
|
|
428
428
|
let HttpReset = new HttpResetClass()
|
|
429
|
-
let req = await HttpReset.load('POST', '
|
|
429
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
430
430
|
data: {
|
|
431
431
|
items: '*',
|
|
432
432
|
tablename: 't_street',
|
|
@@ -452,7 +452,7 @@
|
|
|
452
452
|
// }
|
|
453
453
|
this.areaslist = []
|
|
454
454
|
let HttpReset = new HttpResetClass()
|
|
455
|
-
let req = await HttpReset.load('POST', '
|
|
455
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
456
456
|
data: {
|
|
457
457
|
items: '*',
|
|
458
458
|
tablename: 't_area',
|
|
@@ -664,7 +664,7 @@
|
|
|
664
664
|
}
|
|
665
665
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
666
666
|
if (res === 'confirm') {
|
|
667
|
-
this.$resetpost('
|
|
667
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
668
668
|
this.cleardara()
|
|
669
669
|
this.$dispatch('confirm')
|
|
670
670
|
})
|
|
@@ -709,7 +709,7 @@
|
|
|
709
709
|
this.model.f_address = this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
710
710
|
}
|
|
711
711
|
// console.log("查看f_street",tis.model)
|
|
712
|
-
await this.$resetpost('
|
|
712
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
713
713
|
},
|
|
714
714
|
cancel(){
|
|
715
715
|
this.cleardara()
|
|
@@ -410,7 +410,7 @@
|
|
|
410
410
|
// }
|
|
411
411
|
this.areaslist = []
|
|
412
412
|
let HttpReset = new HttpResetClass()
|
|
413
|
-
let req = await HttpReset.load('POST', '
|
|
413
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
414
414
|
data: {
|
|
415
415
|
items: '*',
|
|
416
416
|
tablename: 't_area',
|
|
@@ -434,7 +434,7 @@
|
|
|
434
434
|
async initpcds(pconditon){
|
|
435
435
|
this.pcdslist = []
|
|
436
436
|
let HttpReset = new HttpResetClass()
|
|
437
|
-
let req = await HttpReset.load('POST', '
|
|
437
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
438
438
|
data: {
|
|
439
439
|
items: '*',
|
|
440
440
|
tablename: 't_pcd',
|
|
@@ -458,7 +458,7 @@
|
|
|
458
458
|
async initstreets(pconditon){
|
|
459
459
|
this.streetslist = []
|
|
460
460
|
let HttpReset = new HttpResetClass()
|
|
461
|
-
let req = await HttpReset.load('POST', '
|
|
461
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
462
462
|
data: {
|
|
463
463
|
items: '*',
|
|
464
464
|
tablename: 't_street',
|
|
@@ -483,7 +483,7 @@
|
|
|
483
483
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
484
484
|
this.areamodel.f_area_id = ''
|
|
485
485
|
}else{
|
|
486
|
-
let res =await this.$resetpost('
|
|
486
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
487
487
|
data: {
|
|
488
488
|
items: '*',
|
|
489
489
|
tablename: 't_area',
|
|
@@ -508,7 +508,7 @@
|
|
|
508
508
|
f_filialeid: this.f_filialeids
|
|
509
509
|
}
|
|
510
510
|
|
|
511
|
-
let res = await this.$resetpost('
|
|
511
|
+
let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败!!'})
|
|
512
512
|
console.log('验证小区是否存在', res)
|
|
513
513
|
if (res.data) {
|
|
514
514
|
this.$showAlert('这个小区编号已存在!!!请核实', 'warning', 3000)
|
|
@@ -585,7 +585,7 @@
|
|
|
585
585
|
this.buildingmodel.f_orgname = this.$login.f.orgs
|
|
586
586
|
this.buildingmodel.f_depid = this.$login.f.depids
|
|
587
587
|
this.buildingmodel.f_depname = this.$login.f.deps
|
|
588
|
-
await this.$resetpost('
|
|
588
|
+
await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
|
|
589
589
|
this.$refs.buildinglist.search()
|
|
590
590
|
},
|
|
591
591
|
//保存小区
|
|
@@ -609,7 +609,7 @@
|
|
|
609
609
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
610
610
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
611
611
|
|
|
612
|
-
await this.$resetpost('
|
|
612
|
+
await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
|
|
613
613
|
},
|
|
614
614
|
cleardara(){
|
|
615
615
|
this.areamodel= {
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
147
147
|
this.streetmodel.f_street_number = ''
|
|
148
148
|
}else{
|
|
149
|
-
let res =await this.$resetpost('
|
|
149
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
150
150
|
data: {
|
|
151
151
|
items: '*',
|
|
152
152
|
tablename: 't_street',
|
|
@@ -168,7 +168,7 @@
|
|
|
168
168
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
169
169
|
this.pcdmodel.f_pcd_number = ''
|
|
170
170
|
}else{
|
|
171
|
-
let res =await this.$resetpost('
|
|
171
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
172
172
|
data: {
|
|
173
173
|
items: '*',
|
|
174
174
|
tablename: 't_pcd',
|
|
@@ -188,7 +188,7 @@
|
|
|
188
188
|
initpcds(pconditon){
|
|
189
189
|
console.log("省市区准备")
|
|
190
190
|
let HttpReset = new HttpResetClass()
|
|
191
|
-
HttpReset.load('POST', '
|
|
191
|
+
HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
192
192
|
data: {
|
|
193
193
|
items: '*',
|
|
194
194
|
tablename: 't_pcd',
|
|
@@ -254,7 +254,7 @@
|
|
|
254
254
|
this.pcdmodel.f_depid = this.$login.f.depids
|
|
255
255
|
this.pcdmodel.f_depname = this.$login.f.deps
|
|
256
256
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
257
|
-
await this.$resetpost('
|
|
257
|
+
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
|
|
258
258
|
},
|
|
259
259
|
//保存街道
|
|
260
260
|
async savestreet(){
|
|
@@ -267,7 +267,7 @@
|
|
|
267
267
|
this.streetmodel.f_depname = this.$login.f.deps
|
|
268
268
|
this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
|
|
269
269
|
console.log('获取街道model', this.streetmodel)
|
|
270
|
-
await this.$resetpost('
|
|
270
|
+
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
|
|
271
271
|
},
|
|
272
272
|
cancel(){
|
|
273
273
|
this.cleardara()
|
|
@@ -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="rs/logic/exportfile"
|
|
48
48
|
sql-name="addressGetAddress"
|
|
49
49
|
template-name='地址管理查询导出'
|
|
50
50
|
:choose-col="true"></export-excel>
|
|
@@ -253,7 +253,7 @@
|
|
|
253
253
|
data () {
|
|
254
254
|
return {
|
|
255
255
|
criteriaShow: false,
|
|
256
|
-
model: new PagedList('
|
|
256
|
+
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
257
257
|
config: {
|
|
258
258
|
// 导出列要和查询列相同
|
|
259
259
|
excelHeaders: {
|
|
@@ -373,11 +373,11 @@
|
|
|
373
373
|
async delete(row){
|
|
374
374
|
if(row.id >= 0){
|
|
375
375
|
var id = row.id
|
|
376
|
-
let userfiles = await this.$resetpost('
|
|
376
|
+
let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
377
377
|
if(userfiles.data.length){
|
|
378
378
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
379
379
|
}else{
|
|
380
|
-
this.$resetdelete('
|
|
380
|
+
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
381
381
|
this.$dispatch('cancel')
|
|
382
382
|
})
|
|
383
383
|
}
|
|
@@ -439,7 +439,7 @@
|
|
|
439
439
|
f_depname: this.$login.f.deps,
|
|
440
440
|
f_filialeid: this.f_filialeids
|
|
441
441
|
}
|
|
442
|
-
this.$resetpost('
|
|
442
|
+
this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
|
|
443
443
|
this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
|
|
444
444
|
this.showModify = false
|
|
445
445
|
this.$refs.paged.$refs.grid.selectInit()
|
|
@@ -455,7 +455,7 @@
|
|
|
455
455
|
async initpcds(pconditon){
|
|
456
456
|
this.pcdslist = []
|
|
457
457
|
let HttpReset = new HttpResetClass()
|
|
458
|
-
let req = await HttpReset.load('POST', '
|
|
458
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
459
459
|
data: {
|
|
460
460
|
items: '*',
|
|
461
461
|
tablename: 't_pcd',
|
|
@@ -479,7 +479,7 @@
|
|
|
479
479
|
async initstreets(pconditon){
|
|
480
480
|
this.streetslist = []
|
|
481
481
|
let HttpReset = new HttpResetClass()
|
|
482
|
-
let req = await HttpReset.load('POST', '
|
|
482
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
483
483
|
data: {
|
|
484
484
|
items: '*',
|
|
485
485
|
tablename: 't_street',
|
|
@@ -502,7 +502,7 @@
|
|
|
502
502
|
async initareas(pconditon){
|
|
503
503
|
this.areaslist = []
|
|
504
504
|
let HttpReset = new HttpResetClass()
|
|
505
|
-
let req = await HttpReset.load('POST', '
|
|
505
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
506
506
|
data: {
|
|
507
507
|
items: '*',
|
|
508
508
|
tablename: 't_area',
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
type :this.imptype
|
|
580
580
|
}
|
|
581
581
|
console.log("filepath="+JSON.stringify(data))
|
|
582
|
-
await this.$resetpost(`
|
|
582
|
+
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
583
583
|
this.isbusy = false
|
|
584
584
|
if(res.data.type=="success"){
|
|
585
585
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
48
48
|
<export-excel :data="$parent.$parent.getCondition"
|
|
49
49
|
:field="$parent.$parent.getfield"
|
|
50
|
-
sqlurl="
|
|
50
|
+
sqlurl="rs/logic/exportfile"
|
|
51
51
|
sql-name="manage_getarealist"
|
|
52
52
|
template-name='小区信息查询导出'
|
|
53
53
|
:choose-col="true"></export-excel>
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
f_slice_area: '',
|
|
213
213
|
f_residential_area: ''
|
|
214
214
|
},
|
|
215
|
-
model: new PagedList('
|
|
215
|
+
model: new PagedList('rs/sql/address_getarealist',20),
|
|
216
216
|
addflag: false,
|
|
217
217
|
addtitle:'',
|
|
218
218
|
getfield: {},
|
|
@@ -270,7 +270,7 @@
|
|
|
270
270
|
async delete(row){
|
|
271
271
|
if(row.id >= 0){
|
|
272
272
|
var id = row.id
|
|
273
|
-
let useraredss = await this.$resetpost('
|
|
273
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
274
274
|
{data: {
|
|
275
275
|
items: 'f_residential_area_id',
|
|
276
276
|
tablename: 't_user_address',
|
|
@@ -280,7 +280,7 @@
|
|
|
280
280
|
if(useraredss.data.length>0){
|
|
281
281
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
282
282
|
}else{
|
|
283
|
-
this.$resetdelete('
|
|
283
|
+
this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
284
284
|
this.$dispatch('cancel')
|
|
285
285
|
})
|
|
286
286
|
}
|
|
@@ -323,7 +323,7 @@
|
|
|
323
323
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
324
324
|
this.showDelete = true
|
|
325
325
|
let condition = `a.f_orgid = '${this.f_filialeids}'`
|
|
326
|
-
let req = await this.$resetpost('
|
|
326
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
327
327
|
data: {
|
|
328
328
|
condition: condition
|
|
329
329
|
}
|
|
@@ -355,7 +355,7 @@
|
|
|
355
355
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
356
356
|
oldAreaIds[n] = row.id
|
|
357
357
|
})
|
|
358
|
-
this.$resetpost('
|
|
358
|
+
this.$resetpost('rs/logic/batchDelete',{
|
|
359
359
|
data:{
|
|
360
360
|
areamodel:this.areamodel,
|
|
361
361
|
oldAreaIds:oldAreaIds,
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
export default {
|
|
64
64
|
data () {
|
|
65
65
|
return {
|
|
66
|
-
model: new PagedList('
|
|
66
|
+
model: new PagedList('rs/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('rs/logic/address_deletebuilding', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: null})
|
|
91
91
|
this.search()
|
|
92
92
|
}
|
|
93
93
|
},
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
24
24
|
<export-excel :data="$parent.$parent.getCondition"
|
|
25
25
|
:field="$parent.$parent.getfield"
|
|
26
|
-
sqlurl="
|
|
26
|
+
sqlurl="rs/logic/exportfile"
|
|
27
27
|
sql-name="manage_getstreetlist"
|
|
28
28
|
template-name='街道信息查询导出'
|
|
29
29
|
:choose-col="true"></export-excel>
|
|
@@ -118,7 +118,7 @@
|
|
|
118
118
|
data () {
|
|
119
119
|
return {
|
|
120
120
|
criteriaShow: false,
|
|
121
|
-
model: new PagedList('
|
|
121
|
+
model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
|
|
122
122
|
addflag: false,
|
|
123
123
|
getfield: {},
|
|
124
124
|
//排序
|
|
@@ -163,7 +163,7 @@
|
|
|
163
163
|
async delete(row){
|
|
164
164
|
if(row.id >= 0 ){
|
|
165
165
|
var id = row.id
|
|
166
|
-
let useraredss = await this.$resetpost('
|
|
166
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
167
167
|
{data: {
|
|
168
168
|
items: 'f_street_id',
|
|
169
169
|
tablename: 't_area',
|
|
@@ -173,7 +173,7 @@
|
|
|
173
173
|
if(useraredss.data.length>0){
|
|
174
174
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
175
175
|
}else{
|
|
176
|
-
this.$resetdelete('
|
|
176
|
+
this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
177
177
|
this.$dispatch('cancel')
|
|
178
178
|
})
|
|
179
179
|
}
|
|
@@ -433,7 +433,7 @@
|
|
|
433
433
|
// this.model.f_residential_area_id = null
|
|
434
434
|
// this.model.f_residential_area = null
|
|
435
435
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.f_filialeids}'`
|
|
436
|
-
let req = await this.$resetpost('
|
|
436
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
437
437
|
data: {
|
|
438
438
|
condition: condition
|
|
439
439
|
}
|
|
@@ -498,7 +498,7 @@
|
|
|
498
498
|
async initpcds(pconditon){
|
|
499
499
|
this.pcdslist = []
|
|
500
500
|
let HttpReset = new HttpResetClass()
|
|
501
|
-
let req = await HttpReset.load('POST', '
|
|
501
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
502
502
|
data: {
|
|
503
503
|
items: '*',
|
|
504
504
|
tablename: 't_pcd',
|
|
@@ -521,7 +521,7 @@
|
|
|
521
521
|
async initstreets(pconditon){
|
|
522
522
|
this.streetslist = []
|
|
523
523
|
let HttpReset = new HttpResetClass()
|
|
524
|
-
let req = await HttpReset.load('POST', '
|
|
524
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
525
525
|
data: {
|
|
526
526
|
items: '*',
|
|
527
527
|
tablename: 't_street',
|
|
@@ -547,7 +547,7 @@
|
|
|
547
547
|
// }
|
|
548
548
|
this.areaslist = []
|
|
549
549
|
let HttpReset = new HttpResetClass()
|
|
550
|
-
let req = await HttpReset.load('POST', '
|
|
550
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
551
551
|
data: {
|
|
552
552
|
items: '*',
|
|
553
553
|
tablename: 't_area',
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
async getbuildingList(pconditon){
|
|
571
571
|
this.buildingList = []
|
|
572
572
|
let HttpReset = new HttpResetClass()
|
|
573
|
-
let req = await HttpReset.load('POST', '
|
|
573
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
574
574
|
data: {
|
|
575
575
|
items: '*',
|
|
576
576
|
tablename: 't_building',
|
|
@@ -764,7 +764,7 @@
|
|
|
764
764
|
}
|
|
765
765
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
766
766
|
if (res === 'confirm') {
|
|
767
|
-
this.$resetpost('
|
|
767
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
768
768
|
this.cleardara()
|
|
769
769
|
this.$dispatch('confirm')
|
|
770
770
|
})
|
|
@@ -829,7 +829,7 @@
|
|
|
829
829
|
console.log('this.model.f_building:',this.model.f_building)
|
|
830
830
|
this.model.f_address = this.model.f_street + this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
831
831
|
}
|
|
832
|
-
await this.$resetpost('
|
|
832
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
833
833
|
},
|
|
834
834
|
cancel(){
|
|
835
835
|
this.cleardara()
|