address-client 3.2.43-1 → 3.2.44-1
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/package.json +1 -1
- package/src/components/UserAddress.vue +15 -15
- package/src/filiale/shanxian/AddAreaMsg.vue +7 -7
- package/src/filiale/shanxian/AddressList.vue +1 -1
- package/src/filiale/shanxian/AreaList.vue +8 -31
- package/src/filiale/shanxian/UserAddress.vue +14 -20
- package/src/filiale/shanxian/sale.js +4 -0
- package/build/versionCheck.js +0 -31
- package/src/filiale/WEINAN/AreaManage.vue +0 -109
- package/src/filiale/WEINAN/AreaUserList.vue +0 -226
- package/src/filiale/haile/AddressList.vue +0 -615
- package/src/filiale/haile/sale.js +0 -8
- package/src/filiale/meihekou/UserAddress.vue +0 -898
- package/src/filiale/meihekou/sale.js +0 -8
- package/src/filiale/qinhua/AddAreaMsg.vue +0 -743
- package/src/filiale/qinhua/AddressList.vue +0 -627
- package/src/filiale/qinhua/AddressManage.vue +0 -117
- package/src/filiale/qinhua/AreaList.vue +0 -425
- package/src/filiale/qinhua/AreaManage.vue +0 -100
- package/src/filiale/qinhua/CityManage.vue +0 -76
- package/src/filiale/qinhua/StreetList.vue +0 -241
- package/src/filiale/qinhua/UserAddress.vue +0 -894
- package/src/filiale/qinhua/sale.js +0 -20
- package/src/filiale/yangchun/AddAreaMsg.vue +0 -764
- package/src/filiale/yangchun/sale.js +0 -7
package/package.json
CHANGED
|
@@ -109,8 +109,8 @@
|
|
|
109
109
|
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
110
110
|
<label for="f_address" class="font_normal_body">楼  层</label>
|
|
111
111
|
<input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
|
|
112
|
-
placeholder="楼层" />
|
|
113
|
-
<input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
|
|
112
|
+
placeholder="楼层" disabled/>
|
|
113
|
+
<input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search" disabled
|
|
114
114
|
/>
|
|
115
115
|
</div>
|
|
116
116
|
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
@@ -134,7 +134,7 @@
|
|
|
134
134
|
<label class="font_normal_body">经 纬 度</label>
|
|
135
135
|
<input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
|
|
136
136
|
<input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
|
|
137
|
-
|
|
137
|
+
 <span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
|
|
138
138
|
</div>
|
|
139
139
|
|
|
140
140
|
<div v-if="usertype" class="col-sm-12 form-group "
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
<label class="font_normal_body">经 纬 度</label>
|
|
148
148
|
<input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
|
|
149
149
|
<input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
|
|
150
|
-
|
|
150
|
+
 <span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
