address-client 3.2.5 → 3.2.9

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.
Files changed (36) hide show
  1. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  2. package/build/dev-server.js +12 -16
  3. package/package.json +1 -1
  4. package/src/address.js +57 -55
  5. package/src/components/AddAreaMsg.vue +743 -669
  6. package/src/components/AddressList.vue +5 -5
  7. package/src/components/AddressModel.vue +95 -95
  8. package/src/components/AreaManage.vue +100 -100
  9. package/src/components/BuildingList.vue +129 -0
  10. package/src/components/UserAddress.vue +2 -4
  11. package/src/filiale/WEINAN/AddAreaMsg.vue +1 -1
  12. package/src/filiale/WEINAN/AddressList.vue +588 -357
  13. package/src/filiale/WEINAN/AreaList.vue +121 -8
  14. package/src/filiale/gaomi/AddressList.vue +430 -430
  15. package/src/filiale/gaomi/sale.js +14 -14
  16. package/src/filiale/gongyi/AddAreaMsg.vue +651 -651
  17. package/src/filiale/qianneng/AreaList.vue +431 -0
  18. package/src/filiale/qianneng/UserAddress.vue +932 -0
  19. package/src/filiale/qianneng/sale.js +12 -0
  20. package/src/filiale/rongcheng/AddressList.vue +363 -363
  21. package/src/filiale/shaoguan/UserAddress.vue +764 -764
  22. package/src/filiale/shaoguan/sale.js +11 -11
  23. package/src/main.js +1 -1
  24. package/.gradle/6.1/executionHistory/executionHistory.bin +0 -0
  25. package/.gradle/6.1/executionHistory/executionHistory.lock +0 -0
  26. package/.gradle/6.1/fileChanges/last-build.bin +0 -0
  27. package/.gradle/6.1/fileHashes/fileHashes.bin +0 -0
  28. package/.gradle/6.1/fileHashes/fileHashes.lock +0 -0
  29. package/.gradle/6.1/gc.properties +0 -0
  30. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  31. package/.gradle/checksums/checksums.lock +0 -0
  32. package/.gradle/vcs-1/gc.properties +0 -0
  33. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  34. package/gradle/wrapper/gradle-wrapper.properties +0 -5
  35. package/gradlew +0 -183
  36. package/gradlew.bat +0 -100
@@ -40,6 +40,7 @@
40
40
  </div>
41
41
  <div class="col-sm-4 form-group button-range">
42
42
  <button class="button_search button_spacing" @click="search()" >查询</button>
43
+ <button class="button_search button_spacing" @click="$parent.$parent.batchDelete()">批量删除</button>
43
44
  <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
44
45
  <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
45
46
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -94,9 +95,8 @@
94
95
 
95
96
 
96
97
  </criteria>
97
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
98
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :optional="true">
98
99
  <template partial='head'>
99
- <tr>
100
100
  <th><nobr>序号</nobr></th>
101
101
  <th v-if="false"><nobr>省份</nobr></th>
102
102
  <th v-if="false"><nobr>城市</nobr></th>
@@ -118,11 +118,8 @@
118
118
  <th><nobr>操作人</nobr></th>
119
119
  <th><nobr>操作日期</nobr></th>
120
120
  <th><nobr>操作</nobr></th>
121
-
122
- </tr>
123
121
  </template>
124
122
  <template partial='body'>
125
- <tr>
126
123
  <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
127
124
  <td style="text-align:center" v-if="false"><nobr>{{row.f_province}}</nobr></td>
128
125
  <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
@@ -146,11 +143,32 @@
146
143
  style="padding: 5px 12px"
147
144
  @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
148
145
  </nobr></td>
149
- </tr>
150
146
  </template>
151
147
  <template partial='foot'></template>
152
148
  </data-grid>
153
149
  </criteria-paged>
150
+ <modal :show="showDelete" large backdrop="false" :width="900">
151
+ <header slot="modal-header" class="modal-header">
152
+ <p class="bg-info text-center" style="padding: 8px;">请选择目标小区</p>
153
+ </header>
154
+ <article slot="modal-body" class="modal-body">
155
+ <validator name='v'>
156
+ <div class="col-sm-6 form-group ">
157
+ <label class="font_normal_body">小区名称</label>
158
+ <input type="text" style="width:41%" v-show="false" v-validate:f_residential_area_id='{required: true }' v-model="areamodel.f_residential_area_id">
159
+ <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
160
+ @change="areaChange"
161
+ :options='areaslist' placeholder='请选择'
162
+ close-on-select search="true">
163
+ </v-select>
164
+ </div>
165
+ </validator>
166
+ </article>
167
+ <footer slot="modal-footer" class="modal-footer">
168
+ <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
169
+ <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
170
+ </footer>
171
+ </modal>
154
172
  </div>
