apply-clients 7.1.36-yuchuan-13 → 7.1.36-yuchuan-16

package/src/components/product/Process/Processes/selectChaiChuUserinfo.vue

@@ -151,7 +151,7 @@ export default {
       this.showselect = false
     },
     searchCondition (args) {
-      args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and ui.f_user_state = '正常'`
+      args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgs}%' and ui.f_user_state = '正常'`
       this.model.search(args.condition, args.model)
     },
     clear () {
@@ -169,7 +169,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/product/Process/Processes/selectOldUserinfo.vue

@@ -161,7 +161,7 @@ export default {
       this.showselect = false
     },
     searchCondition (args) {
-      args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}'`
+      args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgs}%'`
 
       this.model.search(args.condition, args.model)
     },
@@ -180,7 +180,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/product/Process/Processes/selectUserinfo.vue

@@ -152,9 +152,9 @@ export default {
     },
     searchCondition (args) {
       if (this.selectdata.f_apply_type === '分户挂表'){
-        args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and ui.f_user_state = '分户挂表'`
+        args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgs}%' and ui.f_user_state = '分户挂表'`
       }else if (this.selectdata.f_apply_type === '改线业务'){
-        args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and ui.f_user_state = '正常'`
+        args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgs}%' and ui.f_user_state = '正常'`
       }
       this.model.search(args.condition, args.model)
     },
@@ -173,7 +173,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/product/Process/Service/ServiceControl.vue

@@ -849,7 +849,7 @@ export default {
     },
     //获取下发人（当前操作人所属部门下的所有人）
     getSource () {
-      return  'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_department_name + '$).getChildren()'
+      return  'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_parentname + '$).getChildren()'
     },
     async getUserName() {
       if(this.selectdata.f_construction_unit_id){
@@ -877,7 +877,7 @@ export default {
         source: '',
         userid: this.$login.f.id
       }
-      data.source = 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_department_name + '$).getChildren()'
+      data.source = 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_parentname + '$).getChildren()'
       let res = await this.$resetpost(
         'rs/search',
         {data: data},
@@ -1148,7 +1148,7 @@ export default {
     async getResidentialArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -1291,7 +1291,7 @@ export default {
       }
 
       let data = {
-        condition: `sp.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and sp.f_price_type = '${this.show_data.f_price_type}' and f_gasproperties = '${this.show_data.f_gas_nature}'`
+        condition: `sp.f_filiale like '%${this.$login.f.orgs}%' and sp.f_price_type = '${this.show_data.f_price_type}' and f_gasproperties = '${this.show_data.f_gas_nature}'`
       }
 
       if (this.show_data.f_apply_type === '民用报建') {
@@ -1548,7 +1548,7 @@ export default {
         f_user_id: userinfo.f_user_id,
         f_userinfo_id: userinfo.f_userinfo_id,
         record: {
-          f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气',
+          f_filiale: this.$login.f.orgs,
           f_instruct_meta_data: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_title: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_type: '阀门控制',
@@ -1658,7 +1658,7 @@ export default {
       }
 
       let data = {
-        condition: `sp.f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and sp.f_price_type = '${this.show_data.f_price_type}' and f_gasproperties = '${this.show_data.f_gas_nature}'`
+        condition: `sp.f_filiale  like '%${this.$login.f.orgs}%' and sp.f_price_type = '${this.show_data.f_price_type}' and f_gasproperties = '${this.show_data.f_gas_nature}'`
       }
 
       if (this.show_data.f_apply_type === '民用报建') {