address-client 3.2.105 → 3.2.106-ls
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dev-server.js +3 -14
- package/package.json +3 -4
- package/src/components/AddAreaMsg.vue +7 -7
- package/src/components/AddCommunityManageMsg.vue +3 -3
- package/src/components/AddStreetManageMsg.vue +3 -3
- package/src/components/AddStreetOrPcd.vue +22 -16
- package/src/components/AddressAddAddress.vue +14 -14
- package/src/components/AddressFiles.vue +1 -1
- package/src/components/AddressList.vue +9 -9
- package/src/components/AddressTree.vue +5 -5
- package/src/components/AreaFiles.vue +1 -1
- package/src/components/AreaList.vue +5 -5
- package/src/components/AreaManage.vue +0 -4
- package/src/components/AreaTree.vue +5 -5
- package/src/components/Basch.vue +1 -1
- package/src/components/BatchOrders.vue +6 -6
- package/src/components/BuildingList.vue +2 -2
- package/src/components/CityList.vue +4 -3
- package/src/components/CommunityAreaList.vue +1 -1
- package/src/components/CommunityManageList.vue +4 -4
- package/src/components/NewAddressInfo.vue +4 -4
- package/src/components/StreetList.vue +4 -5
- package/src/components/StreetManageList.vue +4 -4
- package/src/components/UserAddress.vue +10 -17
- package/src/components/UserAddressChange.vue +1 -1
- package/src/components/selectAddress/BatchList.vue +6 -6
- package/src/filiale/WEINAN/AddAreaMsg.vue +5 -5
- package/src/filiale/WEINAN/AddressList.vue +9 -9
- package/src/filiale/WEINAN/AreaList.vue +5 -5
- package/src/filiale/WEINAN/AreaUserList.vue +7 -7
- package/src/filiale/WEINAN/UserAddress.vue +5 -5
- package/src/filiale/chengtou/UserAddress.vue +6 -6
- package/src/filiale/dongguan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/gaomi/AddressList.vue +6 -6
- package/src/filiale/gaomi/UserAddress.vue +5 -5
- package/src/filiale/gongyi/AddAreaMsg.vue +4 -4
- package/src/filiale/gongyi/UserAddress.vue +5 -5
- package/src/filiale/haile/AddressList.vue +9 -9
- package/src/filiale/jingwei/UserAddress.vue +5 -5
- package/src/filiale/macheng/AddAreaMsg.vue +4 -4
- package/src/filiale/macheng/AddStreetOrPcd.vue +3 -3
- package/src/filiale/macheng/AddressList.vue +9 -9
- package/src/filiale/macheng/AreaList.vue +4 -4
- package/src/filiale/macheng/StreetList.vue +3 -3
- package/src/filiale/macheng/UserAddress.vue +5 -5
- package/src/filiale/meihekou/UserAddress.vue +6 -6
- package/src/filiale/qianneng/AddAreaMsg.vue +7 -7
- package/src/filiale/qianneng/AddStreetOrPcd.vue +5 -5
- package/src/filiale/qianneng/AddressList.vue +10 -10
- package/src/filiale/qianneng/AreaList.vue +6 -6
- package/src/filiale/qianneng/UserAddress.vue +7 -7
- package/src/filiale/qinhua/AddAreaMsg.vue +7 -7
- package/src/filiale/qinhua/AddressList.vue +9 -9
- package/src/filiale/qinhua/AreaList.vue +6 -6
- package/src/filiale/qinhua/StreetList.vue +4 -4
- package/src/filiale/qinhua/UserAddress.vue +6 -6
- package/src/filiale/rizhao/UserAddress.vue +6 -6
- package/src/filiale/rongcheng/AddressList.vue +5 -5
- package/src/filiale/rongcheng/UserAddress.vue +5 -5
- package/src/filiale/shanggao/AddAreaMsg.vue +7 -7
- package/src/filiale/shanggao/AddStreetOrPcd.vue +5 -5
- package/src/filiale/shanggao/AddressList.vue +9 -9
- package/src/filiale/shanggao/AreaList.vue +6 -6
- package/src/filiale/shanggao/BuildingList.vue +2 -2
- package/src/filiale/shanggao/StreetList.vue +4 -4
- package/src/filiale/shanggao/UserAddress.vue +7 -7
- package/src/filiale/shanxian/AddAreaMsg.vue +7 -7
- package/src/filiale/shanxian/AddressList.vue +9 -9
- package/src/filiale/shanxian/AreaList.vue +6 -6
- package/src/filiale/shanxian/UserAddress.vue +6 -6
- package/src/filiale/shaoguan/AddAreaMsg.vue +4 -4
- package/src/filiale/shaoguan/UserAddress.vue +5 -5
- package/src/filiale/tongchuan/AddAreaMsg.vue +4 -4
- package/src/filiale/tongchuan/AddStreetOrPcd.vue +6 -6
- package/src/filiale/tongchuan/AddressList.vue +18 -5
- package/src/filiale/tongchuan/AreaList.vue +4 -4
- package/src/filiale/tongchuan/CityList.vue +3 -3
- package/src/filiale/tongchuan/StreetList.vue +4 -4
- package/src/filiale/tongchuan/UserAddress.vue +6 -6
- package/src/filiale/wuhai/UserAddress.vue +5 -5
- package/src/filiale/xinkang/AddAreaMsg.vue +8 -8
- package/src/filiale/xinkang/AreaList.vue +5 -5
- package/src/filiale/yangchun/AddAreaMsg.vue +8 -16
- package/src/filiale/zhongsheng/AddressList.vue +10 -10
- package/src/filiale/zhongsheng/AreaList.vue +7 -7
- package/src/filiale/zhongyi/AddAreaMsg.vue +7 -7
- package/src/filiale/zhoukou/AddAreaMsg.vue +5 -5
- package/src/filiale/zhoukou/AddressList.vue +5 -5
- package/src/filiale/zhoukou/AreaList.vue +4 -4
- package/src/filiale/zhoukou/UserAddress.vue +6 -6
- package/src/main.js +2 -3
- package/.npmignore +0 -10
- package/build/.npmignore +0 -1
- package/build/versionCheck.js +0 -31
- package/src/filiale/lixianV3/AreaList.vue +0 -416
- package/src/filiale/lixianV3/sale.js +0 -12
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
export default {
|
|
64
64
|
data () {
|
|
65
65
|
return {
|
|
66
|
-
model: new PagedList('
|
|
66
|
+
model: new PagedList('rs/sql/address_getbuildinglist',20),
|
|
67
67
|
addflag: false,
|
|
68
68
|
getfield: {},
|
|
69
69
|
f_orgid: ''
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
},
|
|
88
88
|
async delete(row){
|
|
89
89
|
if(row.id >= 0 ){
|
|
90
|
-
let useraredss = await this.$resetpost('
|
|
90
|
+
let useraredss = await this.$resetpost('rs/logic/address_deletebuilding', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: null})
|
|
91
91
|
this.search()
|
|
92
92
|
}
|
|
93
93
|
},
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
export default {
|
|
58
58
|
data () {
|
|
59
59
|
return {
|
|
60
|
-
model: new PagedList('
|
|
60
|
+
model: new PagedList('rs/sql/address_getcitylist',20),
|
|
61
61
|
addflag: false,
|
|
62
62
|
getfield: {},
|
|
63
63
|
f_orgid: ''
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
async delete(row){
|
|
80
80
|
if(row.id >= 0 ){
|
|
81
81
|
var id = row.id
|
|
82
|
-
let useraredss = await this.$resetpost('
|
|
82
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
83
83
|
{data: {
|
|
84
84
|
items: 'f_pcd_id',
|
|
85
85
|
tablename: 't_street',
|
|
@@ -89,7 +89,8 @@
|
|
|
89
89
|
if(useraredss.data.length>0){
|
|
90
90
|
this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
|
|
91
91
|
}else{
|
|
92
|
-
this.$resetdelete('
|
|
92
|
+
this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
93
|
+
this.search()
|
|
93
94
|
this.$dispatch('cancel')
|
|
94
95
|
})
|
|
95
96
|
}
|
|
@@ -46,7 +46,7 @@ export default {
|
|
|
46
46
|
data () {
|
|
47
47
|
return {
|
|
48
48
|
criteriaShow: false,
|
|
49
|
-
model: new PagedList('
|
|
49
|
+
model: new PagedList('rs/sql/address_singleTableOrderBy', 20, {
|
|
50
50
|
tablename: `'t_area'`,
|
|
51
51
|
items: `'f_residential_area,f_area_address'`,
|
|
52
52
|
orderitem: `'f_area_address desc'`
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
39
39
|
<export-excel :data="$parent.$parent.getCondition"
|
|
40
40
|
:field="$parent.$parent.getfield"
|
|
41
|
-
sqlurl="
|
|
41
|
+
sqlurl="rs/logic/exportfile"
|
|
42
42
|
sql-name="manage_getCommunityManageList"
|
|
43
43
|
template-name='社区信息查询导出'
|
|
44
44
|
:choose-col="true"></export-excel>
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
data () {
|
|
121
121
|
return {
|
|
122
122
|
criteriaShow: false,
|
|
123
|
-
model: new PagedList('
|
|
123
|
+
model: new PagedList('rs/sql/address_getCommunityManageList',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_community_name desc'`}),
|
|
124
124
|
addflag: false,
|
|
125
125
|
getfield: {},
|
|
126
126
|
//排序
|
|
@@ -168,7 +168,7 @@
|
|
|
168
168
|
async delete(row){
|
|
169
169
|
if(row.id >= 0 ){
|
|
170
170
|
var id = row.id
|
|
171
|
-
let useraredss = await this.$resetpost('
|
|
171
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
172
172
|
{data: {
|
|
173
173
|
items: 'id',
|
|
174
174
|
tablename: 't_area',
|
|
@@ -178,7 +178,7 @@
|
|
|
178
178
|
if(useraredss.data.length>0){
|
|
179
179
|
this.$showAlert('该社区下已有小区信息,无法删除!','warning',1000)
|
|
180
180
|
}else{
|
|
181
|
-
this.$resetdelete('
|
|
181
|
+
this.$resetdelete('rs/entity/t_community', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
182
182
|
this.$dispatch('cancel')
|
|
183
183
|
})
|
|
184
184
|
}
|
|
@@ -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('rs/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('rs/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('rs/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('rs/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="rs/logic/exportfile"
|
|
27
27
|
sql-name="manage_getstreetlist"
|
|
28
28
|
template-name='街道信息查询导出'
|
|
29
29
|
:choose-col="true"></export-excel>
|
|
@@ -118,7 +118,7 @@
|
|
|
118
118
|
data () {
|
|
119
119
|
return {
|
|
120
120
|
criteriaShow: false,
|
|
121
|
-
model: new PagedList('
|
|
121
|
+
model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
|
|
122
122
|
addflag: false,
|
|
123
123
|
getfield: {},
|
|
124
124
|
//排序
|
|
@@ -150,7 +150,6 @@
|
|
|
150
150
|
}
|
|
151
151
|
},
|
|
152
152
|
ready(){
|
|
153
|
-
console.log("===========",this.$login.f.orgid)
|
|
154
153
|
readyGen(this)
|
|
155
154
|
this.search()
|
|
156
155
|
},
|
|
@@ -164,7 +163,7 @@
|
|
|
164
163
|
async delete(row){
|
|
165
164
|
if(row.id >= 0 ){
|
|
166
165
|
var id = row.id
|
|
167
|
-
let useraredss = await this.$resetpost('
|
|
166
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
168
167
|
{data: {
|
|
169
168
|
items: 'f_street_id',
|
|
170
169
|
tablename: 't_area',
|
|
@@ -174,7 +173,7 @@
|
|
|
174
173
|
if(useraredss.data.length>0){
|
|
175
174
|
this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
|
|
176
175
|
}else{
|
|
177
|
-
this.$resetdelete('
|
|
176
|
+
this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
178
177
|
this.$dispatch('cancel')
|
|
179
178
|
})
|
|
180
179
|
}
|
|
@@ -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="rs/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('rs/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('rs/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('rs/entity/t_street_manage', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
166
166
|
this.$dispatch('cancel')
|
|
167
167
|
})
|
|
168
168
|
}
|
|
@@ -165,13 +165,9 @@
|
|
|
165
165
|
class="input_search" style="width:60%" placeholder="合同顺序号"
|
|
166
166
|
v-validate:f_contracts_number='{required: true }'>
|
|
167
167
|
</div>
|
|
168
|
-
<div class="col-sm-12 form-group"
|
|
169
|
-
<label
|
|
170
|
-
<textarea class="input_textarea" rows="3" style="width:80%;
|
|
171
|
-
</div>
|
|
172
|
-
<div class="col-sm-12 form-group" style="margin-top: 12px; margin-bottom: 12px;">
|
|
173
|
-
<label class="font_normal_body">备  注</label>
|
|
174
|
-
<textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%; height:auto;" v-model="model.f_comments"></textarea>
|
|
168
|
+
<div class="col-sm-12 form-group">
|
|
169
|
+
<label class="font_normal_body " >备  注</label>
|
|
170
|
+
<textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
|
|
175
171
|
</div>
|
|
176
172
|
<div style="text-align:right;margin-top:40px;margin-right:50px;" class="col-sm-12">
|
|
177
173
|
<button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
|
|
@@ -374,7 +370,6 @@
|
|
|
374
370
|
model: {
|
|
375
371
|
f_pcd_id: '',
|
|
376
372
|
f_street_id: '',
|
|
377
|
-
f_comments1:'',
|
|
378
373
|
f_comments:'',
|
|
379
374
|
f_residential_area_id: '',
|
|
380
375
|
f_pcd: '',
|
|
@@ -439,7 +434,7 @@
|
|
|
439
434
|
if(this.model.f_iscity) {
|
|
440
435
|
condition = condition + ` and f_iscity = '${this.model.f_iscity}'`
|
|
441
436
|
}
|
|
442
|
-
let req = await this.$resetpost('
|
|
437
|
+
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
443
438
|
data: {
|
|
444
439
|
condition: condition
|
|
445
440
|
}
|
|
@@ -500,7 +495,7 @@
|
|
|
500
495
|
async initpcds(pconditon){
|
|
501
496
|
this.pcdslist = []
|
|
502
497
|
let HttpReset = new HttpResetClass()
|
|
503
|
-
let req = await HttpReset.load('POST', '
|
|
498
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
504
499
|
data: {
|
|
505
500
|
items: '*',
|
|
506
501
|
tablename: 't_pcd',
|
|
@@ -523,7 +518,7 @@
|
|
|
523
518
|
async initstreets(pconditon){
|
|
524
519
|
this.streetslist = []
|
|
525
520
|
let HttpReset = new HttpResetClass()
|
|
526
|
-
let req = await HttpReset.load('POST', '
|
|
521
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
527
522
|
data: {
|
|
528
523
|
items: '*',
|
|
529
524
|
tablename: 't_street',
|
|
@@ -549,7 +544,7 @@
|
|
|
549
544
|
// }
|
|
550
545
|
this.areaslist = []
|
|
551
546
|
let HttpReset = new HttpResetClass()
|
|
552
|
-
let req = await HttpReset.load('POST', '
|
|
547
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
|
|
553
548
|
data: {
|
|
554
549
|
items: '*',
|
|
555
550
|
tablename: 't_area',
|
|
@@ -559,13 +554,12 @@
|
|
|
559
554
|
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
560
555
|
let redata = []
|
|
561
556
|
req.data.forEach((row) => {
|
|
562
|
-
if(!row.f_residential_area.includes('L')) {
|
|
563
557
|
redata.push({
|
|
564
558
|
label: row.f_residential_area,
|
|
565
559
|
value: row.id,
|
|
566
560
|
data: row,
|
|
567
561
|
id: row.id
|
|
568
|
-
})
|
|
562
|
+
})
|
|
569
563
|
})
|
|
570
564
|
this.areaslist=redata
|
|
571
565
|
this.areaChange(this.model.f_residential_area_id)
|
|
@@ -729,7 +723,7 @@
|
|
|
729
723
|
}
|
|
730
724
|
this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗?,如有已经存在的,将会重复添加!!!', ['confirm', 'cancel']).then((res) => {
|
|
731
725
|
if (res === 'confirm') {
|
|
732
|
-
this.$resetpost('
|
|
726
|
+
this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
|
|
733
727
|
this.cleardara()
|
|
734
728
|
this.$dispatch('confirm')
|
|
735
729
|
})
|
|
@@ -773,7 +767,7 @@
|
|
|
773
767
|
this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
|
|
774
768
|
this.model.f_address = this.model.f_street + this.model.f_residential_area + (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') + (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') + (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
|
|
775
769
|
}
|
|
776
|
-
await this.$resetpost('
|
|
770
|
+
await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
|
|
777
771
|
},
|
|
778
772
|
cancel(){
|
|
779
773
|
this.cleardara()
|
|
@@ -786,7 +780,6 @@
|
|
|
786
780
|
f_iscity:'市区',
|
|
787
781
|
f_residential_area_id: '',
|
|
788
782
|
f_pcd: '',
|
|
789
|
-
f_comment1:'',
|
|
790
783
|
f_comments:'',
|
|
791
784
|
f_street: '',
|
|
792
785
|
f_residential_area: '',
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
title: '地址变更列表',
|
|
36
36
|
data () {
|
|
37
37
|
return {
|
|
38
|
-
model: new PagedList('
|
|
38
|
+
model: new PagedList('rs/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('rs/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('rs/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
|
|
192
|
+
let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
193
193
|
if(service.data.length || userfiles.data.length){
|
|
194
194
|
this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
|
|
195
195
|
}else{
|
|
196
|
-
this.$resetdelete('
|
|
196
|
+
this.$resetdelete('rs/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', 'rs/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(`rs/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('rs/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', 'rs/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', 'rs/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('rs/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('rs/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="rs/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('rs/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('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
|
|
352
352
|
if(userfiles.data.length){
|
|
353
353
|
this.$showAlert('该地址下已有正常表具档案,无法删除!','warning',1000)
|
|
354
354
|
}else{
|
|
355
|
-
this.$resetdelete('
|
|
355
|
+
this.$resetdelete('rs/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('rs/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', 'rs/sql/address_singleTableOrderBy', {
|
|
438
438
|
data: {
|
|
439
439
|
items: '*',
|
|
440
440
|
tablename: 't_pcd',
|
|
@@ -458,7 +458,7 @@
|
|
|
458
458
|
async initstreets(pconditon){
|
|
459
459
|
this.streetslist = []
|
|
460
460
|
let HttpReset = new HttpResetClass()
|
|
461
|
-
let req = await HttpReset.load('POST', '
|
|
461
|
+
let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
|
|
462
462
|
data: {
|
|
463
463
|
items: '*',
|
|
464
464
|
tablename: 't_street',
|
|
@@ -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', 'rs/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(`rs/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('rs/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('rs/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('rs/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('rs/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('rs/logic/batchDelete',{
|
|
369
369
|
data:{
|
|
370
370
|
areamodel:this.areamodel,
|
|
371
371
|
oldAreaIds:oldAreaIds,
|
|
@@ -7,17 +7,17 @@
|
|
|
7
7
|
<div class="col-sm-4 form-group">
|
|
8
8
|
<label class="font_normal_body">客户编号</label>
|
|
9
9
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
10
|
-
condition="f_userinfo_code = '{}'" placeholder="客户编号"/>
|
|
10
|
+
condition="ui.f_userinfo_code = '{}'" placeholder="客户编号"/>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="col-sm-4 form-group">
|
|
13
13
|
<label class="font_normal_body">客户名称</label>
|
|
14
14
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
|
|
15
|
-
condition="f_user_name like '%{}%'" placeholder="客户名称"/>
|
|
15
|
+
condition="ui.f_user_name like '%{}%'" placeholder="客户名称"/>
|
|
16
16
|
</div>
|
|
17
17
|
<div class="col-sm-4 form-group">
|
|
18
18
|
<label class="font_normal_body">楼栋</label>
|
|
19
19
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_building"
|
|
20
|
-
condition="f_building = '{}'" placeholder="楼栋"/>
|
|
20
|
+
condition="ua.f_building = '{}'" placeholder="楼栋"/>
|
|
21
21
|
</div>
|
|
22
22
|
<div class="col-sm-4 form-group button-range">
|
|
23
23
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
@@ -102,9 +102,9 @@ export default {
|
|
|
102
102
|
f_area: ''
|
|
103
103
|
},
|
|
104
104
|
areaslist: [],
|
|
105
|
-
model: new PagedList('
|
|
105
|
+
model: new PagedList('rs/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
|
-
items: `'f_userinfo_code,f_user_name,f_address,ua.id,f_building'`,
|
|
107
|
+
items: `'ui.f_userinfo_code,ui.f_user_name,ua.f_address,ua.id,ua.f_building'`,
|
|
108
108
|
orderitem: `'f_address desc'`
|
|
109
109
|
})
|
|
110
110
|
}
|
|
@@ -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', 'rs/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('rs/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', 'rs/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', 'rs/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', 'rs/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('rs/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('rs/logic/address_updateuseraddress', this.model)
|
|
705
705
|
},
|
|
706
706
|
cancel(){
|
|
707
707
|
this.cleardara()
|