155
173
  </template>
156
174
 
@@ -171,7 +189,20 @@
171
189
  f_orgid: '',
172
190
  handmonth:[{label:'全部',value:''},{label:'单月',value:'单月'},{label:'双月',value:'双月'}],
173
191
  housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
174
- position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
192
+ position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}],
193
+ //初始化小区数据
194
+ areaslist:[],
195
+ // 目标小区数据
196
+ areamodel: {
197
+ f_residential_area_id: '',
198
+ f_pcd: '',
199
+ f_pcd_id: '',
200
+ f_street: '',
201
+ f_street_id: '',
202
+ f_slice_area: '',
203
+ f_residential_area: ''
204
+ },
205
+ showDelete: false,
175
206
  }
176
207
  },
177
208
  title: '小区管理',
@@ -249,7 +280,89 @@
249
280
  getorg (val) {
250
281
  this.f_orgid = this.$login.convertToIn(val)
251
282
  this.f_filialeids = val[0]
252
- }
283
+ },
284
+ async batchDelete () {
285
+ if (this.f_filialeids) {
286
+ if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
287
+ this.showDelete = true
288
+ let condition = `a.f_orgid = '${this.f_filialeids}'`
289
+ let req = await this.$resetpost('rs/sql/address_getresidential', {
290
+ data: {
291
+ condition: condition
292
+ }
293
+ }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
294
+ let redata = []
295
+ req.data.forEach((row) => {
296
+ redata.push({
297
+ label: row.f_residential_area,
298
+ value: row.id,
299
+ data: row,
300
+ id: row.id
301
+ })
302
+ })
303
+ this.areaslist = redata
304
+ } else {
305
+ this.$showAlert('请至少选择一项!', 'warning', 2000)
306
+ }
307
+ }else {
308
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
309
+ }
310
+ },
311
+ confirmDelete () {
312
+ let msg = {
313
+ resolveMsg: '批量删除成功',
314
+ rejectMsg: '批量删除失败!'
315
+ }
316
+ let oldAreaIds = []
317
+ // 获取要批量删除的小区数据
318
+ this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
319
+ oldAreaIds[n] = row.id
320
+ })
321
+ this.$resetpost('rs/logic/batchDelete',{
322
+ data:{
323
+ areamodel:this.areamodel,
324
+ oldAreaIds:oldAreaIds,
325
+ f_operator: this.$login.f.name,
326
+ f_operatorid: this.$login.f.id,
327
+ f_orgid: this.$login.f.orgid,
328
+ f_orgname: this.$login.f.orgs,
329
+ f_depid: this.$login.f.depids,
330
+ f_depname: this.$login.f.deps
331
+ }
332
+ },msg)
333
+ this.$refs.paged.$refs.grid.selectInit()
334
+ this.$refs.paged.$refs.cri.search()
335
+ this.areamodel.f_residential_area_id = ''
336
+ this.showDelete = false
337
+ },
338
+ cancelDelete () {
339
+ this.$refs.paged.$refs.grid.selectInit()
340
+ this.$refs.paged.$refs.cri.search()
341
+ this.areamodel.f_residential_area_id = ''
342
+ this.showDelete = false
343
+ },
344
+ areaChange(val){
345
+ console.log("小区变化",val)
346
+ let selectArea // 选中的小区数据
347
+ for (let row of this.areaslist) {
348
+ if (val == row.value) {
349
+ selectArea = row.data
350
+ break
351
+ }
352
+ }
353
+ if (selectArea) {
354
+ this.areamodel.f_residential_area_id = selectArea.id
355
+ this.areamodel.f_pcd = selectArea.f_pcd
356
+ this.areamodel.f_pcd_id = selectArea.f_pcd_id
357
+ this.areamodel.f_street = selectArea.f_street
358
+ this.areamodel.f_street_id = selectArea.f_street_id
359
+ this.areamodel.f_slice_area = selectArea.f_slice_area
360
+ this.areamodel.f_residential_area = selectArea.f_residential_area
361
+ }
362
+ this.$nextTick(() => {
363
+ this.$resetValidation()
364
+ })
365
+ },
253
366
  },
254
367
  watch:{
255
368