apply-clients 7.1.36-yuchuan-29 → 7.1.36-yuchuan-32

package/build/dev-server.js

@@ -6,16 +6,18 @@ 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.5:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
 // var ldap = 'http://193.168.1.64:8082'
-// 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 ldap = 'http://61.134.61.238:8655'
+var applyinstall = 'http://61.134.61.238:8655'
+// var applyinstall = 'http://193.168.1.5:8400'
+// var fadada = 'http://193.168.1.5:8400'
+var fadada = 'http://61.134.61.238:8655'
 var proxyTable = {
+  '/baojianFile': {
+    target: fadada
+  },
   '/testfiles': {
     target: fadada
   },
@@ -127,10 +129,10 @@ var proxyTable = {
   '/rs': {
     target: applyinstall
   },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
+  // '/ws': {
+  //   target: applyinstall,
+  //   ws: true // 代理webSocket
+  // }
 }
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-29",
+  "version": "7.1.36-yuchuan-32",
   "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-3",
+    "system-clients": "3.2.72-yc-2",
     "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.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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

@@ -338,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.orgstr,
+          f_filiale: "榆林."+Vue.user.orgs,
           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.orgstr
+          f_filiale: "榆林."+Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -347,7 +347,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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.orgstr
+            f_filiale: "榆林."+Vue.user.orgs
           }
         }
         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.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale  like '%${"榆林."+Vue.user.orgs}%' 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.orgstr,
+          f_filiale: "榆林."+Vue.user.orgs,
           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.orgstr}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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.orgstr
+        f_orgname: "榆林."+Vue.user.orgs
       }
       this.show_data.onetomany[index].fields.forEach(item => {
         data[item.field] = item.value

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

@@ -66,16 +66,17 @@
                 <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_style }}</p>
               </div>
               <div class="row text-right">
-                <button class="btn btn-info"
-                        @click.prevent="$parent.$parent.$parent.openModal(row)">
-                  {{$parent.mark === 1 ? '查看' : '修正'}}
-                </button>
                 <button class="btn btn-danger"
                         @click="$parent.$parent.$parent.deleteUserinfo(row)"
-                        v-if="$parent.showDeleteUserInfo"
+                        v-if="$parent.$parent.$parent.DeleteUserInfo"
                         :disabled="$parent.mark === 1 || row.f_user_state === '正常'">
                   销户
                 </button>
+                <button class="btn btn-info"
+                        @click.prevent="$parent.$parent.$parent.openModal(row)">
+                  {{$parent.mark === 1 ? '查看' : '修正'}}
+                </button>
+
               </div>
             </div>
           </div>
@@ -408,7 +409,8 @@ export default {
       showUserInformation: {},
       scanCodeConfig: null,
       gasbrandDisable: false,
-      showDeleteModel: false
+      showDeleteModel: false,
+      DeleteUserInfo: false,
     }
   },
   ready () {
@@ -417,8 +419,14 @@ export default {
     this.getMeterBrand()
     this.getAreaList()
     this.getScanCodeConfig()
+    this.showDeleteUserInfo()
   },
   methods: {
+   showDeleteUserInfo () {
+     if(this.selectdata.f_apply_type === '民用报建' && (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')){
+       this.DeleteUserInfo=true
+     }
+    },
     copydata(){
       if(!isEmpty(this.selectdata.f_building)){
         this.$refs.cp.$refs.cri.model.f_building=this.selectdata.f_building
@@ -880,7 +888,7 @@ export default {
     async getAreaList () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -902,7 +910,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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))
@@ -931,10 +939,7 @@ export default {
   events: {
   },
   computed: {
-    showDeleteUserInfo () {
-      return this.selectdata.f_apply_type === '民用报建' &&
-        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')
-    },
+
     showAddress () {
       return this.selectdata.f_apply_type === '民用报建' || this.selectdata.f_apply_type === '设备拆除'
     },

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.orgstr
+          f_filiale:"榆林."+Vue.user.orgs
         }
       }),
       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.orgstr
+            f_filiale: "榆林."+Vue.user.orgs
           }
         }),
         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.orgstr
+          f_filiale: "榆林."+Vue.user.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -335,7 +335,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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.orgstr
+          f_filiale: "榆林."+Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -346,7 +346,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
+        condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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.orgstr
+              f_filiale: "榆林."+Vue.user.orgs
               // 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.orgstr
+              f_filiale: "榆林."+Vue.user.orgs
               // 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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }
         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.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }
 

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.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }),
         funcs: [], // 功能列表

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

@@ -6,7 +6,7 @@
     </div>
     <div class="binary-right"  v-show="showItem">
       <gongjian-apply-dispose :recordlist="recordlist" :model="model" :oldmodel="oldmodel"
