address-client 3.2.105 → 3.2.106-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 +3 -14
- 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/AreaManage.vue +0 -4
- 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 +4 -5
- package/src/components/StreetManageList.vue +4 -4
- package/src/components/UserAddress.vue +10 -17
- 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 +7 -7
- 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 +18 -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/xinkang/AddAreaMsg.vue +8 -8
- package/src/filiale/xinkang/AreaList.vue +5 -5
- package/src/filiale/yangchun/AddAreaMsg.vue +8 -16
- 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/.npmignore +0 -10
- package/build/.npmignore +0 -1
- package/build/versionCheck.js +0 -31
- package/src/filiale/lixianV3/AreaList.vue +0 -416
- package/src/filiale/lixianV3/sale.js +0 -12
|
@@ -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>
|
|
@@ -259,7 +259,7 @@
|
|
|
259
259
|
data () {
|
|
260
260
|
return {
|
|
261
261
|
criteriaShow: false,
|
|
262
|
-
model: new PagedList('
|
|
262
|
+
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'f_create_date desc'`}),
|
|
263
263
|
config: {
|
|
264
264
|
// 导出列要和查询列相同
|
|
265
265
|
excelHeaders: {
|
|
@@ -418,11 +418,11 @@
|
|
|
418
418
|
async delete(row){
|
|
419
419
|
if(row.id >= 0){
|
|
420
420
|
var id = row.id
|
|
421
|
-
let userfiles = await this.$resetpost('
|
|
421
|
+
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})
|
|
422
422
|
if(userfiles.data.length){
|
|
423
423
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
424
424
|
}else{
|
|
425
|
-
this.$resetdelete('
|
|
425
|
+
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
426
426
|
this.$dispatch('cancel')
|
|
427
427
|
})
|
|
428
428
|
}
|
|
@@ -484,7 +484,7 @@
|
|
|
484
484
|
f_depname: this.$login.f.deps,
|
|
485
485
|
f_filialeid: this.f_filialeids
|
|
486
486
|
}
|
|
487
|
-
this.$resetpost('
|
|
487
|
+
this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
|
|
488
488
|
this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
|
|
489
489
|
this.showModify = false
|
|
490
490
|
this.$refs.paged.$refs.grid.selectInit()
|
|
@@ -500,7 +500,7 @@
|
|
|
500
500
|
async initpcds(pconditon){
|
|
501
501
|
this.pcdslist = []
|
|
502
502
|
let HttpReset = new HttpResetClass()
|
|
503
|
-
let req = await HttpReset.load('POST', '
|
|
503
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
504
504
|
data: {
|
|
505
505
|
items: '*',
|
|
506
506
|
tablename: 't_pcd',
|
|
@@ -524,7 +524,7 @@
|
|
|
524
524
|
async initstreets(pconditon){
|
|
525
525
|
this.streetslist = []
|
|
526
526
|
let HttpReset = new HttpResetClass()
|
|
527
|
-
let req = await HttpReset.load('POST', '
|
|
527
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
528
528
|
data: {
|
|
529
529
|
items: '*',
|
|
530
530
|
tablename: 't_street',
|
|
@@ -547,7 +547,7 @@
|
|
|
547
547
|
async initareas(pconditon){
|
|
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', {
|
|
551
551
|
data: {
|
|
552
552
|
items: '*',
|
|
553
553
|
tablename: 't_area',
|
|
@@ -624,7 +624,7 @@
|
|
|
624
624
|
type :this.imptype
|
|
625
625
|
}
|
|
626
626
|
console.log("filepath="+JSON.stringify(data))
|
|
627
|
-
await this.$resetpost(`
|
|
627
|
+
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
628
628
|
this.isbusy = false
|
|
629
629
|
if(res.data.type=="success"){
|
|
630
630
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
@@ -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="rs/logic/exportfile"
|
|
50
50
|
sql-name="manage_getarealist"
|
|
51
51
|
template-name='小区信息查询导出'
|
|
52
52
|
:choose-col="true"></export-excel>
|
|
@@ -211,7 +211,7 @@
|
|
|
211
211
|
f_slice_area: '',
|
|
212
212
|
f_residential_area: ''
|
|
213
213
|
},
|
|
214
|
-
model: new PagedList('
|
|
214
|
+
model: new PagedList('rs/sql/address_getarealist',20, {orderitem: '"f_operate_date DESC"'}),
|
|
215
215
|
// 排序
|
|
216
216
|
orderitem: 'f_operate_date desc',
|
|
217
217
|
orderFields: {
|
|
@@ -292,7 +292,7 @@
|
|
|
292
292
|
async delete(row){
|
|
293
293
|
if(row.id >= 0){
|
|
294
294
|
var id = row.id
|
|
295
|
-
let useraredss = await this.$resetpost('
|
|
295
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
296
296
|
{data: {
|
|
297
297
|
items: 'f_residential_area_id',
|
|
298
298
|
tablename: 't_user_address',
|
|
@@ -302,7 +302,7 @@
|
|
|
302
302
|
if(useraredss.data.length>0){
|
|
303
303
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
304
304
|
}else{
|
|
305
|
-
this.$resetdelete('
|
|
305
|
+
this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
306
306
|
this.$dispatch('cancel')
|
|
307
307
|
})
|
|
308
308
|
}
|
|
@@ -345,7 +345,7 @@
|
|
|
345
345
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
346
346
|
this.showDelete = true
|
|
347
347
|
let condition = `a.f_orgid = '${this.$login.f.orgid}'`
|
|
348
|
-
let req = await this.$resetpost('
|
|
348
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
349
349
|
data: {
|
|
350
350
|
condition: condition
|
|
351
351
|
}
|
|
@@ -377,7 +377,7 @@
|
|
|
377
377
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
378
378
|
oldAreaIds[n] = row.id
|
|
379
379
|
})
|
|
380
|
-
this.$resetpost('
|
|
380
|
+
this.$resetpost('rs/logic/batchDelete',{
|
|
381
381
|
data:{
|
|
382
382
|
areamodel:this.areamodel,
|
|
383
383
|
oldAreaIds:oldAreaIds,
|
|
@@ -439,7 +439,7 @@
|
|
|
439
439
|
// this.model.f_residential_area_id = null
|
|
440
440
|
// this.model.f_residential_area = null
|
|
441
441
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.$login.f.orgid}'`
|
|
442
|
-
let req = await this.$resetpost('
|
|
442
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
443
443
|
data: {
|
|
444
444
|
condition: condition
|
|
445
445
|
}
|
|
@@ -500,7 +500,7 @@
|
|
|
500
500
|
async initpcds(pconditon){
|
|
501
501
|
this.pcdslist = []
|
|
502
502
|
let HttpReset = new HttpResetClass()
|
|
503
|
-
let req = await HttpReset.load('POST', '
|
|
503
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
504
504
|
data: {
|
|
505
505
|
items: '*',
|
|
506
506
|
tablename: 't_pcd',
|
|
@@ -523,7 +523,7 @@
|
|
|
523
523
|
async initstreets(pconditon){
|
|
524
524
|
this.streetslist = []
|
|
525
525
|
let HttpReset = new HttpResetClass()
|
|
526
|
-
let req = await HttpReset.load('POST', '
|
|
526
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
527
527
|
data: {
|
|
528
528
|
items: '*',
|
|
529
529
|
tablename: 't_street',
|
|
@@ -549,7 +549,7 @@
|
|
|
549
549
|
// }
|
|
550
550
|
this.areaslist = []
|
|
551
551
|
let HttpReset = new HttpResetClass()
|
|
552
|
-
let req = await HttpReset.load('POST', '
|
|
552
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
553
553
|
data: {
|
|
554
554
|
items: '*',
|
|
555
555
|
tablename: 't_area',
|
|
@@ -726,7 +726,7 @@
|
|
|
726
726
|
}
|
|
727
727
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
728
728
|
if (res === 'confirm') {
|
|
729
|
-
this.$resetpost('
|
|
729
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
730
730
|
this.cleardara()
|
|
731
731
|
this.$dispatch('confirm')
|
|
732
732
|
})
|
|
@@ -779,7 +779,7 @@
|
|
|
779
779
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
780
780
|
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
|
|
781
781
|
}
|
|
782
|
-
await this.$resetpost('
|
|
782
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
783
783
|
},
|
|
784
784
|
cancel(){
|
|
785
785
|
this.cleardara()
|
|
@@ -351,7 +351,7 @@
|
|
|
351
351
|
async initpcds(pconditon){
|
|
352
352
|
this.pcdslist = []
|
|
353
353
|
let HttpReset = new HttpResetClass()
|
|
354
|
-
let req = await HttpReset.load('POST', '
|
|
354
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
355
355
|
data: {
|
|
356
356
|
items: '*',
|
|
357
357
|
tablename: 't_pcd',
|
|
@@ -375,7 +375,7 @@
|
|
|
375
375
|
async initstreets(pconditon){
|
|
376
376
|
this.streetslist = []
|
|
377
377
|
let HttpReset = new HttpResetClass()
|
|
378
|
-
let req = await HttpReset.load('POST', '
|
|
378
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
379
379
|
data: {
|
|
380
380
|
items: '*',
|
|
381
381
|
tablename: 't_street',
|
|
@@ -404,7 +404,7 @@
|
|
|
404
404
|
f_filialeid: this.f_filialeids
|
|
405
405
|
}
|
|
406
406
|
|
|
407
|
-
let res = await this.$resetpost('
|
|
407
|
+
let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败!!'})
|
|
408
408
|
console.log('验证小区是否存在', res)
|
|
409
409
|
if (res.data) {
|
|
410
410
|
this.$showAlert('这个小区编号已存在!!!请核实', 'warning', 3000)
|
|
@@ -490,7 +490,7 @@
|
|
|
490
490
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
491
491
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
492
492
|
|
|
493
|
-
await this.$resetpost('
|
|
493
|
+
await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
|
|
494
494
|
},
|
|
495
495
|
cleardara(){
|
|
496
496
|
this.areamodel= {
|
|
@@ -397,7 +397,7 @@
|
|
|
397
397
|
async initpcds(pconditon){
|
|
398
398
|
this.pcdslist = []
|
|
399
399
|
let HttpReset = new HttpResetClass()
|
|
400
|
-
let req = await HttpReset.load('POST', '
|
|
400
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
401
401
|
data: {
|
|
402
402
|
items: '*',
|
|
403
403
|
tablename: 't_pcd',
|
|
@@ -420,7 +420,7 @@
|
|
|
420
420
|
async initstreets(pconditon){
|
|
421
421
|
this.streetslist = []
|
|
422
422
|
let HttpReset = new HttpResetClass()
|
|
423
|
-
let req = await HttpReset.load('POST', '
|
|
423
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
424
424
|
data: {
|
|
425
425
|
items: '*',
|
|
426
426
|
tablename: 't_street',
|
|
@@ -446,7 +446,7 @@
|
|
|
446
446
|
// }
|
|
447
447
|
this.areaslist = []
|
|
448
448
|
let HttpReset = new HttpResetClass()
|
|
449
|
-
let req = await HttpReset.load('POST', '
|
|
449
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
450
450
|
data: {
|
|
451
451
|
items: '*',
|
|
452
452
|
tablename: 't_area',
|
|
@@ -624,7 +624,7 @@
|
|
|
624
624
|
}
|
|
625
625
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
626
626
|
if (res === 'confirm') {
|
|
627
|
-
this.$resetpost('
|
|
627
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
628
628
|
this.cleardara()
|
|
629
629
|
this.$dispatch('confirm')
|
|
630
630
|
})
|
|
@@ -677,7 +677,7 @@
|
|
|
677
677
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
678
678
|
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
|
|
679
679
|
}
|
|
680
|
-
await this.$resetpost('
|
|
680
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
681
681
|
},
|
|
682
682
|
cancel(){
|
|
683
683
|
this.cleardara()
|
|
@@ -353,7 +353,7 @@
|
|
|
353
353
|
async initpcds(pconditon){
|
|
354
354
|
this.pcdslist = []
|
|
355
355
|
let HttpReset = new HttpResetClass()
|
|
356
|
-
let req = await HttpReset.load('POST', '
|
|
356
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
357
357
|
data: {
|
|
358
358
|
items: '*',
|
|
359
359
|
tablename: 't_pcd',
|
|
@@ -377,7 +377,7 @@
|
|
|
377
377
|
async initstreets(pconditon){
|
|
378
378
|
this.streetslist = []
|
|
379
379
|
let HttpReset = new HttpResetClass()
|
|
380
|
-
let req = await HttpReset.load('POST', '
|
|
380
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
381
381
|
data: {
|
|
382
382
|
items: '*',
|
|
383
383
|
tablename: 't_street',
|
|
@@ -406,7 +406,7 @@
|
|
|
406
406
|
f_filialeid: this.f_filialeids
|
|
407
407
|
}
|
|
408
408
|
|
|
409
|
-
let res = await this.$resetpost('
|
|
409
|
+
let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败!!'})
|
|
410
410
|
console.log('验证小区是否存在', res)
|
|
411
411
|
if (res.data) {
|
|
412
412
|
this.$showAlert('这个小区编号已存在!!!请核实', 'warning', 3000)
|
|
@@ -492,7 +492,7 @@
|
|
|
492
492
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
493
493
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
494
494
|
|
|
495
|
-
await this.$resetpost('
|
|
495
|
+
await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
|
|
496
496
|
},
|
|
497
497
|
cleardara(){
|
|
498
498
|
this.areamodel= {
|
|
@@ -153,7 +153,7 @@
|
|
|
153
153
|
},
|
|
154
154
|
methods: {
|
|
155
155
|
async streetyanzheng(){
|
|
156
|
-
let res =await this.$resetpost('
|
|
156
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
157
157
|
data: {
|
|
158
158
|
items: '*',
|
|
159
159
|
tablename: 't_street',
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
try{
|
|
175
175
|
console.log("初始化街道办")
|
|
176
176
|
let HttpReset = new HttpResetClass()
|
|
177
|
-
HttpReset.load('POST', '
|
|
177
|
+
HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
178
178
|
data: {
|
|
179
179
|
items: '*',
|
|
180
180
|
tablename: 't_street_manage',
|
|
@@ -203,7 +203,7 @@
|
|
|
203
203
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
204
204
|
this.pcdmodel.f_pcd_number = ''
|
|
205
205
|
}else{
|
|
206
|
-
let res =await this.$resetpost('
|
|
206
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
207
207
|
data: {
|
|
208
208
|
items: '*',
|
|
209
209
|
tablename: 't_pcd',
|
|
@@ -223,7 +223,7 @@
|
|
|
223
223
|
initpcds(pconditon){
|
|
224
224
|
console.log("省市区准备")
|
|
225
225
|
let HttpReset = new HttpResetClass()
|
|
226
|
-
HttpReset.load('POST', '
|
|
226
|
+
HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
227
227
|
data: {
|
|
228
228
|
items: '*',
|
|
229
229
|
tablename: 't_pcd',
|
|
@@ -290,7 +290,7 @@
|
|
|
290
290
|
this.pcdmodel.f_depid = this.$login.f.depids
|
|
291
291
|
this.pcdmodel.f_depname = this.$login.f.deps
|
|
292
292
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
293
|
-
await this.$resetpost('
|
|
293
|
+
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
|
|
294
294
|
},
|
|
295
295
|
//保存街道
|
|
296
296
|
async savestreet(){
|
|
@@ -306,7 +306,7 @@
|
|
|
306
306
|
this.streetmodel.f_street_manage_name=this.findbyid(this.streetmanagelist,this.streetmodel.f_street_manage_id).f_street_manage_name
|
|
307
307
|
}
|
|
308
308
|
console.log('获取街道model', this.streetmodel)
|
|
309
|
-
await this.$resetpost('
|
|
309
|
+
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
|
|
310
310
|
},
|
|
311
311
|
cancel(){
|
|
312
312
|
this.cleardara()
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
@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>
|
|
@@ -131,6 +131,16 @@
|
|
|
131
131
|
close-on-select>
|
|
132
132
|
</v-select>
|
|
133
133
|
</div>
|
|
134
|
+
<div :class="$parent.$parent.style">
|
|
135
|
+
<label class="font_normal_body">客户状态</label>
|
|
136
|
+
<v-select :options='$parent.$parent.userstates'
|
|
137
|
+
:value.sync="model.f_user_state"
|
|
138
|
+
close-on-select
|
|
139
|
+
condition="u.f_user_state='{}'"
|
|
140
|
+
placeholder='客户状态'
|
|
141
|
+
v-model="model.f_user_state">
|
|
142
|
+
</v-select>
|
|
143
|
+
</div>
|
|
134
144
|
</div>
|
|
135
145
|
</div>
|
|
136
146
|
</criteria>
|
|
@@ -205,7 +215,7 @@
|
|
|
205
215
|
data () {
|
|
206
216
|
return {
|
|
207
217
|
criteriaShow: false,
|
|
208
|
-
model: new PagedList('
|
|
218
|
+
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
209
219
|
config: {
|
|
210
220
|
// 导出列要和查询列相同
|
|
211
221
|
excelHeaders: {
|
|
@@ -305,11 +315,11 @@
|
|
|
305
315
|
async delete(row){
|
|
306
316
|
if(row.id >= 0){
|
|
307
317
|
var id = row.id
|
|
308
|
-
let userfiles = await this.$resetpost('
|
|
318
|
+
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})
|
|
309
319
|
if(userfiles.data.length){
|
|
310
320
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
311
321
|
}else{
|
|
312
|
-
this.$resetdelete('
|
|
322
|
+
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
313
323
|
this.$dispatch('cancel')
|
|
314
324
|
})
|
|
315
325
|
}
|
|
@@ -345,7 +355,7 @@
|
|
|
345
355
|
type :this.imptype
|
|
346
356
|
}
|
|
347
357
|
console.log("filepath="+JSON.stringify(data))
|
|
348
|
-
await this.$resetpost(`
|
|
358
|
+
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
349
359
|
this.isbusy = false
|
|
350
360
|
if(res.data.type=="success"){
|
|
351
361
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
@@ -372,6 +382,9 @@
|
|
|
372
382
|
getCondition() {
|
|
373
383
|
return {
|
|
374
384
|
condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
|
|
385
|
+
},
|
|
386
|
+
userstates () {
|
|
387
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
|
|
375
388
|
}
|
|
376
389
|
}
|
|
377
390
|
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
46
46
|
<export-excel :data="$parent.$parent.getCondition"
|
|
47
47
|
:field="$parent.$parent.getfield"
|
|
48
|
-
sqlurl="
|
|
48
|
+
sqlurl="rs/logic/exportfile"
|
|
49
49
|
sql-name="manage_getarealist"
|
|
50
50
|
template-name='小区信息查询导出'
|
|
51
51
|
:choose-col="true"></export-excel>
|
|
@@ -175,7 +175,7 @@
|
|
|
175
175
|
data () {
|
|
176
176
|
return {
|
|
177
177
|
criteriaShow: false,
|
|
178
|
-
model: new PagedList('
|
|
178
|
+
model: new PagedList('rs/sql/address_getarealist',20),
|
|
179
179
|
addflag: false,
|
|
180
180
|
addtitle:'',
|
|
181
181
|
getfield: {},
|
|
@@ -231,7 +231,7 @@
|
|
|
231
231
|
async delete(row){
|
|
232
232
|
if(row.id >= 0){
|
|
233
233
|
var id = row.id
|
|
234
|
-
let useraredss = await this.$resetpost('
|
|
234
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
235
235
|
{data: {
|
|
236
236
|
items: 'f_residential_area_id',
|
|
237
237
|
tablename: 't_user_address',
|
|
@@ -241,7 +241,7 @@
|
|
|
241
241
|
if(useraredss.data.length>0){
|
|
242
242
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
243
243
|
}else{
|
|
244
|
-
this.$resetdelete('
|
|
244
|
+
this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
245
245
|
this.$dispatch('cancel')
|
|
246
246
|
})
|
|
247
247
|
}
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
export default {
|
|
58
58
|
data () {
|
|
59
59
|
return {
|
|
60
|
-
model: new PagedList('
|
|
60
|
+
model: new PagedList('rs/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('rs/sql/address_singleTable',
|
|
83
83
|
{data: {
|
|
84
84
|
items: 'f_pcd_id',
|
|
85
85
|
tablename: 't_street',
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
if(useraredss.data.length>0){
|
|
90
90
|
this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
|
|
91
91
|
}else{
|
|
92
|
-
this.$resetdelete('
|
|
92
|
+
this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
93
93
|
this.$dispatch('cancel')
|
|
94
94
|
})
|
|
95
95
|
}
|
|
@@ -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>
|
|
@@ -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
|
addtitle:'',
|
|
@@ -159,7 +159,7 @@
|
|
|
159
159
|
async delete(row){
|
|
160
160
|
if(row.id >= 0 ){
|
|
161
161
|
var id = row.id
|
|
162
|
-
let useraredss = await this.$resetpost('
|
|
162
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
163
163
|
{data: {
|
|
164
164
|
items: 'f_street_id',
|
|
165
165
|
tablename: 't_area',
|
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
if(useraredss.data.length>0){
|
|
170
170
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
171
171
|
}else{
|
|
172
|
-
this.$resetdelete('
|
|
172
|
+
this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
173
173
|
this.$dispatch('cancel')
|
|
174
174
|
})
|
|
175
175
|
}
|
|
@@ -394,7 +394,7 @@
|
|
|
394
394
|
async changecity(){
|
|
395
395
|
this.areaslist = []
|
|
396
396
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.f_filialeids}'`
|
|
397
|
-
let req = await this.$resetpost('
|
|
397
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
398
398
|
data: {
|
|
399
399
|
condition: condition
|
|
400
400
|
}
|
|
@@ -457,7 +457,7 @@
|
|
|
457
457
|
async initpcds(pconditon){
|
|
458
458
|
this.pcdslist = []
|
|
459
459
|
let HttpReset = new HttpResetClass()
|
|
460
|
-
let req = await HttpReset.load('POST', '
|
|
460
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
461
461
|
data: {
|
|
462
462
|
items: '*',
|
|
463
463
|
tablename: 't_pcd',
|
|
@@ -480,7 +480,7 @@
|
|
|
480
480
|
async initstreets(pconditon){
|
|
481
481
|
this.streetslist = []
|
|
482
482
|
let HttpReset = new HttpResetClass()
|
|
483
|
-
let req = await HttpReset.load('POST', '
|
|
483
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
484
484
|
data: {
|
|
485
485
|
items: '*',
|
|
486
486
|
tablename: 't_street',
|
|
@@ -506,7 +506,7 @@
|
|
|
506
506
|
// }
|
|
507
507
|
this.areaslist = []
|
|
508
508
|
let HttpReset = new HttpResetClass()
|
|
509
|
-
let req = await HttpReset.load('POST', '
|
|
509
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
510
510
|
data: {
|
|
511
511
|
items: '*',
|
|
512
512
|
tablename: 't_area',
|
|
@@ -684,7 +684,7 @@
|
|
|
684
684
|
}
|
|
685
685
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
686
686
|
if (res === 'confirm') {
|
|
687
|
-
this.$resetpost('
|
|
687
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
688
688
|
this.cleardara()
|
|
689
689
|
this.$dispatch('confirm')
|
|
690
690
|
})
|
|
@@ -737,7 +737,7 @@
|
|
|
737
737
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
738
738
|
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
|
|
739
739
|
}
|
|
740
|
-
await this.$resetpost('
|
|
740
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
741
741
|
},
|
|
742
742
|
cancel(){
|
|
743
743
|
this.cleardara()
|
|
@@ -430,7 +430,7 @@
|
|
|
430
430
|
async initpcds(pconditon){
|
|
431
431
|
this.pcdslist = []
|
|
432
432
|
let HttpReset = new HttpResetClass()
|
|
433
|
-
let req = await HttpReset.load('POST', '
|
|
433
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
434
434
|
data: {
|
|
435
435
|
items: '*',
|
|
436
436
|
tablename: 't_pcd',
|
|
@@ -453,7 +453,7 @@
|
|
|
453
453
|
async initstreets(pconditon){
|
|
454
454
|
this.streetslist = []
|
|
455
455
|
let HttpReset = new HttpResetClass()
|
|
456
|
-
let req = await HttpReset.load('POST', '
|
|
456
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
457
457
|
data: {
|
|
458
458
|
items: '*',
|
|
459
459
|
tablename: 't_street',
|
|
@@ -479,7 +479,7 @@
|
|
|
479
479
|
// }
|
|
480
480
|
this.areaslist = []
|
|
481
481
|
let HttpReset = new HttpResetClass()
|
|
482
|
-
let req = await HttpReset.load('POST', '
|
|
482
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
483
483
|
data: {
|
|
484
484
|
items: '*',
|
|
485
485
|
tablename: 't_area',
|
|
@@ -657,7 +657,7 @@
|
|
|
657
657
|
}
|
|
658
658
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
659
659
|
if (res === 'confirm') {
|
|
660
|
-
this.$resetpost('
|
|
660
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
661
661
|
this.cleardara()
|
|
662
662
|
this.$dispatch('confirm')
|
|
663
663
|
})
|
|
@@ -710,7 +710,7 @@
|
|
|
710
710
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
711
711
|
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
|
|
712
712
|
}
|
|
713
|
-
await this.$resetpost('
|
|
713
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
714
714
|
},
|
|
715
715
|
cancel(){
|
|
716
716
|
this.cleardara()
|