address-client 3.0.38-aode → 3.0.39-aodeToV4
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/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.5/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/gradle/wrapper/gradle-wrapper.properties +7 -0
- package/gradlew +249 -0
- package/gradlew.bat +92 -0
- package/package.json +1 -1
- package/src/components/AddAreaMsg.vue +42 -6
- package/src/components/AddStreetOrPcd.vue +3 -3
- package/src/components/AddressAddAddress.vue +14 -14
- package/src/components/AddressFiles.vue +1 -1
- package/src/components/AddressList.vue +7 -7
- package/src/components/AddressTree.vue +6 -6
- package/src/components/AreaFiles.vue +1 -1
- package/src/components/AreaList.vue +9 -12
- package/src/components/AreaTree.vue +6 -6
- package/src/components/Basch.vue +1 -1
- package/src/components/BatchOrders.vue +7 -7
- package/src/components/NewAddressInfo.vue +4 -4
- package/src/components/OneCodeList.vue +1 -1
- package/src/components/StreetList.vue +3 -3
- package/src/components/UserAddress.vue +12 -13
- package/src/components/UserAddressChange.vue +1 -1
- package/src/components/addressts/AddressListts.vue +6 -6
- package/src/components/addressts/UserAddressChangets.vue +1 -1
- package/src/components/addressts/UserAddressts.vue +12 -13
- package/src/components/areauser/AreaUser.vue +3 -3
- package/src/components/selectAddress/BatchList.vue +182 -177
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
43
43
|
<export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.getfield"
|
|
44
44
|
:field="$parent.$parent.getfield"
|
|
45
|
-
sqlurl="
|
|
45
|
+
sqlurl="api/af-revenue/logic/exportfile" sql-name="address_getAddress" template-name='地址导出'
|
|
46
46
|
:choose-col="true"></export-excel>
|
|
47
47
|
<button class="button_export button_spacing" @click="$parent.$parent.importAddress">导入地址</button>
|
|
48
48
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
@@ -159,7 +159,7 @@
|
|
|
159
159
|
</header>
|
|
160
160
|
<article slot="modal-body" class="modal-body">
|
|
161
161
|
<div class="form-group">
|
|
162
|
-
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="
|
|
162
|
+
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
|
|
163
163
|
</div>
|
|
164
164
|
</article>
|
|
165
165
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
@@ -176,7 +176,7 @@
|
|
|
176
176
|
return {
|
|
177
177
|
iswork: false,
|
|
178
178
|
criteriaShow: false,
|
|
179
|
-
model: new PagedList('
|
|
179
|
+
model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
180
180
|
addflag: false,
|
|
181
181
|
addtitle:'',
|
|
182
182
|
condition:'',
|
|
@@ -235,8 +235,8 @@
|
|
|
235
235
|
|
|
236
236
|
if(row.id){
|
|
237
237
|
var id = row.id
|
|
238
|
-
let userfiles = await this.$resetpost('
|
|
239
|
-
let isdelete = await this.$resetpost('
|
|
238
|
+
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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
|
|
239
|
+
let isdelete = await this.$resetpost('api/af-revenue/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
|
|
240
240
|
if(userfiles.data.length){
|
|
241
241
|
this.$showAlert('该地址下已有正常/待开通表具档案,无法删除!','warning',1000)
|
|
242
242
|
return
|
|
@@ -245,7 +245,7 @@
|
|
|
245
245
|
this.$showAlert('该地址下已有正在工作的置换单,无法删除!','warning',1000)
|
|
246
246
|
return
|
|
247
247
|
}
|
|
248
|
-
this.$resetdelete('
|
|
248
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
249
249
|
this.$dispatch('cancel')
|
|
250
250
|
})
|
|
251
251
|
}
|
|
@@ -306,7 +306,7 @@
|
|
|
306
306
|
}
|
|
307
307
|
this.closeFile();
|
|
308
308
|
try{
|
|
309
|
-
await this.$resetpost(`
|
|
309
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
310
310
|
this.$showAlert("导入成功",'success', 2000);
|
|
311
311
|
this.iswork = false
|
|
312
312
|
this.init()
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
</header>
|
|
91
91
|
<article slot="modal-body" class="modal-body">
|
|
92
92
|
<div class="form-group">
|
|
93
|
-
<file-upload class="my-file-uploader" name="addressUploadFile" action="
|
|
93
|
+
<file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
|
|
94
94
|
</div>
|
|
95
95
|
</article>
|
|
96
96
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
@@ -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
|
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
57
57
|
<export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.getfield"
|
|
58
58
|
:field="$parent.$parent.getfield"
|
|
59
|
-
sqlurl="
|
|
59
|
+
sqlurl="api/af-revenue/logic/exportfile" sql-name="address_getarealist" template-name='小区导出'
|
|
60
60
|
:choose-col="true"></export-excel>
|
|
61
61
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
62
62
|
</div>
|
|
@@ -120,11 +120,9 @@
|
|
|
120
120
|
<!--非民用单位信息结束-->
|
|
121
121
|
<th><nobr>片区/管理站 </nobr></th>
|
|
122
122
|
<th><nobr>使用人数 </nobr></th>
|
|
123
|
-
<th><nobr
|
|
123
|
+
<th><nobr>首次通气日期 </nobr></th>
|
|
124
124
|
<th><nobr>通气年限 </nobr></th>
|
|
125
|
-
<th><nobr
|
|
126
|
-
|
|
127
|
-
<!-- <th><nobr>关联地址 </nobr></th>-->
|
|
125
|
+
<th><nobr>关联地址 </nobr></th>
|
|
128
126
|
<th><nobr>操作人</nobr></th>
|
|
129
127
|
<th><nobr>操作日期</nobr></th>
|
|
130
128
|
<th><nobr>操作</nobr></th>
|
|
@@ -156,10 +154,9 @@
|
|
|
156
154
|
<!--非民用单位信息结束-->
|
|
157
155
|
<td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
|
|
158
156
|
<td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.id,row.f_residential_area)" class="btn btn-link">{{row.areacount}}</button></td>
|
|
159
|
-
<td style="text-align:center"><nobr>{{row.addresscount}}</nobr></td>
|
|
160
|
-
<td style="text-align:center"><nobr>{{row.yeardiff}}</nobr></td>
|
|
161
157
|
<td style="text-align:center"><nobr>{{row.open_date}}</nobr></td>
|
|
162
|
-
|
|
158
|
+
<td style="text-align:center"><nobr>{{row.yeardiff}}</nobr></td>
|
|
159
|
+
<td style="text-align:center"><nobr>{{row.addresscount}}</nobr></td>
|
|
163
160
|
<td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
|
|
164
161
|
<td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
|
|
165
162
|
<td><nobr>
|
|
@@ -186,7 +183,7 @@
|
|
|
186
183
|
checkall:false,
|
|
187
184
|
checkitem:[],
|
|
188
185
|
criteriaShow: false,
|
|
189
|
-
model: new PagedList('
|
|
186
|
+
model: new PagedList('api/af-revenue/sql/address_getarealist',50),
|
|
190
187
|
addflag: false,
|
|
191
188
|
addtitle:'',
|
|
192
189
|
condition:'',
|
|
@@ -286,7 +283,7 @@
|
|
|
286
283
|
async delete(row){
|
|
287
284
|
if(row.id){
|
|
288
285
|
var id = row.id
|
|
289
|
-
let useraredss = await this.$resetpost('
|
|
286
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
290
287
|
{data: {
|
|
291
288
|
items: 'f_residential_area_id',
|
|
292
289
|
tablename: 't_user_address',
|
|
@@ -296,7 +293,7 @@
|
|
|
296
293
|
if(useraredss.data.length>0){
|
|
297
294
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
298
295
|
}else{
|
|
299
|
-
this.$resetdelete('
|
|
296
|
+
this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
300
297
|
this.$dispatch('cancel')
|
|
301
298
|
})
|
|
302
299
|
}
|
|
@@ -307,7 +304,7 @@
|
|
|
307
304
|
this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
|
|
308
305
|
if (res === 'confirm') {
|
|
309
306
|
//发出事件,用于建档或修正档案
|
|
310
|
-
this.$resetpost('
|
|
307
|
+
this.$resetpost('api/af-revenue/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
|
|
311
308
|
this.search()
|
|
312
309
|
})
|
|
313
310
|
}
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
</header>
|
|
95
95
|
<article slot="modal-body" class="modal-body">
|
|
96
96
|
<div class="form-group">
|
|
97
|
-
<file-upload class="my-file-uploader" name="addressUploadFile" action="
|
|
97
|
+
<file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
|
|
98
98
|
</div>
|
|
99
99
|
</article>
|
|
100
100
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
@@ -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
|
}
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
</header>
|
|
125
125
|
<article slot="modal-body" class="modal-body">
|
|
126
126
|
<div class="form-group">
|
|
127
|
-
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="
|
|
127
|
+
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
|
|
128
128
|
</div>
|
|
129
129
|
</article>
|
|
130
130
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
@@ -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()
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
|
|
76
76
|
let getMeterType = function * (self) {
|
|
77
77
|
if (self.row) {
|
|
78
|
-
let result = yield self.$resetpost('
|
|
78
|
+
let result = yield self.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${self.row.f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null})
|
|
79
79
|
if (result && result.data.length > 0) {
|
|
80
80
|
console.log('数据格式是神马样子的', result)
|
|
81
81
|
if (result.data[0].f_meter_type === '物联网表') {
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
data.f_state = '有效'
|
|
139
139
|
data.f_delaypay = 0
|
|
140
140
|
console.log("数据参数附属:"+JSON.stringify(data))
|
|
141
|
-
let result = await self.$resetpost('
|
|
141
|
+
let result = await self.$resetpost('api/af-revenue/entity/save/t_area', data)
|
|
142
142
|
// self.$dispatch('success', '新建小区成功', 'new-area-info', data)
|
|
143
143
|
console.log("result=", result.data)
|
|
144
144
|
self.initModel()
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
}
|
|
147
147
|
|
|
148
148
|
let validateAddressGen = function * (self) {
|
|
149
|
-
let areaRes = yield self.$resetpost('
|
|
149
|
+
let areaRes = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_area', condition: `f_residential_area = '${self.model.f_residential_area}' and f_street = '${self.model.f_street}'`}}, {resolveMsg: null, rejectMsg: '验证小区,查询出错!!!!'})
|
|
150
150
|
console.log('查询出的小区,,,', areaRes)
|
|
151
151
|
if (areaRes.data.length > 0) {
|
|
152
152
|
self.$showAlert('小区已存在, 请重新输入', 'danger', 0)
|
|
@@ -191,7 +191,7 @@
|
|
|
191
191
|
// 'model.f_meter_brand' (val) {
|
|
192
192
|
// console.log('val里面是神马', val)
|
|
193
193
|
// if (val && val.length > 0) {
|
|
194
|
-
// this.$resetpost('
|
|
194
|
+
// this.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${val[0].f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
195
195
|
// console.log('res是神马呀', res)
|
|
196
196
|
// if (res.data[0].f_meter_type === '物联网表') {
|
|
197
197
|
// this.viewsee = true
|
|
@@ -205,7 +205,7 @@
|
|
|
205
205
|
export default {
|
|
206
206
|
data() {
|
|
207
207
|
return {
|
|
208
|
-
model: new PagedList('
|
|
208
|
+
model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20,{
|
|
209
209
|
tablename: `'t_code_contract'`,items: `'*'`,
|
|
210
210
|
orderitem: `'id '`})
|
|
211
211
|
}
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
data () {
|
|
102
102
|
return {
|
|
103
103
|
criteriaShow: false,
|
|
104
|
-
model: new PagedList('
|
|
104
|
+
model: new PagedList('api/af-revenue/sql/address_getstreetlist',20),
|
|
105
105
|
addflag: false,
|
|
106
106
|
addtitle:'',
|
|
107
107
|
|
|
@@ -131,7 +131,7 @@
|
|
|
131
131
|
async delete(row){
|
|
132
132
|
if(row.id){
|
|
133
133
|
var id = row.id
|
|
134
|
-
let useraredss = await this.$resetpost('
|
|
134
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
135
135
|
{data: {
|
|
136
136
|
items: 'f_street_id',
|
|
137
137
|
tablename: 't_area',
|
|
@@ -141,7 +141,7 @@
|
|
|
141
141
|
if(useraredss.data.length>0){
|
|
142
142
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
143
143
|
}else{
|
|
144
|
-
this.$resetdelete('
|
|
144
|
+
this.$resetdelete('api/af-revenue/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
145
145
|
this.$dispatch('cancel')
|
|
146
146
|
})
|
|
147
147
|
}
|
|
@@ -66,25 +66,24 @@
|
|
|
66
66
|
close-on-select v-ref:slice>
|
|
67
67
|
</v-select>
|
|
68
68
|
</div>
|
|
69
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
69
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
70
70
|
<label for="f_address" class="font_normal_body">楼  号</label>
|
|
71
71
|
<input type="text" style="width:40%" v-model="model.f_building" class="input_search"
|
|
72
|
-
placeholder="楼号"
|
|
72
|
+
placeholder="楼号"/>
|
|
73
73
|
<input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
|
|
74
74
|
/>
|
|
75
75
|
|
|
76
76
|
</div>
|
|
77
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
77
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
78
78
|
<label for="f_address" class="font_normal_body">单  元</label>
|
|
79
|
-
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
|
|
80
|
-
v-validate:f_unit='{required: true }' />
|
|
79
|
+
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
|
|
81
80
|
<input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
|
|
82
81
|
/>
|
|
83
82
|
</div>
|
|
84
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
83
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
85
84
|
<label for="f_address" class="font_normal_body">楼  层</label>
|
|
86
85
|
<input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
|
|
87
|
-
placeholder="楼层"
|
|
86
|
+
placeholder="楼层" />
|
|
88
87
|
<input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
|
|
89
88
|
/>
|
|
90
89
|
</div>
|
|
@@ -392,7 +391,7 @@
|
|
|
392
391
|
async initAreas (val) {
|
|
393
392
|
if (val) {
|
|
394
393
|
this.sliceArea = [];
|
|
395
|
-
let getAllArea = await this.$resetpost('/
|
|
394
|
+
let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
|
|
396
395
|
data:{
|
|
397
396
|
items: '*',
|
|
398
397
|
tablename: 't_zone',
|
|
@@ -412,7 +411,7 @@
|
|
|
412
411
|
async initpcds(pconditon){
|
|
413
412
|
this.pcdslist = []
|
|
414
413
|
let HttpReset = new HttpResetClass()
|
|
415
|
-
let req = await HttpReset.load('POST', '
|
|
414
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
416
415
|
data: {
|
|
417
416
|
items: '*',
|
|
418
417
|
tablename: 't_pcd',
|
|
@@ -435,7 +434,7 @@
|
|
|
435
434
|
async initstreets(pconditon){
|
|
436
435
|
this.streetslist = []
|
|
437
436
|
let HttpReset = new HttpResetClass()
|
|
438
|
-
let req = await HttpReset.load('POST', '
|
|
437
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
439
438
|
data: {
|
|
440
439
|
items: '*',
|
|
441
440
|
tablename: 't_street',
|
|
@@ -461,7 +460,7 @@
|
|
|
461
460
|
// }
|
|
462
461
|
this.areaslist = []
|
|
463
462
|
let HttpReset = new HttpResetClass()
|
|
464
|
-
let req = await HttpReset.load('POST', '
|
|
463
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
465
464
|
data: {
|
|
466
465
|
items: '*',
|
|
467
466
|
tablename: 't_area',
|
|
@@ -649,7 +648,7 @@
|
|
|
649
648
|
}
|
|
650
649
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
651
650
|
if (res === 'confirm') {
|
|
652
|
-
this.$resetpost('
|
|
651
|
+
this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
653
652
|
this.cleardara()
|
|
654
653
|
this.$dispatch('confirm')
|
|
655
654
|
})
|
|
@@ -697,7 +696,7 @@
|
|
|
697
696
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
698
697
|
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
|
|
699
698
|
}
|
|
700
|
-
await this.$resetpost('
|
|
699
|
+
await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
|
|
701
700
|
},
|
|
702
701
|
cancel(){
|
|
703
702
|
this.cleardara()
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
title: '地址变更列表',
|
|
36
36
|
data () {
|
|
37
37
|
return {
|
|
38
|
-
model: new PagedList('
|
|
38
|
+
model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
|
|
39
39
|
tablename: `'t_address_change'`,items: `'*'`,
|
|
40
40
|
orderitem: `'f_operate_date desc'`}),
|
|
41
41
|
}
|
|
@@ -155,7 +155,7 @@
|
|
|
155
155
|
</header>
|
|
156
156
|
<article slot="modal-body" class="modal-body">
|
|
157
157
|
<div class="form-group">
|
|
158
|
-
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="
|
|
158
|
+
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
|
|
159
159
|
</div>
|
|
160
160
|
</article>
|
|
161
161
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
@@ -172,7 +172,7 @@
|
|
|
172
172
|
return {
|
|
173
173
|
iswork: false,
|
|
174
174
|
criteriaShow: false,
|
|
175
|
-
model: new PagedList('
|
|
175
|
+
model: new PagedList('api/af-revenue/sql/address_getAddress_ts',20,{tablename: `'t_user_address_ts'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
176
176
|
addflag: false,
|
|
177
177
|
addtitle:'',
|
|
178
178
|
|
|
@@ -231,8 +231,8 @@
|
|
|
231
231
|
|
|
232
232
|
if(row.id){
|
|
233
233
|
var id = row.id
|
|
234
|
-
let userfiles = await this.$resetpost('
|
|
235
|
-
// let isdelete = await this.$resetpost('
|
|
234
|
+
let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles_ts',condition: `f_useraddress_id='${id}' and f_table_state in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
|
|
235
|
+
// let isdelete = await this.$resetpost('api/af-revenue/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
|
|
236
236
|
if(userfiles.data.length){
|
|
237
237
|
this.$showAlert('该地址下已有正常/待开通表具档案,无法删除!','warning',1000)
|
|
238
238
|
return
|
|
@@ -241,7 +241,7 @@
|
|
|
241
241
|
// this.$showAlert('该地址下已有正在工作的置换单,无法删除!','warning',1000)
|
|
242
242
|
// return
|
|
243
243
|
// }
|
|
244
|
-
this.$resetdelete('
|
|
244
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address_ts', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
245
245
|
this.$dispatch('cancel')
|
|
246
246
|
})
|
|
247
247
|
}
|
|
@@ -290,7 +290,7 @@
|
|
|
290
290
|
}
|
|
291
291
|
this.closeFile();
|
|
292
292
|
try{
|
|
293
|
-
await this.$resetpost(`
|
|
293
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport_ts`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
294
294
|
this.$showAlert("导入成功",'success', 2000);
|
|
295
295
|
this.iswork = false
|
|
296
296
|
this.init()
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
title: '地址变更列表',
|
|
36
36
|
data () {
|
|
37
37
|
return {
|
|
38
|
-
model: new PagedList('
|
|
38
|
+
model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
|
|
39
39
|
tablename: `'t_address_change_ts'`,items: `'*'`,
|
|
40
40
|
orderitem: `'f_operate_date desc'`}),
|
|
41
41
|
}
|
|
@@ -66,25 +66,24 @@
|
|
|
66
66
|
close-on-select v-ref:slice>
|
|
67
67
|
</v-select>
|
|
68
68
|
</div>
|
|
69
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
69
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
70
70
|
<label for="f_address" class="font_normal_body">楼  号</label>
|
|
71
71
|
<input type="text" style="width:40%" v-model="model.f_building" class="input_search"
|
|
72
|
-
placeholder="楼号"
|
|
72
|
+
placeholder="楼号"/>
|
|
73
73
|
<input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
|
|
74
74
|
/>
|
|
75
75
|
|
|
76
76
|
</div>
|
|
77
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
77
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
78
78
|
<label for="f_address" class="font_normal_body">单  元</label>
|
|
79
|
-
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
|
|
80
|
-
v-validate:f_unit='{required: true }' />
|
|
79
|
+
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
|
|
81
80
|
<input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
|
|
82
81
|
/>
|
|
83
82
|
</div>
|
|
84
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
83
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
85
84
|
<label for="f_address" class="font_normal_body">楼  层</label>
|
|
86
85
|
<input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
|
|
87
|
-
placeholder="楼层"
|
|
86
|
+
placeholder="楼层" />
|
|
88
87
|
<input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
|
|
89
88
|
/>
|
|
90
89
|
</div>
|
|
@@ -352,7 +351,7 @@
|
|
|
352
351
|
async initAreas (val) {
|
|
353
352
|
if (val) {
|
|
354
353
|
this.sliceArea = [];
|
|
355
|
-
let getAllArea = await this.$resetpost('/
|
|
354
|
+
let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
|
|
356
355
|
data:{
|
|
357
356
|
items: '*',
|
|
358
357
|
tablename: 't_zone',
|
|
@@ -372,7 +371,7 @@
|
|
|
372
371
|
async initpcds(pconditon){
|
|
373
372
|
this.pcdslist = []
|
|
374
373
|
let HttpReset = new HttpResetClass()
|
|
375
|
-
let req = await HttpReset.load('POST', '
|
|
374
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
376
375
|
data: {
|
|
377
376
|
items: '*',
|
|
378
377
|
tablename: 't_pcd',
|
|
@@ -395,7 +394,7 @@
|
|
|
395
394
|
async initstreets(pconditon){
|
|
396
395
|
this.streetslist = []
|
|
397
396
|
let HttpReset = new HttpResetClass()
|
|
398
|
-
let req = await HttpReset.load('POST', '
|
|
397
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
399
398
|
data: {
|
|
400
399
|
items: '*',
|
|
401
400
|
tablename: 't_street',
|
|
@@ -421,7 +420,7 @@
|
|
|
421
420
|
// }
|
|
422
421
|
this.areaslist = []
|
|
423
422
|
let HttpReset = new HttpResetClass()
|
|
424
|
-
let req = await HttpReset.load('POST', '
|
|
423
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
425
424
|
data: {
|
|
426
425
|
items: '*',
|
|
427
426
|
tablename: 't_area',
|
|
@@ -608,7 +607,7 @@
|
|
|
608
607
|
}
|
|
609
608
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
610
609
|
if (res === 'confirm') {
|
|
611
|
-
this.$resetpost('
|
|
610
|
+
this.$resetpost('api/af-revenue/logic/address_adduserlist_ts',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
612
611
|
this.cleardara()
|
|
613
612
|
this.$dispatch('confirm')
|
|
614
613
|
})
|
|
@@ -656,7 +655,7 @@
|
|
|
656
655
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
657
656
|
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
|
|
658
657
|
}
|
|
659
|
-
await this.$resetpost('
|
|
658
|
+
await this.$resetpost('api/af-revenue/logic/address_updateuseraddress_ts', this.model)
|
|
660
659
|
},
|
|
661
660
|
cancel(){
|
|
662
661
|
this.cleardara()
|