-                               :f_distribution_state="f_distribution_state" :row="row" :rowsdata="rowsdata1"
+                               :f_distribution_state="f_distribution_state" :row="row" :rows'榆林.'"rowsdata1"
                                :warehousename="warehousename"
       ></gongjian-apply-dispose>
     </div>
@@ -28,7 +28,7 @@ export default {
 
       // 分公司id串
       width: '100%',
-      f_filialeids: this.$login.f.orgstr,
+      f_filialeids: "榆林."+this.$login.f.orgs,
       areaShow: false,
       areatype: '小区',
       arearow: {},

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

@@ -78,7 +78,7 @@
             </div>
           </div>
         </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+        <data-grid :model="model" partial='list' v-ref:grid style="overfl'榆林.'uto" class="list_area table_sy">
           <template partial='head'>
             <tr>
               <th style="white-space: nowrap;">序号</th>
@@ -201,7 +201,7 @@ export default {
     return {
       model: new PagedList('rs/sql/getOldDevices', 20, {
         data: {
-          f_filiale:this.$login.f.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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

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

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

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

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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }),
       // 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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }
         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.orgstr}%' 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(
@@ -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.orgstr}%' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' 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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     },
@@ -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.orgstr
+          f_filiale: "榆林."+this.$login.f.orgs
         }
       }
     }

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.orgstr}%' 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 like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgstr}%'`
+      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 like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgstr}%' 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 like '%${this.$login.f.orgstr}%' 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

@@ -1149,7 +1149,7 @@ export default {
     async getResidentialArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale in ('${this.$login.f.orgstr}','榆林.榆川天然气') 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(
@@ -1292,7 +1292,7 @@ export default {
       }
 
       let data = {
-        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}'`
+        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 === '民用报建') {
@@ -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.orgstr,
+          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: '阀门控制',
@@ -1659,7 +1659,7 @@ export default {
       }
 
       let data = {
-        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}'`
+        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 === '民用报建') {
@@ -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.orgstr}%'  and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%'  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.orgstr
+        f_orgname: "榆林."+this.$login.f.orgs
       }
       this.show_data.onetomany[index].fields.forEach(item => {
         data[item.field] = item.value

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -155,10 +155,11 @@
               userid: this.selectdata.userid
             }, {resolveMsg: null, rejectMsg: null})
             let user = res.data
+            debugger
             this.data.orgs = user.orgs
             this.data.parentname = user.deps
           } catch (e) {
-            this.data.orgs = this.$login.f.orgstr
+            this.data.orgs = "榆林."+this.$login.f.orgs
             this.data.parentname = this.$login.f.deps
           }
         }
@@ -252,7 +253,7 @@
       async getResidentialArea () {
         let data = {
           tablename: 't_area_address',
-          condition: `f_filiale like '%${this.$login.f.orgstr}%' 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/Supervisory/SupervisoryList.vue

@@ -355,7 +355,7 @@
       return {
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
-            f_filiale:this.$login.f.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           },
         }),
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -543,7 +543,7 @@
           condition: this.$refs.cp.$refs.cri.condition,
           data: {
             // orgid: this.$login.f.orgid
-            f_filiale: this.$login.f.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }
       },

package/src/components/product/Supervisory/YiBanSupervisoryList.vue

@@ -338,7 +338,7 @@
       return {
         model: new PagedList('rs/sql/yiBanSupervisory', 20, {
           data: {
-            f_filiale: this.$login.f.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           },
         }),
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -525,7 +525,7 @@
           condition: this.$refs.cp.$refs.cri.condition,
           data: {
             // orgid: this.$login.f.orgid
-            f_filiale: this.$login.f.orgstr
+            f_filiale: "榆林."+this.$login.f.orgs
           }
         }
       },

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -130,8 +130,16 @@ export default {
     downloadfile(filepath){
       var link = document.createElement('a');
       link.href = filepath;
-      link.target='_blank'
-      link.dispatchEvent(new MouseEvent('click'));
+      // 设置下载属性，使得点击时触发下载
+      link.download = filepath.split('/').pop(); // 获取文件名并设置为下载时的文件名
+      // 隐藏链接（非必需，但避免不必要的视觉干扰）
+      link.style.display = 'none';
+      // 将链接添加到文档中
+      document.body.appendChild(link);
+      // 触发点击事件开始下载
+      link.click();
+      // 下载后移除链接（可选，为了保持DOM清洁）
+      document.body.removeChild(link);
     },
     // 关闭文件上传对话框
     close () {
@@ -182,6 +190,7 @@ export default {
           getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
         }
       }
+      debugger
       this.fileInfoData = []
       this.fileInfoData = getFile.data
     },

package/src/main.js

@@ -13,7 +13,7 @@ import apply from './apply'
 all()
 weixinManage('yuchuan', 'test')
 apply()
-ldap('zhoukou')
+ldap("zhoukou")
 sale()
 material()
 system(false, 'yuchuan')