address-client 3.2.59 → 3.2.61

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/UserAddress.vue +1 -0
  3. package/src/filiale/macheng/AddressList.vue +613 -613
  4. package/src/filiale/qinhua/AddressList.vue +4 -1
  5. package/src/filiale/qinhua/AreaList.vue +5 -2
  6. package/src/filiale/qinhua/StreetList.vue +4 -1
package/src/filiale/qinhua/AddressList.vue CHANGED
@@ -615,8 +615,11 @@
615
615
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
616
616
  },
617
617
  getCondition() {
618
+ if (!this.f_orgid) {
619
+ this.getorg([this.$login.f.orgid])
620
+ }
618
621
  return {
619
- condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
622
+ condition: `${this.$refs.paged.$refs.cri.condition}` + `and (a.f_filialeid = '${this.f_filialeids}' or a.f_filialeid ='1111')`}
620
623
  }
621
624
  }
622
625
 
package/src/filiale/qinhua/AreaList.vue CHANGED
@@ -393,10 +393,13 @@
393
393
  computed:{
394
394
  getCondition() {
395
395
  var condition=''
396
+ if (!this.f_orgid) {
397
+ this.getorg([this.$login.f.orgid])
398
+ }
396
399
  if(this.f_special){
397
- condition = `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
400
+ condition = `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and (s.f_filialeid = '${this.f_filialeids}' or s.f_filialeid ='1111')'`
398
401
  }else{
399
- condition = `${this.$refs.paged.$refs.cri.condition} and s.f_filialeid = ${this.f_orgid}`
402
+ condition = `${this.$refs.paged.$refs.cri.condition} and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid ='1111')`
400
403
  }
401
404
  return {
402
405
  condition: condition
package/src/filiale/qinhua/StreetList.vue CHANGED
@@ -207,8 +207,11 @@
207
207
  },
208
208
  computed: {
209
209
  getCondition() {
210
+ if (!this.f_orgid) {
211
+ this.getorg([this.$login.f.orgid])
212
+ }
210
213
  return {
211
- condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
214
+ condition: `${this.$refs.paged.$refs.cri.condition}` + `and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid = '1111')`,
212
215
  orderitem: this.orderitem?`${this.orderitem}`: " id desc"
213
216
  }
214
217
  }