apply-clients 7.1.36-yuchuan-26 → 7.1.36-yuchuan-28

package/build/dev-server.js

@@ -6,14 +6,14 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
-var ldap = 'http://193.168.1.44:8600/'
+// var ldap = 'http://193.168.1.44:8600'
 // var applyinstall = 'http://121.36.79.201:8400'
 // var ldap = 'http://193.168.1.64:8082'
-// var ldap = 'http://61.134.61.238:8555'
-// var applyinstall = 'http://61.134.61.238:8555'
-var applyinstall = 'http://193.168.1.44:8600/'
-var fadada = 'http://193.168.1.44:8600/'
-// var fadada = 'http://61.134.61.238:8555'
+var ldap = 'http://61.134.61.238:8655'
+var applyinstall = 'http://61.134.61.238:8655'
+// var applyinstall = 'http://193.168.1.44:8600'
+// var fadada = 'http://193.168.1.44:8600'
+var fadada = 'http://61.134.61.238:8655'
 // var fadada = 'http://127.0.0.1:8080/'
 var proxyTable = {
   '/testfiles': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-26",
+  "version": "7.1.36-yuchuan-28",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -96,7 +96,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.72-yc-1",
+    "system-clients": "3.2.72-yc-3",
     "system-phone": "1.2.87-ycapply-7",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.127",

package/src/components/android/Ignition/VentilationIgnition.vue

@@ -313,7 +313,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
         // condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()

package/src/components/android/Ignition/VentilationIgnitionHandle.vue

@@ -304,17 +304,27 @@ export default {
       let http = new HttpResetClass()
       let data = null
       let res = null
-
+      let data2 = {
+        condition: `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      }
+      let http2 = new HttpResetClass()
+      let res2 = await http2.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyUserinfo`,
+        {data: data2},
+        {resolveMsg: null, rejectMsg: '档案获取失败！！！'}
+      )
+      let userinfo = res2.data[0]
       if (this.type !== '退出强制状态') {
         data = {
-          condition: `f_meternumber = '${this.selectdata.f_meternumber}'`,
+          condition: `t_userfiles.f_meternumber = '${this.selectdata.f_meternumber}'`,
           contentData: {
             isOpen: this.type === '开阀' ? 1 : 0
           },
           inputtor: Vue.user.name,
           instructTitle: this.type,
           instructType: '阀门控制',
-          meterBrandName: this.selectdata.f_meter_brand
+          meterBrandName: userinfo.f_alias
         }
         res = await http.load(
           'POST',
@@ -328,7 +338,7 @@ export default {
         f_user_id: this.selectdata.f_user_id,
         f_userinfo_id: this.selectdata.f_userinfo_id,
         record: {
-          f_filiale: Vue.user.orgs,
+          f_filiale: Vue.user.orgstr,
           f_instruct_meta_data: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_title: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_type: '阀门控制',

package/src/components/android/Process/AppExplorationUser.vue

@@ -234,7 +234,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.orgs
+          f_filiale: Vue.user.orgstr
         }
       }),
       criteriaShow: false,
@@ -347,7 +347,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/Process/AppServiceControl.vue

@@ -489,7 +489,7 @@ export default {
           condition: `u.id = ${this.show_data.id}`,
           data: {
             userid: Vue.user.id,
-            f_filiale: Vue.user.orgs
+            f_filiale: Vue.user.orgstr
           }
         }
         let url =`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`
@@ -720,7 +720,7 @@ export default {
     async getResidentialArea() {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale  like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale  like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -1053,7 +1053,7 @@ export default {
         f_user_id: userinfo.f_user_id,
         f_userinfo_id: userinfo.f_userinfo_id,
         record: {
-          f_filiale: Vue.user.orgs,
+          f_filiale: Vue.user.orgstr,
           f_instruct_meta_data: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_title: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_type: '阀门控制',
@@ -1228,7 +1228,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用' ${pcdText}`
       }
       new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('请求发送完成！！！！！'+JSON.stringify(res))
@@ -1405,7 +1405,7 @@ export default {
         f_operator: Vue.user.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: Vue.user.orgid,
-        f_orgname: Vue.user.orgs
+        f_orgname: Vue.user.orgstr
       }
       this.show_data.onetomany[index].fields.forEach(item => {
         data[item.field] = item.value

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -880,7 +880,7 @@ export default {
     async getAreaList () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -902,7 +902,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用' ${pcdText}`
       }
       new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('请求发送完成！！！！！'+JSON.stringify(res))

package/src/components/android/Sign/AppSignTask.vue

@@ -88,7 +88,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/signcheckuser`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale:Vue.user.orgs
+          f_filiale:Vue.user.orgstr
         }
       }),
       criteriaShow: false,

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -213,7 +213,7 @@
         model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/appSupervisory`, 20, {
           data: {
             id: Vue.user.id,
-            f_filiale: Vue.user.orgs
+            f_filiale: Vue.user.orgstr
           }
         }),
         criteriaShow: false,

package/src/components/android/Task/GuanXianJianShe/AppExplorationGuanXian.vue

@@ -117,7 +117,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getGuanXianApply`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.orgs
+          f_filiale: Vue.user.orgstr
         }
       }),
       criteriaShow: false,

package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue

@@ -233,7 +233,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/showBuildCheckuser`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.orgs
+          f_filiale: Vue.user.orgstr
         }
       }),
       criteriaShow: false,
@@ -335,7 +335,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/Task/yiban/AppShowDone.vue

@@ -234,7 +234,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/yiBanSupervisory`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.orgs
+          f_filiale: Vue.user.orgstr
         }
       }),
       criteriaShow: false,
@@ -346,7 +346,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/newPackage/customerServiceManager.vue

@@ -136,7 +136,7 @@ export default {
             condition: '1=1',
             data: {
               id: Vue.user.id,
-              f_filiale: Vue.user.orgs
+              f_filiale: Vue.user.orgstr
               // id: this.$login.f.id,
               // f_filiale: this.$login.f.f_fengongsi
             }

package/src/components/android/newPackage/projectPrice.vue

@@ -136,7 +136,7 @@ export default {
             condition: '1=1',
             data: {
               id: Vue.user.id,
-              f_filiale: Vue.user.orgs
+              f_filiale: Vue.user.orgstr
               // id: this.$login.f.id,
               // f_filiale: this.$login.f.f_fengongsi
             }

package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue

@@ -131,7 +131,7 @@ export default {
       model: new PagedList('rs/sql/getGuanXianApply', 20, {
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }),
       showModal: false, // 控制发起类型选择
@@ -270,7 +270,7 @@ export default {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/ApplyGuanXian/GuanXianExplorationUser.vue

@@ -79,7 +79,7 @@ export default {
           condition: `u.id = ${servicedata.id}`,
           data: {
             userid: this.$login.f.id,
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
         let res = await this.$resetpost(

package/src/components/product/Function/InstallFunction.vue

@@ -61,7 +61,7 @@
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
 

package/src/components/product/Function/InstallInfoSelect.vue

@@ -227,7 +227,7 @@
       return {
         model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }),
         funcs: [], // 功能列表

package/src/components/product/GongJianPush/ApplyPushManage.vue

@@ -28,7 +28,7 @@ export default {
 
       // 分公司id串
       width: '100%',
-      f_filialeids: this.$login.f.orgs,
+      f_filialeids: this.$login.f.orgstr,
       areaShow: false,
       areatype: '小区',
       arearow: {},

package/src/components/product/List/OldShowDevices.vue

@@ -201,7 +201,7 @@ export default {
     return {
       model: new PagedList('rs/sql/getOldDevices', 20, {
         data: {
-          f_filiale:this.$login.f.orgs
+          f_filiale:this.$login.f.orgstr
         }
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -259,7 +259,7 @@ export default {
       return {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/List/ShowAllActivity.vue

@@ -374,7 +374,7 @@ export default {
     return {
       model: new PagedList('rs/sql/applyGetAllActivityTime', 20, {
         data: {
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -527,7 +527,7 @@ export default {
       return {
         condition: this.model.condition,
         data: {
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/List/ShowDevices.vue

@@ -210,7 +210,7 @@ export default {
     return {
       model: new PagedList('rs/sql/getApplyDevices', 20, {
         data: {
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -267,7 +267,7 @@ export default {
       return {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/Process/ExplorationSelect.vue

@@ -341,7 +341,7 @@ export default {
       model: new PagedList('rs/sql/checkuser', 20, {
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }),
       showModal: false, // 控制发起类型选择
@@ -533,7 +533,7 @@ export default {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/Process/ExplorationUser.vue

@@ -87,13 +87,12 @@ export default {
     },
     // 刷新控制层
     async 'breakControl' (servicedata) {
-
       if (servicedata.id) {
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
             userid: this.$login.f.id,
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
         let res = await this.$resetpost(

package/src/components/product/Process/New1ExplorationUser.vue

@@ -72,13 +72,12 @@ export default {
       Vue.prototype.$workflow_vue = res.data
     },
     async breakControl (servicedata) {
-
       if (servicedata.id) {
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
             userid: this.$login.f.id,
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
         let res = await this.$resetpost(
@@ -120,13 +119,12 @@ export default {
     },
     // 刷新控制层
     async 'breakControl' (servicedata) {
-
       if (servicedata.id) {
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
             userid: this.$login.f.id,
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
         let res = await this.$resetpost(
@@ -134,7 +132,9 @@ export default {
           {data: data},
           {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
         )
-
+        if(res.data[0].f_userinfo_id==null || res.data[0].f_userinfo_id==''){
+          res.data[0].f_userinfo_id=servicedata.f_userinfo_id
+        }
         this.selectdata = res.data[0]
       } else {
         this.selectdata = servicedata

package/src/components/product/Process/NewExplorationSelect.vue

@@ -342,7 +342,7 @@ export default {
       model: new PagedList('rs/sql/checkuser', 20, {
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }),
       // showModal: false, // 控制发起类型选择
@@ -532,7 +532,7 @@ export default {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

package/src/components/product/Process/NewExplorationUser.vue

@@ -87,7 +87,7 @@ export default {
           condition: `u.id = ${servicedata.id}`,
           data: {
             userid: this.$login.f.id,
-            f_filiale: this.$login.f.orgs
+            f_filiale: this.$login.f.orgstr
           }
         }
         let res = await this.$resetpost(

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

@@ -907,7 +907,7 @@ export default {
     async getAreaList () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -929,7 +929,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用' ${pcdText}`
       }
       new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('请求发送完成！！！！！'+JSON.stringify(res))
@@ -1052,7 +1052,7 @@ export default {
         condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     },
@@ -1115,7 +1115,7 @@ export default {
         condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgstr
         }
       }
     }

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 like '%${this.$login.f.orgs}%' and ui.f_user_state = '正常'`
+      args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgs}%'`
+      args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%'`
 
       this.model.search(args.condition, args.model)
     },
