address-client 3.2.54 → 3.2.57
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 +2 -2
- package/src/components/AreaList.vue +44 -69
- package/src/filiale/qinhua/UserAddress.vue +6 -6
- package/src/main.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "address-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.57",
|
|
4
4
|
"description": "地址管理前台组件",
|
|
5
5
|
"author": "wanbochao",
|
|
6
6
|
"license": "ISC",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"ldap-clients": "3.0.55-test-1",
|
|
82
82
|
"system-clients": "3.2.54-test-1",
|
|
83
83
|
"url-loader": "^0.5.7",
|
|
84
|
-
"vue-client": "1.24.
|
|
84
|
+
"vue-client": "1.24.72",
|
|
85
85
|
"vue-hot-reload-api": "^1.2.0",
|
|
86
86
|
"vue-html-loader": "^1.0.0",
|
|
87
87
|
"vue-loader": "^8.2.1",
|
|
@@ -166,20 +166,10 @@
|
|
|
166
166
|
</criteria-paged>
|
|
167
167
|
<modal :show="showDelete" large backdrop="false" :width="900">
|
|
168
168
|
<header slot="modal-header" class="modal-header">
|
|
169
|
-
<p class="bg-info text-center" style="padding: 8px;"
|
|
169
|
+
<p class="bg-info text-center" style="padding: 8px;">提示</p>
|
|
170
170
|
</header>
|
|
171
171
|
<article slot="modal-body" class="modal-body">
|
|
172
|
-
<
|
|
173
|
-
<div class="col-sm-6 form-group ">
|
|
174
|
-
<label class="font_normal_body">小区名称</label>
|
|
175
|
-
<input type="text" style="width:41%" v-show="false" v-validate:f_residential_area_id='{required: true }' v-model="areamodel.f_residential_area_id">
|
|
176
|
-
<v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
|
|
177
|
-
@change="areaChange"
|
|
178
|
-
:options='areaslist' placeholder='请选择'
|
|
179
|
-
close-on-select search="true">
|
|
180
|
-
</v-select>
|
|
181
|
-
</div>
|
|
182
|
-
</validator>
|
|
172
|
+
<p>您一共选中{{selectDataLen}}个小区，您确定是否要删除吗？</p>
|
|
183
173
|
</article>
|
|
184
174
|
<footer slot="modal-footer" class="modal-footer">
|
|
185
175
|
<button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
|
|
@@ -201,20 +191,12 @@
|
|
|
201
191
|
return {
|
|
202
192
|
showDelete: false,
|
|
203
193
|
criteriaShow: false,
|
|
204
|
-
// 目标小区数据
|
|
205
|
-
areamodel: {
|
|
206
|
-
f_residential_area_id: '',
|
|
207
|
-
f_pcd: '',
|
|
208
|
-
f_pcd_id: '',
|
|
209
|
-
f_street: '',
|
|
210
|
-
f_street_id: '',
|
|
211
|
-
f_slice_area: '',
|
|
212
|
-
f_residential_area: ''
|
|
213
|
-
},
|
|
214
194
|
model: new PagedList('rs/sql/address_getarealist',20),
|
|
195
|
+
selectDataLen: 0,
|
|
215
196
|
addflag: false,
|
|
216
197
|
addtitle:'',
|
|
217
198
|
getfield: {},
|
|
199
|
+
getRowData:[],
|
|
218
200
|
// 公司下拉
|
|
219
201
|
curorgid: [this.$login.f.orgid],
|
|
220
202
|
f_orgid: '',
|
|
@@ -318,45 +300,40 @@
|
|
|
318
300
|
this.f_filialeids = val[0]
|
|
319
301
|
},
|
|
320
302
|
async batchDelete () {
|
|
303
|
+
let flag = true
|
|
321
304
|
if (this.f_filialeids) {
|
|
322
305
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
306
|
+
// 获取要批量删除的小区数据
|
|
307
|
+
this.getRowData = this.$refs.paged.$refs.grid.getRowData()
|
|
308
|
+
this.getRowData.forEach((row,n) => {
|
|
309
|
+
console.log(JSON.stringify(row) + '==========')
|
|
310
|
+
if (row.addressnum > 0 ) {
|
|
311
|
+
this.$showAlert('您所选择的小区下已有地址信息,无法删除!','warning',2000)
|
|
312
|
+
this.selectDataLen = 0
|
|
313
|
+
flag = false
|
|
328
314
|
}
|
|
329
|
-
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
330
|
-
let redata = []
|
|
331
|
-
req.data.forEach((row) => {
|
|
332
|
-
redata.push({
|
|
333
|
-
label: row.f_residential_area,
|
|
334
|
-
value: row.id,
|
|
335
|
-
data: row,
|
|
336
|
-
id: row.id
|
|
337
|
-
})
|
|
338
315
|
})
|
|
339
|
-
|
|
316
|
+
if(flag){
|
|
317
|
+
this.selectDataLen = this.getRowData.length
|
|
318
|
+
console.log(this.selectDataLen + '-----------------------')
|
|
319
|
+
this.showDelete = true
|
|
320
|
+
}
|
|
340
321
|
} else {
|
|
341
322
|
this.$showAlert('请至少选择一项！', 'warning', 2000)
|
|
342
323
|
}
|
|
343
324
|
}else {
|
|
344
|
-
this.$showAlert('
|
|
325
|
+
this.$showAlert('请先选择左上角的所在分公司！', 'warning', 2000)
|
|
345
326
|
}
|
|
346
327
|
},
|
|
347
328
|
confirmDelete () {
|
|
348
329
|
let msg = {
|
|
349
|
-
resolveMsg: '
|
|
330
|
+
resolveMsg: '批量删除成功！',
|
|
350
331
|
rejectMsg: '批量删除失败！'
|
|
351
332
|
}
|
|
352
|
-
let oldAreaIds =
|
|
353
|
-
|
|
354
|
-
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
355
|
-
oldAreaIds[n] = row.id
|
|
356
|
-
})
|
|
333
|
+
let oldAreaIds = this.getRowData
|
|
334
|
+
console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
|
|
357
335
|
this.$resetpost('rs/logic/batchDelete',{
|
|
358
336
|
data:{
|
|
359
|
-
areamodel:this.areamodel,
|
|
360
337
|
oldAreaIds:oldAreaIds,
|
|
361
338
|
f_operator: this.$login.f.name,
|
|
362
339
|
f_operatorid: this.$login.f.id,
|
|
@@ -368,37 +345,35 @@
|
|
|
368
345
|
},msg)
|
|
369
346
|
this.$refs.paged.$refs.grid.selectInit()
|
|
370
347
|
this.$refs.paged.$refs.cri.search()
|
|
371
|
-
this.areamodel.f_residential_area_id = ''
|
|
372
348
|
this.showDelete = false
|
|
373
349
|
},
|
|
374
350
|
cancelDelete () {
|
|
375
351
|
this.$refs.paged.$refs.grid.selectInit()
|
|
376
352
|
this.$refs.paged.$refs.cri.search()
|
|
377
|
-
this.areamodel.f_residential_area_id = ''
|
|
378
353
|
this.showDelete = false
|
|
379
354
|
},
|
|
380
|
-
areaChange(val){
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
},
|
|
355
|
+
// areaChange(val){
|
|
356
|
+
// console.log("小区变化",val)
|
|
357
|
+
// let selectArea // 选中的小区数据
|
|
358
|
+
// for (let row of this.areaslist) {
|
|
359
|
+
// if (val == row.value) {
|
|
360
|
+
// selectArea = row.data
|
|
361
|
+
// break
|
|
362
|
+
// }
|
|
363
|
+
// }
|
|
364
|
+
// if (selectArea) {
|
|
365
|
+
// this.areamodel.f_residential_area_id = selectArea.id
|
|
366
|
+
// this.areamodel.f_pcd = selectArea.f_pcd
|
|
367
|
+
// this.areamodel.f_pcd_id = selectArea.f_pcd_id
|
|
368
|
+
// this.areamodel.f_street = selectArea.f_street
|
|
369
|
+
// this.areamodel.f_street_id = selectArea.f_street_id
|
|
370
|
+
// this.areamodel.f_slice_area = selectArea.f_slice_area
|
|
371
|
+
// this.areamodel.f_residential_area = selectArea.f_residential_area
|
|
372
|
+
// }
|
|
373
|
+
// this.$nextTick(() => {
|
|
374
|
+
// this.$resetValidation()
|
|
375
|
+
// })
|
|
376
|
+
// },
|
|
402
377
|
},
|
|
403
378
|
watch:{
|
|
404
379
|
|
|
@@ -137,12 +137,12 @@
|
|
|
137
137
|
<!-- <span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
|
|
138
138
|
<!--</div>-->
|
|
139
139
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
140
|
+
<div v-if="usertype" class="col-sm-12 form-group "
|
|
141
|
+
:class="[$v.f_address.required ? 'has-error' : 'has-success']">
|
|
142
|
+
<label for="f_address" class="font_normal_body">详细地址</label>
|
|
143
|
+
<input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
|
|
144
|
+
v-validate:f_address='{required: true }'/>
|
|
145
|
+
</div>
|
|
146
146
|
<!--<div v-if="usertype" class="col-sm-8 form-group ">-->
|
|
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="经度"/>-->
|