apply-clients 7.1.36-yuchuan-7 → 7.1.36-yuchuan-8

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.
@@ -489,7 +489,7 @@ export default {
489
489
  condition: `u.id = ${this.show_data.id}`,
490
490
  data: {
491
491
  userid: Vue.user.id,
492
- f_filiale: Vue.user.f_fengongsi
492
+ f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
493
493
  }
494
494
  }
495
495
  let url =`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`
@@ -720,7 +720,7 @@ export default {
720
720
  async getResidentialArea() {
721
721
  let data = {
722
722
  tablename: 't_area_address',
723
- condition: `f_filiale = '${Vue.user.f_fengongsi}' and f_area_status = '启用'`
723
+ condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
724
724
  }
725
725
  let http = new HttpResetClass()
726
726
  let res = await http.load(
@@ -1053,7 +1053,7 @@ export default {
1053
1053
  f_user_id: userinfo.f_user_id,
1054
1054
  f_userinfo_id: userinfo.f_userinfo_id,
1055
1055
  record: {
1056
- f_filiale: Vue.user.f_fengongsi,
1056
+ f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气',
1057
1057
  f_instruct_meta_data: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
1058
1058
  f_instruct_title: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
1059
1059
  f_instruct_type: '阀门控制',
@@ -1228,7 +1228,7 @@ export default {
1228
1228
  let pcdText = `and f_residential_area like '%${val}%'`
1229
1229
  let data = {
1230
1230
  tablename: 't_area_address',
1231
- condition: `f_filiale = '${Vue.user.f_fengongsi}' and f_area_status = '启用' ${pcdText}`
1231
+ condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用' ${pcdText}`
1232
1232
  }
1233
1233
  new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
1234
1234
  console.log('请求发送完成!!!!!'+JSON.stringify(res))