address-client 3.2.35 → 3.2.37

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/AddressList.vue +2 -2
  3. package/src/components/AreaList.vue +1 -1
  4. package/src/components/UserAddress.vue +4 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.35",
3
+ "version": "3.2.37",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
package/src/components/AddressList.vue CHANGED
@@ -436,11 +436,11 @@
436
436
  this.userInfos = []
437
437
  this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
438
438
  this.userInfos[n] = {
439
- userid: row.id,
439
+ addressid: row.id,
440
440
  f_residential_area: row.f_residential_area,
441
441
  f_street: row.f_street,
442
442
  f_address: row.f_address,
443
- f_address_rest: row.f_street + row.f_residential_area + (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
443
+ f_address_rest: (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
444
444
  }
445
445
  })
446
446
  let modifyBatchData = {
package/src/components/AreaList.vue CHANGED
@@ -321,7 +321,7 @@
321
321
  if (this.f_filialeids) {
322
322
  if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
323
323
  this.showDelete = true
324
- let condition = `a.f_orgid = '${this.f_filialeids}'`
324
+ let condition = `a.f_orgid = '${this.$login.f.orgid}'`
325
325
  let req = await this.$resetpost('rs/sql/address_getresidential', {
326
326
  data: {
327
327
  condition: condition
package/src/components/UserAddress.vue CHANGED
@@ -431,7 +431,7 @@
431
431
  this.areaslist = []
432
432
  // this.model.f_residential_area_id = null
433
433
  // this.model.f_residential_area = null
434
- let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.f_filialeids}'`
434
+ let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.$login.f.orgid}'`
435
435
  let req = await this.$resetpost('rs/sql/address_getresidential', {
436
436
  data: {
437
437
  condition: condition
@@ -466,9 +466,9 @@
466
466
  this.model.f_address_state = '已通气'
467
467
  this.initAreas(this.f_filialeids)
468
468
  // 添加特殊地址选省市区
469
- this.initpcds(` f_orgid = '${this.f_filialeids}'`)
470
- this.initstreets(` f_orgid = '${this.f_filialeids}' `)
471
- this.initareas(` f_orgid = '${this.f_filialeids}'`)
469
+ this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
470
+ this.initstreets(` f_orgid = '${this.$login.f.orgid}' `)
471
+ this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
472
472
 
473
473
  },
474
474