|
|
151
151
|
</div>
|
|
152
152
|
<div class="col-sm-6 form-group " v-if="config.hasnumber"
|
|
153
153
|
:class="[$v.f_standard_number.required ? 'has-error' : 'has-success']">
|
|
@@ -317,17 +317,17 @@
|
|
|
317
317
|
</div>
|
|
318
318
|
</validator>
|
|
319
319
|
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
320
|
+
<modal v-if="isshow" :show.sync="isshow" large backdrop="false" :width="900">
|
|
321
|
+
<header slot="modal-header" class="modal-header">
|
|
322
|
+
</header>
|
|
323
|
+
<article slot="modal-body" class="modal-body">
|
|
324
|
+
<amap-location :islocationclearmark="false" dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
|
|
325
|
+
</article>
|
|
326
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
327
|
+
<button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>
|
|
328
|
+
<button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>
|
|
329
|
+
</footer>
|
|
330
|
+
</modal>
|
|
331
331
|
|
|
332
332
|
</div>
|
|
333
333
|
</template>
|
|
@@ -419,7 +419,7 @@
|
|
|
419
419
|
// }
|
|
420
420
|
this.areaslist = []
|
|
421
421
|
let HttpReset = new HttpResetClass()
|
|
422
|
-
let req = await HttpReset.load('POST', '
|
|
422
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
423
423
|
data: {
|
|
424
424
|
items: '*',
|
|
425
425
|
tablename: 't_area',
|
|
@@ -443,7 +443,7 @@
|
|
|
443
443
|
async initpcds(pconditon){
|
|
444
444
|
this.pcdslist = []
|
|
445
445
|
let HttpReset = new HttpResetClass()
|
|
446
|
-
let req = await HttpReset.load('POST', '
|
|
446
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
447
447
|
data: {
|
|
448
448
|
items: '*',
|
|
449
449
|
tablename: 't_pcd',
|
|
@@ -467,7 +467,7 @@
|
|
|
467
467
|
async initstreets(pconditon){
|
|
468
468
|
this.streetslist = []
|
|
469
469
|
let HttpReset = new HttpResetClass()
|
|
470
|
-
let req = await HttpReset.load('POST', '
|
|
470
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
471
471
|
data: {
|
|
472
472
|
items: '*',
|
|
473
473
|
tablename: 't_street',
|
|
@@ -492,7 +492,7 @@
|
|
|
492
492
|
this.$showAlert('请输入正确的位数', 'warning', 2000)
|
|
493
493
|
this.areamodel.f_area_id = ''
|
|
494
494
|
}else{
|
|
495
|
-
let res =await this.$resetpost('
|
|
495
|
+
let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
|
|
496
496
|
data: {
|
|
497
497
|
items: '*',
|
|
498
498
|
tablename: 't_area',
|
|
@@ -517,7 +517,7 @@
|
|
|
517
517
|
f_filialeid: this.f_filialeids
|
|
518
518
|
}
|
|
519
519
|
|
|
520
|
-
let res = await this.$resetpost('
|
|
520
|
+
let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败!!'})
|
|
521
521
|
console.log('验证小区是否存在', res)
|
|
522
522
|
if (res.data) {
|
|
523
523
|
this.$showAlert('这个小区编号已存在!!!请核实', 'warning', 3000)
|
|
@@ -594,7 +594,7 @@
|
|
|
594
594
|
this.buildingmodel.f_orgname = this.$login.f.orgs
|
|
595
595
|
this.buildingmodel.f_depid = this.$login.f.depids
|
|
596
596
|
this.buildingmodel.f_depname = this.$login.f.deps
|
|
597
|
-
await this.$resetpost('
|
|
597
|
+
await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
|
|
598
598
|
this.$refs.buildinglist.search()
|
|
599
599
|
},
|
|
600
600
|
//保存小区
|
|
@@ -618,7 +618,7 @@
|
|
|
618
618
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
619
619
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
620
620
|
|
|
621
|
-
await this.$resetpost('
|
|
621
|
+
await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
|
|
622
622
|
},
|
|
623
623
|
cleardara(){
|
|
624
624
|
this.areamodel= {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
</div>
|
|
35
35
|
<div class="col-sm-4 form-group button-range" >
|
|
36
36
|
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
37
|
-
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('民用')"
|
|
37
|
+
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('民用')">添加民用地址</button>
|
|
38
38
|
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
|
|
39
39
|
<button class="button_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
|
|
40
40
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" @keyup.enter="search">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
4
4
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
6
|
<div class="row">
|
|
@@ -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>
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
<th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
|
|
129
129
|
<th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
|
|
130
130
|
<th><nobr>操作人</nobr></th>
|
|
131
|
-
<th><
|
|
131
|
+
<th><nobr>操作日期</nobr></th>
|
|
132
132
|
<th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
|
|
133
133
|
<th><nobr>操作</nobr></th>
|
|
134
134
|
</template>
|
|
@@ -211,12 +211,7 @@
|
|
|
211
211
|
f_slice_area: '',
|
|
212
212
|
f_residential_area: ''
|
|
213
213
|
},
|
|
214
|
-
model: new PagedList('
|
|
215
|
-
// 排序
|
|
216
|
-
orderitem: 'f_operate_date desc',
|
|
217
|
-
orderFields: {
|
|
218
|
-
f_operate_date: 'no'
|
|
219
|
-
},
|
|
214
|
+
model: new PagedList('rs/sql/address_getarealist',20),
|
|
220
215
|
addflag: false,
|
|
221
216
|
addtitle:'',
|
|
222
217
|
getfield: {},
|
|
@@ -271,28 +266,10 @@
|
|
|
271
266
|
this.$refs.paged.$refs.cri.search()
|
|
272
267
|
},
|
|
273
268
|
|
|
274
|
-
sort (field, rule) {
|
|
275
|
-
// 将所有排序方式设为不排序,实现相互排斥
|
|
276
|
-
for (let key in this.orderFields) {
|
|
277
|
-
if (key === field) {
|
|
278
|
-
this.orderFields[key] = rule
|
|
279
|
-
} else {
|
|
280
|
-
this.orderFields[key] = 'no'
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
// 如果新规则不排序,还原为默认排序
|
|
284
|
-
if (rule === 'no') {
|
|
285
|
-
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
286
|
-
} else {
|
|
287
|
-
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
this.search()
|
|
291
|
-
},
|
|
292
269
|
async delete(row){
|
|
293
270
|
if(row.id >= 0){
|
|
294
271
|
var id = row.id
|
|
295
|
-
let useraredss = await this.$resetpost('
|
|
272
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
296
273
|
{data: {
|
|
297
274
|
items: 'f_residential_area_id',
|
|
298
275
|
tablename: 't_user_address',
|
|
@@ -302,7 +279,7 @@
|
|
|
302
279
|
if(useraredss.data.length>0){
|
|
303
280
|
this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
|
|
304
281
|
}else{
|
|
305
|
-
this.$resetdelete('
|
|
282
|
+
this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
306
283
|
this.$dispatch('cancel')
|
|
307
284
|
})
|
|
308
285
|
}
|
|
@@ -345,7 +322,7 @@
|
|
|
345
322
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
346
323
|
this.showDelete = true
|
|
347
324
|
let condition = `a.f_orgid = '${this.$login.f.orgid}'`
|
|
348
|
-
let req = await this.$resetpost('
|
|
325
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
349
326
|
data: {
|
|
350
327
|
condition: condition
|
|
351
328
|
}
|
|
@@ -377,7 +354,7 @@
|
|
|
377
354
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
378
355
|
oldAreaIds[n] = row.id
|
|
379
356
|
})
|
|
380
|
-
this.$resetpost('
|
|
357
|
+
this.$resetpost('rs/logic/batchDelete',{
|
|
381
358
|
data:{
|
|
382
359
|
areamodel:this.areamodel,
|
|
383
360
|
oldAreaIds:oldAreaIds,
|
|
@@ -92,30 +92,23 @@
|
|
|
92
92
|
close-on-select>
|
|
93
93
|
</v-select>
|
|
94
94
|
</div>
|
|
95
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
96
|
-
:class="[$v.f_building.required ? 'has-error' : 'has-success']">
|
|
95
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
97
96
|
<label for="f_address" class="font_normal_body">楼  号</label>
|
|
98
97
|
<input type="text" style="width:40%" v-model="model.f_building" class="input_search"
|
|
99
|
-
v-validate:f_building='{required: true }'
|
|
100
98
|
placeholder="楼号"/>
|
|
101
99
|
<input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
|
|
102
100
|
/>
|
|
103
101
|
|
|
104
102
|
</div>
|
|
105
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
106
|
-
:class="[$v.f_unit.required ? 'has-error' : 'has-success']">
|
|
103
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
107
104
|
<label for="f_address" class="font_normal_body">单  元</label>
|
|
108
|
-
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search"
|
|
109
|
-
v-validate:f_unit='{required: true }'
|
|
110
|
-
placeholder="单元"/>
|
|
105
|
+
<input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
|
|
111
106
|
<input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
|
|
112
107
|
/>
|
|
113
108
|
</div>
|
|
114
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
115
|
-
:class="[$v.f_floor.required ? 'has-error' : 'has-success']">
|
|
109
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
116
110
|
<label for="f_address" class="font_normal_body">楼  层</label>
|
|
117
111
|
<input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
|
|
118
|
-
v-validate:f_floor='{required: true }'
|
|
119
112
|
placeholder="楼层" />
|
|
120
113
|
<input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
|
|
121
114
|
/>
|
|
@@ -439,7 +432,7 @@
|
|
|
439
432
|
// this.model.f_residential_area_id = null
|
|
440
433
|
// this.model.f_residential_area = null
|
|
441
434
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.$login.f.orgid}'`
|
|
442
|
-
let req = await this.$resetpost('
|
|
435
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
443
436
|
data: {
|
|
444
437
|
condition: condition
|
|
445
438
|
}
|
|
@@ -470,7 +463,7 @@
|
|
|
470
463
|
}
|
|
471
464
|
},
|
|
472
465
|
async initdata(){
|
|
473
|
-
this.model.f_address_state = '
|
|
466
|
+
this.model.f_address_state = '已通气'
|
|
474
467
|
this.initAreas(this.f_filialeids)
|
|
475
468
|
// 添加特殊地址选省市区
|
|
476
469
|
this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
|
|
@@ -500,7 +493,7 @@
|
|
|
500
493
|
async initpcds(pconditon){
|
|
501
494
|
this.pcdslist = []
|
|
502
495
|
let HttpReset = new HttpResetClass()
|
|
503
|
-
let req = await HttpReset.load('POST', '
|
|
496
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
504
497
|
data: {
|
|
505
498
|
items: '*',
|
|
506
499
|
tablename: 't_pcd',
|
|
@@ -523,7 +516,7 @@
|
|
|
523
516
|
async initstreets(pconditon){
|
|
524
517
|
this.streetslist = []
|
|
525
518
|
let HttpReset = new HttpResetClass()
|
|
526
|
-
let req = await HttpReset.load('POST', '
|
|
519
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
527
520
|
data: {
|
|
528
521
|
items: '*',
|
|
529
522
|
tablename: 't_street',
|
|
@@ -549,7 +542,7 @@
|
|
|
549
542
|
// }
|
|
550
543
|
this.areaslist = []
|
|
551
544
|
let HttpReset = new HttpResetClass()
|
|
552
|
-
let req = await HttpReset.load('POST', '
|
|
545
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
553
546
|
data: {
|
|
554
547
|
items: '*',
|
|
555
548
|
tablename: 't_area',
|
|
@@ -696,7 +689,8 @@
|
|
|
696
689
|
data.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
|
|
697
690
|
data.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
|
|
698
691
|
data.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
699
|
-
data.f_address = data.
|
|
692
|
+
data.f_address = data.f_street
|
|
693
|
+
+ data.f_residential_area +
|
|
700
694
|
data.f_building + data.f_building_suffix
|
|
701
695
|
+ data.f_unit + data.f_unit_suffix
|
|
702
696
|
+ data.f_floor + data.f_floor_suffix
|
|
@@ -726,7 +720,7 @@
|
|
|
726
720
|
}
|
|
727
721
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
728
722
|
if (res === 'confirm') {
|
|
729
|
-
this.$resetpost('
|
|
723
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
730
724
|
this.cleardara()
|
|
731
725
|
this.$dispatch('confirm')
|
|
732
726
|
})
|
|
@@ -777,9 +771,9 @@
|
|
|
777
771
|
this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
|
|
778
772
|
this.model.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
|
|
779
773
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
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
|
|
774
|
+
this.model.f_address = this.model.f_street + this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
781
775
|
}
|
|
782
|
-
await this.$resetpost('
|
|
776
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
783
777
|
},
|
|
784
778
|
cancel(){
|
|
785
779
|
this.cleardara()
|
|
@@ -3,6 +3,10 @@ import Vue from "vue";
|
|
|
3
3
|
|
|
4
4
|
let specialComp = {
|
|
5
5
|
'address-list': (resolve) =>{ require(['./AddressList'], resolve) },
|
|
6
|
+
'add-area-msg': (resolve) =>{ require(['./AddAreaMsg'], resolve) },
|
|
7
|
+
'area-manage': (resolve) =>{ require(['./AreaManage'], resolve) },
|
|
8
|
+
'user-address': (resolve) =>{ require(['./UserAddress'], resolve) },
|
|
9
|
+
'area-list': (resolve) =>{ require(['./AreaList'], resolve) },
|
|
6
10
|
}
|
|
7
11
|
exports.specialComp = specialComp
|
|
8
12
|
|
package/build/versionCheck.js
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
function isVersionGreaterThan (version1, version2) {
|
|
2
|
-
const v1parts = version1.split('.')
|
|
3
|
-
const v2parts = version2.split('.')
|
|
4
|
-
let flag = false
|
|
5
|
-
for (let i = 0; i < v1parts.length; ++i) {
|
|
6
|
-
if (v1parts[i] > v2parts[i]) {
|
|
7
|
-
flag = true
|
|
8
|
-
break
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
return flag
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
const pkg = require('../package.json')
|
|
16
|
-
const checkVersion = () => {
|
|
17
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意:当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
|
|
18
|
-
const {devDependencies} = pkg
|
|
19
|
-
if (devDependencies && devDependencies['system-clients']) {
|
|
20
|
-
if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
|
|
21
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意:当前使用的 systemClients 版本不兼容旧版登录')
|
|
22
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
|
|
23
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
|
|
24
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录,请降级 system-clients 版本到 3.2.87')
|
|
25
|
-
console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志:' +
|
|
26
|
-
'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
module.exports = checkVersion
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div id="unit" class="flex-row" :class="{'binary':areaShow == 0}">
|
|
3
|
-
<div :class="{'basic-main':areaShow == 0,'binary-left':areaShow != 0}">
|
|
4
|
-
<area-list @child-dblclick="selected" v-ref:arealist :style="style" :f_filialeids.sync="f_filialeids"></area-list>
|
|
5
|
-
</div>
|
|
6
|
-
<div v-show="areaShow == 1" style="width: 60%" class="binary-right">
|
|
7
|
-
<div class="flex">
|
|
8
|
-
<add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
|
|
9
|
-
:f_filialeids.sync="f_filialeids" :row="arearow"></add-area-msg>
|
|
10
|
-
</div>
|
|
11
|
-
</div>
|
|
12
|
-
<div v-show="areaShow == 2" style="width: 60%" class="binary-right">
|
|
13
|
-
<div class="flex">
|
|
14
|
-
<area-user-list v-if="areaid" :areaid="areaid"></area-user-list>
|
|
15
|
-
</div>
|
|
16
|
-
</div>
|
|
17
|
-
</div>
|
|
18
|
-
</template>
|
|
19
|
-
|
|
20
|
-
<script>
|
|
21
|
-
export default {
|
|
22
|
-
title: '小区管理',
|
|
23
|
-
components: {},
|
|
24
|
-
data () {
|
|
25
|
-
return {
|
|
26
|
-
// 分公司id串
|
|
27
|
-
width: '100%',
|
|
28
|
-
f_filialeids: this.$login.f.f_orgids,
|
|
29
|
-
areaShow: 0,
|
|
30
|
-
areatype: '小区',
|
|
31
|
-
arearow: {},
|
|
32
|
-
style: 'col-sm-2 form-group',
|
|
33
|
-
areaid: null
|
|
34
|
-
}
|
|
35
|
-
},
|
|
36
|
-
ready () {
|
|
37
|
-
|
|
38
|
-
},
|
|
39
|
-
props: {},
|
|
40
|
-
methods: {
|
|
41
|
-
selected (obj) {
|
|
42
|
-
console.log('======', obj)
|
|
43
|
-
this.style = 'col-sm-3 form-group'
|
|
44
|
-
if (obj && obj.id) {
|
|
45
|
-
console.log('对比分公司', obj.f_filialeid, this.f_filialeids)
|
|
46
|
-
if (obj.f_filialeid != this.f_filialeids) {
|
|
47
|
-
this.refresh()
|
|
48
|
-
return
|
|
49
|
-
}
|
|
50
|
-
this.areaShow = 1
|
|
51
|
-
this.$refs.addareamsg.cleardara()
|
|
52
|
-
this.$refs.addareamsg.operation = 'modify'
|
|
53
|
-
this.$refs.addareamsg.areatype = '小区'
|
|
54
|
-
this.$refs.addareamsg.areamodel = Object.assign({}, obj)
|
|
55
|
-
if (obj.f_slice_area) {
|
|
56
|
-
this.$refs.addareamsg.areamodel.slice_area = [{
|
|
57
|
-
name: this.$refs.addareamsg.areamodel.f_slice_area,
|
|
58
|
-
code: this.$refs.addareamsg.areamodel.f_area_code
|
|
59
|
-
}]
|
|
60
|
-
}
|
|
61
|
-
if (obj.f_meter_book != null && obj.f_meter_book != '' && obj.f_meter_book instanceof Array) {
|
|
62
|
-
this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book[0])
|
|
63
|
-
}
|
|
64
|
-
if (obj.f_meter_book != null && obj.f_meter_book != '' && !(obj.f_meter_book instanceof Array)) {
|
|
65
|
-
this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book)
|
|
66
|
-
}
|
|
67
|
-
if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && obj.f_adjustable_id instanceof Array) {
|
|
68
|
-
this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id[0])
|
|
69
|
-
}
|
|
70
|
-
if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && !(obj.f_adjustable_id instanceof Array)) {
|
|
71
|
-
this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id)
|
|
72
|
-
}
|
|
73
|
-
// this.$refs.addareamsg.initdata(obj)
|
|
74
|
-
// this.$refs.addareamsg.initrow(obj)
|
|
75
|
-
}
|
|
76
|
-
},
|
|
77
|
-
refresh () {
|
|
78
|
-
this.areaShow = false
|
|
79
|
-
this.$refs.arealist.$refs.paged.$refs.cri.search()
|
|
80
|
-
}
|
|
81
|
-
},
|
|
82
|
-
events: {
|
|
83
|
-
'shouAreaAllUser' (row) {
|
|
84
|
-
this.style = 'col-sm-3 form-group'
|
|
85
|
-
this.areaShow = 2
|
|
86
|
-
this.areaid = row.id
|
|
87
|
-
},
|
|
88
|
-
'add'(val) {
|
|
89
|
-
this.style = 'col-sm-3 form-group'
|
|
90
|
-
this.areaShow = 1
|
|
91
|
-
this.$refs.addareamsg.cleardara()
|
|
92
|
-
this.$refs.addareamsg.operation = 'add'
|
|
93
|
-
this.$refs.addareamsg.areatype = val
|
|
94
|
-
this.$refs.addareamsg.initdata()
|
|
95
|
-
},
|
|
96
|
-
'confirm'() {
|
|
97
|
-
this.style = 'col-sm-2 form-group'
|
|
98
|
-
this.areaShow = false
|
|
99
|
-
this.$refs.arealist.$refs.paged.$refs.cri.search()
|
|
100
|
-
},
|
|
101
|
-
'cancel'() {
|
|
102
|
-
this.style = 'col-sm-2 form-group'
|
|
103
|
-
this.$refs.arealist.$refs.paged.$refs.cri.search()
|
|
104
|
-
this.areaShow = 0
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
</script>
|
|
109
|
-
|