apply-clients 7.1.36-yuchuan-18 → 7.1.36-yuchuan-20

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.
@@ -7,6 +7,7 @@
7
7
  <script>
8
8
  import {HttpResetClass} from 'vue-client'
9
9
  import {isEmpty} from '../../../Util'
10
+ import Vue from "vue";
10
11
 
11
12
  // Date格式化
12
13
  Date.prototype.Format = function (fmt) {
@@ -849,7 +850,7 @@ export default {
849
850
  },
850
851
  //获取下发人(当前操作人所属部门下的所有人)
851
852
  getSource () {
852
- return 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_parentname + '$).getChildren()'
853
+ return 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_department_name + '$).getChildren()'
853
854
  },
854
855
  async getUserName() {
855
856
  if(this.selectdata.f_construction_unit_id){
@@ -877,7 +878,7 @@ export default {
877
878
  source: '',
878
879
  userid: this.$login.f.id
879
880
  }
880
- data.source = 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_parentname + '$).getChildren()'
881
+ data.source = 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_department_name + '$).getChildren()'
881
882
  let res = await this.$resetpost(
882
883
  'rs/search',
883
884
  {data: data},
@@ -1939,7 +1940,7 @@ export default {
1939
1940
  let pcdText = `and f_residential_area like '%${val}%'`
1940
1941
  let data = {
1941
1942
  tablename: 't_area_address',
1942
- condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用' ${pcdText}`
1943
+ condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
1943
1944
  }
1944
1945
  new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
1945
1946
  console.log('请求发送完成!!!!!'+JSON.stringify(res))