@@ -180,7 +180,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgs}%' and ui.f_user_state = '分户挂表'`
+        args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' and ui.f_user_state = '分户挂表'`
       }else if (this.selectdata.f_apply_type === '改线业务'){
-        args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgs}%' and ui.f_user_state = '正常'`
+        args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

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

@@ -68,7 +68,7 @@ export default {
         this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
         return
       }
-
+      debugger
       this.selectdata = Object.assign({}, this.selectdata, jsonData)
 
       // fields 字段填充值
@@ -278,7 +278,7 @@ export default {
       }
       // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
       let  temp = JSON.parse(JSON.stringify(this.selectdata))
-
+      debugger
       this.show_data = temp
       this.$nextTick(() => {
         this.showview = true
@@ -1149,7 +1149,7 @@ export default {
     async getResidentialArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale in ('${this.$login.f.orgs}','榆林.榆川天然气') and f_area_status = '启用'`
+        condition: `f_filiale in ('${this.$login.f.orgstr}','榆林.榆川天然气') and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -1292,7 +1292,7 @@ export default {
       }
 
       let data = {
-        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}'`
+        condition: `sp.f_filiale like '%${this.$login.f.orgstr}%' 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 === '民用报建') {
@@ -1549,7 +1549,7 @@ export default {
         f_user_id: userinfo.f_user_id,
         f_userinfo_id: userinfo.f_userinfo_id,
         record: {
-          f_filiale: this.$login.f.orgs,
+          f_filiale: this.$login.f.orgstr,
           f_instruct_meta_data: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_title: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
           f_instruct_type: '阀门控制',
@@ -1659,7 +1659,7 @@ export default {
       }
 
       let data = {
-        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}'`
+        condition: `sp.f_filiale  like '%${this.$login.f.orgstr}%' 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 === '民用报建') {
@@ -1940,7 +1940,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${this.$login.f.orgs}%'  and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${this.$login.f.orgstr}%'  and f_area_status = '启用' ${pcdText}`
       }
       new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('请求发送完成！！！！！'+JSON.stringify(res))
@@ -2105,7 +2105,7 @@ export default {
         f_operator: this.$login.f.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: this.$login.f.orgid,
-        f_orgname: this.$login.f.orgs
+        f_orgname: this.$login.f.orgstr
       }
       this.show_data.onetomany[index].fields.forEach(item => {
         data[item.field] = item.value