address-client 3.2.113-yangchun → 3.2.113
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gradle/8.5/checksums/checksums.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/file-system.probe +0 -0
- package/build/dev-server.js +14 -3
- package/build/versionCheck.js +31 -0
- package/package.json +5 -4
- package/src/components/AddAreaMsg.vue +481 -470
- package/src/components/AddCommunityManageMsg.vue +3 -3
- package/src/components/AddStreetManageMsg.vue +3 -3
- package/src/components/AddStreetOrPcd.vue +17 -21
- package/src/components/AddressAddAddress.vue +14 -14
- package/src/components/AddressFiles.vue +1 -1
- package/src/components/AddressList.vue +16 -9
- package/src/components/AddressTree.vue +5 -5
- package/src/components/AreaFiles.vue +1 -1
- package/src/components/AreaList.vue +5 -5
- package/src/components/AreaManage.vue +1 -1
- package/src/components/AreaTree.vue +5 -5
- package/src/components/Basch.vue +1 -1
- package/src/components/BatchOrders.vue +6 -6
- package/src/components/BuildingList.vue +2 -2
- package/src/components/CityList.vue +4 -3
- package/src/components/CommunityAreaList.vue +1 -1
- package/src/components/CommunityManageList.vue +4 -4
- package/src/components/NewAddressInfo.vue +4 -4
- package/src/components/StreetList.vue +5 -4
- package/src/components/StreetManageList.vue +4 -4
- package/src/components/UserAddress.vue +33 -44
- package/src/components/UserAddressChange.vue +1 -1
- package/src/components/selectAddress/BatchList.vue +6 -6
- package/src/filiale/WEINAN/AddAreaMsg.vue +5 -5
- package/src/filiale/WEINAN/AddressList.vue +9 -9
- package/src/filiale/WEINAN/AreaList.vue +5 -5
- package/src/filiale/WEINAN/AreaUserList.vue +3 -3
- package/src/filiale/WEINAN/UserAddress.vue +5 -5
- package/src/filiale/bayan/AddAreaMsg.vue +782 -0
- package/src/filiale/bayan/AddStreetOrPcd.vue +348 -0
- package/src/filiale/bayan/AddressList.vue +641 -0
- package/src/filiale/bayan/AreaList.vue +431 -0
- package/src/filiale/bayan/StreetList.vue +245 -0
- package/src/filiale/bayan/UserAddress.vue +924 -0
- package/src/filiale/bayan/sale.js +17 -0
- package/src/filiale/chengtou/UserAddress.vue +6 -6
- package/src/filiale/dongguan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/gaomi/AddressList.vue +6 -6
- package/src/filiale/gaomi/UserAddress.vue +5 -5
- package/src/filiale/gongyi/AddAreaMsg.vue +4 -4
- package/src/filiale/gongyi/UserAddress.vue +5 -5
- package/src/filiale/haile/AddressList.vue +9 -9
- package/src/filiale/jingwei/UserAddress.vue +5 -5
- package/src/filiale/lixianV3/AreaList.vue +5 -5
- package/src/filiale/macheng/AddAreaMsg.vue +4 -4
- package/src/filiale/macheng/AddStreetOrPcd.vue +3 -3
- package/src/filiale/macheng/AddressList.vue +9 -9
- package/src/filiale/macheng/AreaList.vue +4 -4
- package/src/filiale/macheng/StreetList.vue +3 -3
- package/src/filiale/macheng/UserAddress.vue +5 -5
- package/src/filiale/meihekou/UserAddress.vue +6 -6
- package/src/filiale/qianneng/AddAreaMsg.vue +11 -7
- package/src/filiale/qianneng/AddStreetOrPcd.vue +5 -5
- package/src/filiale/qianneng/AddressList.vue +10 -10
- package/src/filiale/qianneng/AreaList.vue +6 -6
- package/src/filiale/qianneng/UserAddress.vue +22 -22
- package/src/filiale/qinhua/AddAreaMsg.vue +7 -7
- package/src/filiale/qinhua/AddressList.vue +9 -9
- package/src/filiale/qinhua/AreaList.vue +6 -6
- package/src/filiale/qinhua/StreetList.vue +4 -4
- package/src/filiale/qinhua/UserAddress.vue +6 -6
- package/src/filiale/rizhao/UserAddress.vue +6 -6
- package/src/filiale/rongcheng/AddressList.vue +5 -5
- package/src/filiale/rongcheng/UserAddress.vue +5 -5
- package/src/filiale/shanggao/AddAreaMsg.vue +7 -7
- package/src/filiale/shanggao/AddStreetOrPcd.vue +5 -5
- package/src/filiale/shanggao/AddressList.vue +9 -9
- package/src/filiale/shanggao/AreaList.vue +6 -6
- package/src/filiale/shanggao/BuildingList.vue +2 -2
- package/src/filiale/shanggao/StreetList.vue +4 -4
- package/src/filiale/shanggao/UserAddress.vue +7 -7
- package/src/filiale/shanxian/AddAreaMsg.vue +7 -7
- package/src/filiale/shanxian/AddressList.vue +9 -9
- package/src/filiale/shanxian/AreaList.vue +6 -6
- package/src/filiale/shanxian/UserAddress.vue +6 -6
- package/src/filiale/shaoguan/AddAreaMsg.vue +4 -4
- package/src/filiale/shaoguan/UserAddress.vue +5 -5
- package/src/filiale/tongchuan/AddAreaMsg.vue +4 -4
- package/src/filiale/tongchuan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/tongchuan/AddressList.vue +5 -5
- package/src/filiale/tongchuan/AreaList.vue +4 -4
- package/src/filiale/tongchuan/CityList.vue +3 -3
- package/src/filiale/tongchuan/StreetList.vue +4 -4
- package/src/filiale/tongchuan/UserAddress.vue +6 -6
- package/src/filiale/wuhai/UserAddress.vue +5 -5
- package/src/filiale/xihu/AreaList.vue +409 -0
- package/src/filiale/xihu/StreetList.vue +238 -0
- package/src/filiale/xihu/sale.js +14 -0
- package/src/filiale/xinkang/AddAreaMsg.vue +8 -8
- package/src/filiale/xinkang/AreaList.vue +5 -5
- package/src/filiale/yangchun/AddAreaMsg.vue +11 -11
- package/src/filiale/zhongsheng/AddressList.vue +10 -10
- package/src/filiale/zhongsheng/AreaList.vue +7 -7
- package/src/filiale/zhongyi/AddAreaMsg.vue +7 -7
- package/src/filiale/zhoukou/AddAreaMsg.vue +5 -5
- package/src/filiale/zhoukou/AddressList.vue +5 -5
- package/src/filiale/zhoukou/AreaList.vue +4 -4
- package/src/filiale/zhoukou/UserAddress.vue +6 -6
- package/src/main.js +3 -3
|
@@ -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/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
|
|
@@ -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="api/af-revenue/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('api/af-revenue/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
|
//排序
|
|
@@ -150,6 +150,7 @@
|
|
|
150
150
|
}
|
|
151
151
|
},
|
|
152
152
|
ready(){
|
|
153
|
+
console.log("===========",this.$login.f.orgid)
|
|
153
154
|
readyGen(this)
|
|
154
155
|
this.search()
|
|
155
156
|
},
|
|
@@ -163,7 +164,7 @@
|
|
|
163
164
|
async delete(row){
|
|
164
165
|
if(row.id >= 0 ){
|
|
165
166
|
var id = row.id
|
|
166
|
-
let useraredss = await this.$resetpost('
|
|
167
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
167
168
|
{data: {
|
|
168
169
|
items: 'f_street_id',
|
|
169
170
|
tablename: 't_area',
|
|
@@ -173,7 +174,7 @@
|
|
|
173
174
|
if(useraredss.data.length>0){
|
|
174
175
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
175
176
|
}else{
|
|
176
|
-
this.$resetdelete('
|
|
177
|
+
this.$resetdelete('api/af-revenue/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
177
178
|
this.$dispatch('cancel')
|
|
178
179
|
})
|
|
179
180
|
}
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
28
28
|
<export-excel :data="$parent.$parent.getCondition"
|
|
29
29
|
:field="$parent.$parent.getfield"
|
|
30
|
-
sqlurl="
|
|
30
|
+
sqlurl="api/af-revenue/logic/exportfile"
|
|
31
31
|
sql-name="manage_getStreetManageList"
|
|
32
32
|
template-name='街道办信息查询导出'
|
|
33
33
|
:choose-col="true"></export-excel>
|
|
@@ -112,7 +112,7 @@
|
|
|
112
112
|
data () {
|
|
113
113
|
return {
|
|
114
114
|
criteriaShow: false,
|
|
115
|
-
model: new PagedList('
|
|
115
|
+
model: new PagedList('api/af-revenue/sql/address_getStreetManageList',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_iscity,f_street_manage_name desc'`}),
|
|
116
116
|
addflag: false,
|
|
117
117
|
getfield: {},
|
|
118
118
|
//排序
|
|
@@ -152,7 +152,7 @@
|
|
|
152
152
|
async delete(row){
|
|
153
153
|
if(row.id >= 0 ){
|
|
154
154
|
var id = row.id
|
|
155
|
-
let useraredss = await this.$resetpost('
|
|
155
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
156
156
|
{data: {
|
|
157
157
|
items: 'id',
|
|
158
158
|
tablename: 't_street',
|
|
@@ -162,7 +162,7 @@
|
|
|
162
162
|
if(useraredss.data.length>0){
|
|
163
163
|
this.$showAlert('该街道办下已有街道信息,无法删除!','warning',1000)
|
|
164
164
|
}else{
|
|
165
|
-
this.$resetdelete('
|
|
165
|
+
this.$resetdelete('api/af-revenue/entity/t_street_manage', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
166
166
|
this.$dispatch('cancel')
|
|
167
167
|
})
|
|
168
168
|
}
|
|
@@ -74,10 +74,8 @@
|
|
|
74
74
|
</v-select>
|
|
75
75
|
</div>
|
|
76
76
|
|
|
77
|
-
<div class="col-sm-6 form-group "
|
|
77
|
+
<div class="col-sm-6 form-group ">
|
|
78
78
|
<label class="font_normal_body">片  区</label>
|
|
79
|
-
<input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
|
|
80
|
-
>
|
|
81
79
|
<v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"
|
|
82
80
|
:options='sliceArea' placeholder='片区/管理站' filer-key="name"
|
|
83
81
|
close-on-select v-ref:slice>
|
|
@@ -166,12 +164,12 @@
|
|
|
166
164
|
v-validate:f_contracts_number='{required: true }'>
|
|
167
165
|
</div>
|
|
168
166
|
<div class="col-sm-12 form-group" style="margin-bottom: 12px;margin-top: 12px;">
|
|
169
|
-
<label class="font_normal_body"
|
|
167
|
+
<label class="font_normal_body">小区备注</label>
|
|
170
168
|
<textarea class="input_textarea" rows="3" style="width:80%; height:auto;" v-model="model.f_comments1"></textarea>
|
|
171
169
|
</div>
|
|
172
|
-
<div class="col-sm-12 form-group">
|
|
173
|
-
<label
|
|
174
|
-
<textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height:
|
|
170
|
+
<div class="col-sm-12 form-group" style="margin-top: 12px; margin-bottom: 12px;">
|
|
171
|
+
<label class="font_normal_body">备  注</label>
|
|
172
|
+
<textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%; height:auto;" v-model="model.f_comments"></textarea>
|
|
175
173
|
</div>
|
|
176
174
|
<div style="text-align:right;margin-top:40px;margin-right:50px;" class="col-sm-12">
|
|
177
175
|
<button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
|
|
@@ -212,15 +210,15 @@
|
|
|
212
210
|
close-on-select search="true">
|
|
213
211
|
</v-select>
|
|
214
212
|
</div>
|
|
215
|
-
<div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']"
|
|
216
|
-
<label class="font_normal_body">片  区</label
|
|
217
|
-
<input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
|
|
218
|
-
|
|
219
|
-
<v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"
|
|
220
|
-
:options='sliceArea' placeholder='片区/管理站' filer-key="name"
|
|
221
|
-
close-on-select v-ref:slice
|
|
222
|
-
</v-select
|
|
223
|
-
</div
|
|
213
|
+
<!-- <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">-->
|
|
214
|
+
<!-- <label class="font_normal_body">片  区</label>-->
|
|
215
|
+
<!-- <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
|
|
216
|
+
<!-- >-->
|
|
217
|
+
<!-- <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
|
|
218
|
+
<!-- :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
|
|
219
|
+
<!-- close-on-select v-ref:slice>-->
|
|
220
|
+
<!-- </v-select>-->
|
|
221
|
+
<!-- </div>-->
|
|
224
222
|
|
|
225
223
|
<div class="col-sm-6 form-group "
|
|
226
224
|
:class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
|
|
@@ -307,11 +305,6 @@
|
|
|
307
305
|
<div class="col-sm-10 form-group ">
|
|
308
306
|
<p class="navbar-text" style="margin-left: 10%">说明: 层数输入1,门牌号输入001。产生的最终门牌号显示1001</p>
|
|
309
307
|
</div>
|
|
310
|
-
|
|
311
|
-
<div class="col-sm-12 form-group" style="margin-bottom: 12px;margin-top: 12px;">
|
|
312
|
-
<label class="font_normal_body" >小区备注</label>
|
|
313
|
-
<textarea class="input_textarea" rows="3" style="width:80%; height:auto;" v-model="model.f_comments1"></textarea>
|
|
314
|
-
</div>
|
|
315
308
|
<div class="col-sm-12 form-group">
|
|
316
309
|
<label class="font_normal_body " style="margin-top:-20px">备  注</label>
|
|
317
310
|
<textarea class="input_textarea" rows="3" style="width:80%;height: auto;" v-model="model.f_comments"></textarea>
|
|
@@ -326,17 +319,17 @@
|
|
|
326
319
|
</div>
|
|
327
320
|
</validator>
|
|
328
321
|
|
|
329
|
-
<modal v-if="isshow" :show.sync="isshow" large backdrop="false" :width="900"
|
|
330
|
-
<header slot="modal-header" class="modal-header"
|
|
331
|
-
</header
|
|
332
|
-
<article slot="modal-body" class="modal-body"
|
|
333
|
-
<amap-location :islocationclearmark="false" dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location
|
|
334
|
-
</article
|
|
335
|
-
<footer slot="modal-footer" class="modal-footer"
|
|
336
|
-
<button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button
|
|
337
|
-
<button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button
|
|
338
|
-
</footer
|
|
339
|
-
</modal
|
|
322
|
+
<!-- <modal v-if="isshow" :show.sync="isshow" large backdrop="false" :width="900">-->
|
|
323
|
+
<!-- <header slot="modal-header" class="modal-header">-->
|
|
324
|
+
<!-- </header>-->
|
|
325
|
+
<!-- <article slot="modal-body" class="modal-body">-->
|
|
326
|
+
<!-- <amap-location :islocationclearmark="false" dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>-->
|
|
327
|
+
<!-- </article>-->
|
|
328
|
+
<!-- <footer slot="modal-footer" class="modal-footer">-->
|
|
329
|
+
<!-- <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>-->
|
|
330
|
+
<!-- <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>-->
|
|
331
|
+
<!-- </footer>-->
|
|
332
|
+
<!-- </modal>-->
|
|
340
333
|
|
|
341
334
|
</div>
|
|
342
335
|
</template>
|
|
@@ -379,8 +372,8 @@
|
|
|
379
372
|
model: {
|
|
380
373
|
f_pcd_id: '',
|
|
381
374
|
f_street_id: '',
|
|
382
|
-
f_comments:'',
|
|
383
375
|
f_comments1:'',
|
|
376
|
+
f_comments:'',
|
|
384
377
|
f_residential_area_id: '',
|
|
385
378
|
f_pcd: '',
|
|
386
379
|
f_street: '',
|
|
@@ -444,7 +437,7 @@
|
|
|
444
437
|
if(this.model.f_iscity) {
|
|
445
438
|
condition = condition + ` and f_iscity = '${this.model.f_iscity}'`
|
|
446
439
|
}
|
|
447
|
-
let req = await this.$resetpost('
|
|
440
|
+
let req = await this.$resetpost('api/af-revenue/sql/address_getresidential', {
|
|
448
441
|
data: {
|
|
449
442
|
condition: condition
|
|
450
443
|
}
|
|
@@ -505,7 +498,7 @@
|
|
|
505
498
|
async initpcds(pconditon){
|
|
506
499
|
this.pcdslist = []
|
|
507
500
|
let HttpReset = new HttpResetClass()
|
|
508
|
-
let req = await HttpReset.load('POST', '
|
|
501
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
509
502
|
data: {
|
|
510
503
|
items: '*',
|
|
511
504
|
tablename: 't_pcd',
|
|
@@ -528,7 +521,7 @@
|
|
|
528
521
|
async initstreets(pconditon){
|
|
529
522
|
this.streetslist = []
|
|
530
523
|
let HttpReset = new HttpResetClass()
|
|
531
|
-
let req = await HttpReset.load('POST', '
|
|
524
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
532
525
|
data: {
|
|
533
526
|
items: '*',
|
|
534
527
|
tablename: 't_street',
|
|
@@ -554,7 +547,7 @@
|
|
|
554
547
|
// }
|
|
555
548
|
this.areaslist = []
|
|
556
549
|
let HttpReset = new HttpResetClass()
|
|
557
|
-
let req = await HttpReset.load('POST', '
|
|
550
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
558
551
|
data: {
|
|
559
552
|
items: '*',
|
|
560
553
|
tablename: 't_area',
|
|
@@ -572,10 +565,7 @@
|
|
|
572
565
|
})
|
|
573
566
|
})
|
|
574
567
|
this.areaslist=redata
|
|
575
|
-
console.log('看看modal',this.model)
|
|
576
|
-
console.log('小区', redata)
|
|
577
568
|
this.areaChange(this.model.f_residential_area_id)
|
|
578
|
-
console.log(this.model.f_residential_area_id)
|
|
579
569
|
},
|
|
580
570
|
//省/市/区变化
|
|
581
571
|
async pcdChange(val){
|
|
@@ -633,7 +623,6 @@
|
|
|
633
623
|
this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
|
|
634
624
|
this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
|
|
635
625
|
this.model.f_slice_area = selectArea.f_slice_area
|
|
636
|
-
this.model.f_comments1=selectArea.f_comments
|
|
637
626
|
// 拼接地址
|
|
638
627
|
this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
|
|
639
628
|
}
|
|
@@ -737,7 +726,7 @@
|
|
|
737
726
|
}
|
|
738
727
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
739
728
|
if (res === 'confirm') {
|
|
740
|
-
this.$resetpost('
|
|
729
|
+
this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
741
730
|
this.cleardara()
|
|
742
731
|
this.$dispatch('confirm')
|
|
743
732
|
})
|
|
@@ -781,7 +770,7 @@
|
|
|
781
770
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
782
771
|
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
|
|
783
772
|
}
|
|
784
|
-
await this.$resetpost('
|
|
773
|
+
await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
|
|
785
774
|
},
|
|
786
775
|
cancel(){
|
|
787
776
|
this.cleardara()
|
|
@@ -794,8 +783,8 @@
|
|
|
794
783
|
f_iscity:'市区',
|
|
795
784
|
f_residential_area_id: '',
|
|
796
785
|
f_pcd: '',
|
|
786
|
+
f_comment1:'',
|
|
797
787
|
f_comments:'',
|
|
798
|
-
f_comments1:'',
|
|
799
788
|
f_street: '',
|
|
800
789
|
f_residential_area: '',
|
|
801
790
|
f_slice_area: '',
|
|
@@ -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
|
}
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
data () {
|
|
129
129
|
return {
|
|
130
130
|
criteriaShow: false,
|
|
131
|
-
model: new PagedList('
|
|
131
|
+
model: new PagedList('api/af-revenue/sql/address_getUserAddress',15,{}),
|
|
132
132
|
addflag: false,
|
|
133
133
|
addtitle:'',
|
|
134
134
|
|
|
@@ -188,12 +188,12 @@
|
|
|
188
188
|
async delete(row){
|
|
189
189
|
if(row.id){
|
|
190
190
|
var id = row.id
|
|
191
|
-
let service = await this.$resetpost('
|
|
192
|
-
let userfiles = await this.$resetpost('
|
|
191
|
+
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})
|
|
192
|
+
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})
|
|
193
193
|
if(service.data.length || userfiles.data.length){
|
|
194
194
|
this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
|
|
195
195
|
}else{
|
|
196
|
-
this.$resetdelete('
|
|
196
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
197
197
|
this.$dispatch('cancel')
|
|
198
198
|
})
|
|
199
199
|
}
|
|
@@ -238,7 +238,7 @@
|
|
|
238
238
|
this.all = true
|
|
239
239
|
console.log(this.$refs.paged.$refs.cri.condition,"=============")
|
|
240
240
|
let HttpReset = new HttpResetClass()
|
|
241
|
-
await HttpReset.load('POST', '
|
|
241
|
+
await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
|
|
242
242
|
data: {
|
|
243
243
|
condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
|
|
244
244
|
}
|
|
@@ -290,7 +290,7 @@
|
|
|
290
290
|
user:this.$login.f
|
|
291
291
|
}
|
|
292
292
|
console.log("filepath="+JSON.stringify(data))
|
|
293
|
-
await this.$resetpost(`
|
|
293
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
294
294
|
this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
|
|
295
295
|
//关闭上传框
|
|
296
296
|
this.closeFile()
|
|
@@ -433,7 +433,7 @@ export default {
|
|
|
433
433
|
orderitem: 'id',
|
|
434
434
|
condition: `f_orgid=${this.$login.f.orgid}`
|
|
435
435
|
}
|
|
436
|
-
let ret = await this.$resetpost('
|
|
436
|
+
let ret = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null,newly:true})
|
|
437
437
|
ret.data.forEach(item => {
|
|
438
438
|
this.safeCheckArea.push({label: item.f_check_book_name, value: item.id})
|
|
439
439
|
})
|
|
@@ -470,7 +470,7 @@ export default {
|
|
|
470
470
|
async initpcds(pconditon){
|
|
471
471
|
this.pcdslist = []
|
|
472
472
|
let HttpReset = new HttpResetClass()
|
|
473
|
-
let req = await HttpReset.load('POST', '
|
|
473
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTable', {
|
|
474
474
|
data: {
|
|
475
475
|
items: '*',
|
|
476
476
|
tablename: 't_pcd',
|
|
@@ -492,7 +492,7 @@ export default {
|
|
|
492
492
|
async initstreets(pconditon){
|
|
493
493
|
this.streetslist = []
|
|
494
494
|
let HttpReset = new HttpResetClass()
|
|
495
|
-
let req = await HttpReset.load('POST', '
|
|
495
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
496
496
|
data: {
|
|
497
497
|
items: '*',
|
|
498
498
|
tablename: 't_street',
|
|
@@ -518,7 +518,7 @@ export default {
|
|
|
518
518
|
f_area_id: this.areamodel.f_area_id,
|
|
519
519
|
f_filialeid: this.f_filialeids
|
|
520
520
|
}
|
|
521
|
-
let res = await this.$resetpost('
|
|
521
|
+
let res = await this.$resetpost('api/af-revenue/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败!!'})
|
|
522
522
|
console.log('验证小区是否存在', res)
|
|
523
523
|
if (res.data) {
|
|
524
524
|
this.$showAlert('这个小区编号已存在!!!请核实', 'warning', 3000)
|
|
@@ -600,7 +600,7 @@ export default {
|
|
|
600
600
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
601
601
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
602
602
|
|
|
603
|
-
await this.$resetpost('
|
|
603
|
+
await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)
|
|
604
604
|
},
|
|
605
605
|
cleardara(){
|
|
606
606
|
this.areamodel= {
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
<button class="button_export button_spacing" @click="$parent.$parent.importAddress">导入地址</button>
|
|
45
45
|
<export-excel :data="$parent.$parent.getCondition"
|
|
46
46
|
:field="$parent.$parent.getfield"
|
|
47
|
-
sqlurl="
|
|
47
|
+
sqlurl="api/af-revenue/logic/exportfile"
|
|
48
48
|
sql-name="addressGetAddress"
|
|
49
49
|
template-name='地址管理查询导出'
|
|
50
50
|
:choose-col="true"></export-excel>
|
|
@@ -232,7 +232,7 @@
|
|
|
232
232
|
data () {
|
|
233
233
|
return {
|
|
234
234
|
criteriaShow: false,
|
|
235
|
-
model: new PagedList('
|
|
235
|
+
model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
236
236
|
config: {
|
|
237
237
|
// 导出列要和查询列相同
|
|
238
238
|
excelHeaders: {
|
|
@@ -348,11 +348,11 @@
|
|
|
348
348
|
async delete(row){
|
|
349
349
|
if(row.id){
|
|
350
350
|
var id = row.id
|
|
351
|
-
let userfiles = await this.$resetpost('
|
|
351
|
+
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})
|
|
352
352
|
if(userfiles.data.length){
|
|
353
353
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
354
354
|
}else{
|
|
355
|
-
this.$resetdelete('
|
|
355
|
+
this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
356
356
|
this.$dispatch('cancel')
|
|
357
357
|
})
|
|
358
358
|
}
|
|
@@ -418,7 +418,7 @@
|
|
|
418
418
|
f_depname: this.$login.f.deps,
|
|
419
419
|
f_filialeid: this.f_filialeids
|
|
420
420
|
}
|
|
421
|
-
this.$resetpost('
|
|
421
|
+
this.$resetpost('api/af-revenue/logic/modifyBatch',modifyBatchData)
|
|
422
422
|
this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
|
|
423
423
|
this.showModify = false
|
|
424
424
|
this.$refs.paged.$refs.grid.selectInit()
|
|
@@ -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', 'api/af-revenue/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
462
462
|
data: {
|
|
463
463
|
items: '*',
|
|
464
464
|
tablename: 't_street',
|
|
@@ -481,7 +481,7 @@
|
|
|
481
481
|
async initareas(pconditon){
|
|
482
482
|
this.areaslist = []
|
|
483
483
|
let HttpReset = new HttpResetClass()
|
|
484
|
-
let req = await HttpReset.load('POST', '
|
|
484
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
485
485
|
data: {
|
|
486
486
|
items: '*',
|
|
487
487
|
tablename: 't_area',
|
|
@@ -556,7 +556,7 @@
|
|
|
556
556
|
user:this.$login.f
|
|
557
557
|
}
|
|
558
558
|
console.log("filepath="+JSON.stringify(data))
|
|
559
|
-
await this.$resetpost(`
|
|
559
|
+
await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
560
560
|
if(res.data.type=="success"){
|
|
561
561
|
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
562
562
|
}else{
|
|
@@ -217,7 +217,7 @@
|
|
|
217
217
|
data () {
|
|
218
218
|
return {
|
|
219
219
|
criteriaShow: false,
|
|
220
|
-
model: new PagedList('
|
|
220
|
+
model: new PagedList('api/af-revenue/sql/address_getarealist',20,{},{addressnum: 0,f_count:0}),
|
|
221
221
|
addflag: false,
|
|
222
222
|
addtitle:'',
|
|
223
223
|
|
|
@@ -278,7 +278,7 @@
|
|
|
278
278
|
async delete(row){
|
|
279
279
|
if(row.id){
|
|
280
280
|
var id = row.id
|
|
281
|
-
let useraredss = await this.$resetpost('
|
|
281
|
+
let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
|
|
282
282
|
{data: {
|
|
283
283
|
items: 'f_residential_area_id',
|
|
284
284
|
tablename: 't_user_address',
|
|
@@ -288,7 +288,7 @@
|
|
|
288
288
|
if(useraredss.data.length>0){
|
|
289
289
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
290
290
|
}else{
|
|
291
|
-
this.$resetdelete('
|
|
291
|
+
this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
292
292
|
this.$dispatch('cancel')
|
|
293
293
|
})
|
|
294
294
|
}
|
|
@@ -333,7 +333,7 @@
|
|
|
333
333
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
334
334
|
this.showDelete = true
|
|
335
335
|
let condition = `a.f_orgid = '${this.f_filialeids}'`
|
|
336
|
-
let req = await this.$resetpost('
|
|
336
|
+
let req = await this.$resetpost('api/af-revenue/sql/address_getresidential', {
|
|
337
337
|
data: {
|
|
338
338
|
condition: condition
|
|
339
339
|
}
|
|
@@ -365,7 +365,7 @@
|
|
|
365
365
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
366
366
|
oldAreaIds[n] = row.id
|
|
367
367
|
})
|
|
368
|
-
this.$resetpost('
|
|
368
|
+
this.$resetpost('api/af-revenue/logic/batchDelete',{
|
|
369
369
|
data:{
|
|
370
370
|
areamodel:this.areamodel,
|
|
371
371
|
oldAreaIds:oldAreaIds,
|
|
@@ -102,7 +102,7 @@ export default {
|
|
|
102
102
|
f_area: ''
|
|
103
103
|
},
|
|
104
104
|
areaslist: [],
|
|
105
|
-
model: new PagedList('
|
|
105
|
+
model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20, {
|
|
106
106
|
tablename: `'t_user_address ua left join t_userinfo ui on ua.f_userinfo_id = ui.f_userinfo_id'`,
|
|
107
107
|
items: `'f_userinfo_code,f_user_name,f_address,ua.id,f_building'`,
|
|
108
108
|
orderitem: `'f_address desc'`
|
|
@@ -123,7 +123,7 @@ export default {
|
|
|
123
123
|
async initareas(){
|
|
124
124
|
this.areaslist = []
|
|
125
125
|
let HttpReset = new HttpResetClass()
|
|
126
|
-
let req = await HttpReset.load('POST', '
|
|
126
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
127
127
|
data: {
|
|
128
128
|
items: '*',
|
|
129
129
|
tablename: 't_area',
|
|
@@ -191,7 +191,7 @@ export default {
|
|
|
191
191
|
model: this.updateModel
|
|
192
192
|
}
|
|
193
193
|
this.batchUpdateAreaShow = false
|
|
194
|
-
await this.$resetpost('
|
|
194
|
+
await this.$resetpost('api/af-revenue/logic/address_batchUpdateUserArea', {data: data}, msg)
|
|
195
195
|
this.$refs.paged.$refs.grid.selectInit()
|
|
196
196
|
this.search()
|
|
197
197
|
}
|
|
@@ -413,7 +413,7 @@
|
|
|
413
413
|
async initpcds(pconditon){
|
|
414
414
|
this.pcdslist = []
|
|
415
415
|
let HttpReset = new HttpResetClass()
|
|
416
|
-
let req = await HttpReset.load('POST', '
|
|
416
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
417
417
|
data: {
|
|
418
418
|
items: '*',
|
|
419
419
|
tablename: 't_pcd',
|
|
@@ -436,7 +436,7 @@
|
|
|
436
436
|
async initstreets(pconditon){
|
|
437
437
|
this.streetslist = []
|
|
438
438
|
let HttpReset = new HttpResetClass()
|
|
439
|
-
let req = await HttpReset.load('POST', '
|
|
439
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
|
|
440
440
|
data: {
|
|
441
441
|
items: '*',
|
|
442
442
|
tablename: 't_street',
|
|
@@ -462,7 +462,7 @@
|
|
|
462
462
|
// }
|
|
463
463
|
this.areaslist = []
|
|
464
464
|
let HttpReset = new HttpResetClass()
|
|
465
|
-
let req = await HttpReset.load('POST', '
|
|
465
|
+
let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
466
466
|
data: {
|
|
467
467
|
items: '*',
|
|
468
468
|
tablename: 't_area',
|
|
@@ -642,7 +642,7 @@
|
|
|
642
642
|
}
|
|
643
643
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
644
644
|
if (res === 'confirm') {
|
|
645
|
-
this.$resetpost('
|
|
645
|
+
this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
646
646
|
this.cleardara()
|
|
647
647
|
this.$dispatch('confirm')
|
|
648
648
|
})
|
|
@@ -701,7 +701,7 @@
|
|
|
701
701
|
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
|
|
702
702
|
}
|
|
703
703
|
}
|
|
704
|
-
await this.$resetpost('
|
|
704
|
+
await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
|
|
705
705
|
},
|
|
706
706
|
cancel(){
|
|
707
707
|
this.cleardara()
|