apply-clients 7.1.36-yuchuan-28 → 7.1.36-yuchuan-30

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.
Files changed (35) hide show
  1. package/build/dev-server.js +6 -6
  2. package/package.json +2 -2
  3. package/src/components/android/Ignition/VentilationIgnition.vue +1 -1
  4. package/src/components/android/Ignition/VentilationIgnitionHandle.vue +1 -1
  5. package/src/components/android/Process/AppExplorationUser.vue +2 -2
  6. package/src/components/android/Process/AppServiceControl.vue +5 -5
  7. package/src/components/android/Process/Processes/AppInstallationDetails.vue +2 -2
  8. package/src/components/android/Sign/AppSignTask.vue +1 -1
  9. package/src/components/android/Supervisory/AppProcessSupervisory.vue +1 -1
  10. package/src/components/android/Task/GuanXianJianShe/AppExplorationGuanXian.vue +1 -1
  11. package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue +2 -2
  12. package/src/components/android/Task/yiban/AppShowDone.vue +2 -2
  13. package/src/components/android/newPackage/customerServiceManager.vue +1 -1
  14. package/src/components/android/newPackage/projectPrice.vue +1 -1
  15. package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue +2 -2
  16. package/src/components/product/ApplyGuanXian/GuanXianExplorationUser.vue +1 -1
  17. package/src/components/product/Function/InstallFunction.vue +1 -1
  18. package/src/components/product/Function/InstallInfoSelect.vue +1 -1
  19. package/src/components/product/GongJianPush/ApplyPushManage.vue +2 -2
  20. package/src/components/product/List/OldShowDevices.vue +3 -3
  21. package/src/components/product/List/ShowAllActivity.vue +2 -2
  22. package/src/components/product/List/ShowDevices.vue +2 -2
  23. package/src/components/product/Process/ExplorationSelect.vue +2 -2
  24. package/src/components/product/Process/ExplorationUser.vue +1 -1
  25. package/src/components/product/Process/New1ExplorationUser.vue +2 -2
  26. package/src/components/product/Process/NewExplorationSelect.vue +2 -2
  27. package/src/components/product/Process/NewExplorationUser.vue +1 -1
  28. package/src/components/product/Process/Processes/InstallationDetails.vue +4 -4
  29. package/src/components/product/Process/Processes/selectChaiChuUserinfo.vue +2 -2
  30. package/src/components/product/Process/Processes/selectOldUserinfo.vue +2 -2
  31. package/src/components/product/Process/Processes/selectUserinfo.vue +3 -3
  32. package/src/components/product/Process/Service/ServiceControl.vue +6 -6
  33. package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue +3 -2
  34. package/src/components/product/Supervisory/SupervisoryList.vue +2 -2
  35. package/src/components/product/Supervisory/YiBanSupervisoryList.vue +2 -2
package/build/dev-server.js CHANGED
@@ -6,14 +6,14 @@ var proxyMiddleware = require('http-proxy-middleware')
6
6
  var app = express()
7
7
  var compiler = webpack(config)
8
8
  // var proxy = httpProxy.createProxyServer()
9
- // var ldap = 'http://193.168.1.44:8600'
9
+ var ldap = 'http://193.168.1.44:8600'
10
10
  // var applyinstall = 'http://121.36.79.201:8400'
11
11
  // var ldap = 'http://193.168.1.64:8082'
12
- var ldap = 'http://61.134.61.238:8655'
13
- var applyinstall = 'http://61.134.61.238:8655'
14
- // var applyinstall = 'http://193.168.1.44:8600'
15
- // var fadada = 'http://193.168.1.44:8600'
16
- var fadada = 'http://61.134.61.238:8655'
12
+ // var ldap = 'http://61.134.61.238:8655'
13
+ // var applyinstall = 'http://61.134.61.238:8655'
14
+ var applyinstall = 'http://193.168.1.44:8600'
15
+ var fadada = 'http://193.168.1.44:8600'
16
+ // var fadada = 'http://61.134.61.238:8655'
17
17
  // var fadada = 'http://127.0.0.1:8080/'
18
18
  var proxyTable = {
19
19
  '/testfiles': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "7.1.36-yuchuan-28",
3
+ "version": "7.1.36-yuchuan-30",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -96,7 +96,7 @@
96
96
  "sinon-chai": "^2.8.0",
97
97
  "style": "0.0.3",
98
98
  "style-loader": "^0.20.3",
99
- "system-clients": "3.2.72-yc-3",
99
+ "system-clients": "3.2.72-yc-2",
100
100
  "system-phone": "1.2.87-ycapply-7",
101
101
  "url-loader": "^0.5.7",
102
102
  "vue-client": "1.24.127",
package/src/components/android/Ignition/VentilationIgnition.vue CHANGED
@@ -313,7 +313,7 @@ export default {
313
313
  async getArea () {
314
314
  let data = {
315
315
  tablename: 't_area_address',
316
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
316
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
317
317
  // condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
318
318
  }
319
319
  let http = new HttpResetClass()
package/src/components/android/Ignition/VentilationIgnitionHandle.vue CHANGED
@@ -338,7 +338,7 @@ export default {
338
338
  f_user_id: this.selectdata.f_user_id,
339
339
  f_userinfo_id: this.selectdata.f_userinfo_id,
340
340
  record: {
341
- f_filiale: Vue.user.orgstr,
341
+ f_filiale: "榆林."+Vue.user.orgs,
342
342
  f_instruct_meta_data: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
343
343
  f_instruct_title: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
344
344
  f_instruct_type: '阀门控制',
package/src/components/android/Process/AppExplorationUser.vue CHANGED
@@ -234,7 +234,7 @@ export default {
234
234
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
235
235
  data: {
236
236
  userid: Vue.user.id,
237
- f_filiale: Vue.user.orgstr
237
+ f_filiale: "榆林."+Vue.user.orgs
238
238
  }
239
239
  }),
240
240
  criteriaShow: false,
@@ -347,7 +347,7 @@ export default {
347
347
  async getArea () {
348
348
  let data = {
349
349
  tablename: 't_area_address',
350
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
350
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
351
351
  }
352
352
  let http = new HttpResetClass()
353
353
  let res = await http.load(
package/src/components/android/Process/AppServiceControl.vue CHANGED
@@ -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.orgstr
492
+ f_filiale: "榆林."+Vue.user.orgs
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 like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
723
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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.orgstr,
1056
+ f_filiale: "榆林."+Vue.user.orgs,
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 like '%${Vue.user.orgstr}%' and f_area_status = '启用' ${pcdText}`
1231
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' 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))
@@ -1405,7 +1405,7 @@ export default {
1405
1405
  f_operator: Vue.user.name,
1406
1406
  f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
1407
1407
  f_orgid: Vue.user.orgid,
1408
- f_orgname: Vue.user.orgstr
1408
+ f_orgname: "榆林."+Vue.user.orgs
1409
1409
  }
1410
1410
  this.show_data.onetomany[index].fields.forEach(item => {
1411
1411
  data[item.field] = item.value
package/src/components/android/Process/Processes/AppInstallationDetails.vue CHANGED
@@ -880,7 +880,7 @@ export default {
880
880
  async getAreaList () {
881
881
  let data = {
882
882
  tablename: 't_area_address',
883
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
883
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
884
884
  }
885
885
  let http = new HttpResetClass()
886
886
  let res = await http.load(
@@ -902,7 +902,7 @@ export default {
902
902
  let pcdText = `and f_residential_area like '%${val}%'`
903
903
  let data = {
904
904
  tablename: 't_area_address',
905
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用' ${pcdText}`
905
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
906
906
  }
907
907
  new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
908
908
  console.log('请求发送完成！！！！！'+JSON.stringify(res))
package/src/components/android/Sign/AppSignTask.vue CHANGED
@@ -88,7 +88,7 @@ export default {
88
88
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/signcheckuser`, 20, {
89
89
  data: {
90
90
  userid: Vue.user.id,
91
- f_filiale:Vue.user.orgstr
91
+ f_filiale:"榆林."+Vue.user.orgs
92
92
  }
93
93
  }),
94
94
  criteriaShow: false,
package/src/components/android/Supervisory/AppProcessSupervisory.vue CHANGED
@@ -213,7 +213,7 @@
213
213
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/appSupervisory`, 20, {
214
214
  data: {
215
215
  id: Vue.user.id,
216
- f_filiale: Vue.user.orgstr
216
+ f_filiale: "榆林."+Vue.user.orgs
217
217
  }
218
218
  }),
219
219
  criteriaShow: false,
package/src/components/android/Task/GuanXianJianShe/AppExplorationGuanXian.vue CHANGED
@@ -117,7 +117,7 @@ export default {
117
117
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getGuanXianApply`, 20, {
118
118
  data: {
119
119
  userid: Vue.user.id,
120
- f_filiale: Vue.user.orgstr
120
+ f_filiale: "榆林."+Vue.user.orgs
121
121
  }
122
122
  }),
123
123
  criteriaShow: false,
package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue CHANGED
@@ -233,7 +233,7 @@ export default {
233
233
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/showBuildCheckuser`, 20, {
234
234
  data: {
235
235
  userid: Vue.user.id,
236
- f_filiale: Vue.user.orgstr
236
+ f_filiale: "榆林."+Vue.user.orgs
237
237
  }
238
238
  }),
239
239
  criteriaShow: false,
@@ -335,7 +335,7 @@ export default {
335
335
  async getArea () {
336
336
  let data = {
337
337
  tablename: 't_area_address',
338
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
338
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
339
339
  }
340
340
  let http = new HttpResetClass()
341
341
  let res = await http.load(
package/src/components/android/Task/yiban/AppShowDone.vue CHANGED
@@ -234,7 +234,7 @@ export default {
234
234
  model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/yiBanSupervisory`, 20, {
235
235
  data: {
236
236
  userid: Vue.user.id,
237
- f_filiale: Vue.user.orgstr
237
+ f_filiale: "榆林."+Vue.user.orgs
238
238
  }
239
239
  }),
240
240
  criteriaShow: false,
@@ -346,7 +346,7 @@ export default {
346
346
  async getArea () {
347
347
  let data = {
348
348
  tablename: 't_area_address',
349
- condition: `f_filiale like '%${Vue.user.orgstr}%' and f_area_status = '启用'`
349
+ condition: `f_filiale like '%${"榆林."+Vue.user.orgs}%' and f_area_status = '启用'`
350
350
  }
351
351
  let http = new HttpResetClass()
352
352
  let res = await http.load(
package/src/components/android/newPackage/customerServiceManager.vue CHANGED
@@ -136,7 +136,7 @@ export default {
136
136
  condition: '1=1',
137
137
  data: {
138
138
  id: Vue.user.id,
139
- f_filiale: Vue.user.orgstr
139
+ f_filiale: "榆林."+Vue.user.orgs
140
140
  // id: this.$login.f.id,
141
141
  // f_filiale: this.$login.f.f_fengongsi
142
142
  }
package/src/components/android/newPackage/projectPrice.vue CHANGED
@@ -136,7 +136,7 @@ export default {
136
136
  condition: '1=1',
137
137
  data: {
138
138
  id: Vue.user.id,
139
- f_filiale: Vue.user.orgstr
139
+ f_filiale: "榆林."+Vue.user.orgs
140
140
  // id: this.$login.f.id,
141
141
  // f_filiale: this.$login.f.f_fengongsi
142
142
  }
package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue CHANGED
@@ -131,7 +131,7 @@ export default {
131
131
  model: new PagedList('rs/sql/getGuanXianApply', 20, {
132
132
  data: {
133
133
  userid: this.$login.f.id,
134
- f_filiale: this.$login.f.orgstr
134
+ f_filiale: "榆林."+this.$login.f.orgs
135
135
  }
136
136
  }),
137
137
  showModal: false, // 控制发起类型选择
@@ -270,7 +270,7 @@ export default {
270
270
  condition: this.$refs.cp.$refs.cri.condition,
271
271
  data: {
272
272
  userid: this.$login.f.id,
273
- f_filiale: this.$login.f.orgstr
273
+ f_filiale: "榆林."+this.$login.f.orgs
274
274
  }
275
275
  }
276
276
  }
package/src/components/product/ApplyGuanXian/GuanXianExplorationUser.vue CHANGED
@@ -79,7 +79,7 @@ export default {
79
79
  condition: `u.id = ${servicedata.id}`,
80
80
  data: {
81
81
  userid: this.$login.f.id,
82
- f_filiale: this.$login.f.orgstr
82
+ f_filiale: "榆林."+this.$login.f.orgs
83
83
  }
84
84
  }
85
85
  let res = await this.$resetpost(
package/src/components/product/Function/InstallFunction.vue CHANGED
@@ -61,7 +61,7 @@
61
61
  let data = {
62
62
  condition: `u.id = ${servicedata.id}`,
63
63
  data: {
64
- f_filiale: this.$login.f.orgstr
64
+ f_filiale: "榆林."+this.$login.f.orgs
65
65
  }
66
66
  }
67
67
 
package/src/components/product/Function/InstallInfoSelect.vue CHANGED
@@ -227,7 +227,7 @@
227
227
  return {
228
228
  model: new PagedList('rs/sql/checkuserfunction', 20, {
229
229
  data: {
230
- f_filiale: this.$login.f.orgstr
230
+ f_filiale: "榆林."+this.$login.f.orgs
231
231
  }
232
232
  }),
233
233
  funcs: [], // 功能列表
package/src/components/product/GongJianPush/ApplyPushManage.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  </div>
7
7
  <div class="binary-right" v-show="showItem">
8
8
  <gongjian-apply-dispose :recordlist="recordlist" :model="model" :oldmodel="oldmodel"
9
- :f_distribution_state="f_distribution_state" :row="row" :rowsdata="rowsdata1"
9
+ :f_distribution_state="f_distribution_state" :row="row" :rows'榆林.'"rowsdata1"
10
10
  :warehousename="warehousename"
11
11
  ></gongjian-apply-dispose>
12
12
  </div>
@@ -28,7 +28,7 @@ export default {
28
28
 
29
29
  // 分公司id串
30
30
  width: '100%',
31
- f_filialeids: this.$login.f.orgstr,
31
+ f_filialeids: "榆林."+this.$login.f.orgs,
32
32
  areaShow: false,
33
33
  areatype: '小区',
34
34
  arearow: {},
package/src/components/product/List/OldShowDevices.vue CHANGED
@@ -78,7 +78,7 @@
78
78
  </div>
79
79
  </div>
80
80
  </criteria>
81
- <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
81
+ <data-grid :model="model" partial='list' v-ref:grid style="overfl'榆林.'uto" class="list_area table_sy">
82
82
  <template partial='head'>
83
83
  <tr>
84
84
  <th style="white-space: nowrap;">序号</th>
@@ -201,7 +201,7 @@ export default {
201
201
  return {
202
202
  model: new PagedList('rs/sql/getOldDevices', 20, {
203
203
  data: {
204
- f_filiale:this.$login.f.orgstr
204
+ f_filiale: "榆林."+this.$login.f.orgs
205
205
  }
206
206
  }),
207
207
  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -259,7 +259,7 @@ export default {
259
259
  return {
260
260
  condition: this.$refs.cp.$refs.cri.condition,
261
261
  data: {
262
- f_filiale: this.$login.f.orgstr
262
+ f_filiale: "榆林."+this.$login.f.orgs
263
263
  }
264
264
  }
265
265
  }
package/src/components/product/List/ShowAllActivity.vue CHANGED
@@ -374,7 +374,7 @@ export default {
374
374
  return {
375
375
  model: new PagedList('rs/sql/applyGetAllActivityTime', 20, {
376
376
  data: {
377
- f_filiale: this.$login.f.orgstr
377
+ f_filiale: "榆林."+this.$login.f.orgs
378
378
  }
379
379
  }),
380
380
  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -527,7 +527,7 @@ export default {
527
527
  return {
528
528
  condition: this.model.condition,
529
529
  data: {
530
- f_filiale: this.$login.f.orgstr
530
+ f_filiale: "榆林."+this.$login.f.orgs
531
531
  }
532
532
  }
533
533
  }
package/src/components/product/List/ShowDevices.vue CHANGED
@@ -210,7 +210,7 @@ export default {
210
210
  return {
211
211
  model: new PagedList('rs/sql/getApplyDevices', 20, {
212
212
  data: {
213
- f_filiale: this.$login.f.orgstr
213
+ f_filiale: "榆林."+this.$login.f.orgs
214
214
  }
215
215
  }),
216
216
  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -267,7 +267,7 @@ export default {
267
267
  return {
268
268
  condition: this.$refs.cp.$refs.cri.condition,
269
269
  data: {
270
- f_filiale: this.$login.f.orgstr
270
+ f_filiale: "榆林."+this.$login.f.orgs
271
271
  }
272
272
  }
273
273
  }
package/src/components/product/Process/ExplorationSelect.vue CHANGED
@@ -341,7 +341,7 @@ export default {
341
341
  model: new PagedList('rs/sql/checkuser', 20, {
342
342
  data: {
343
343
  userid: this.$login.f.id,
344
- f_filiale: this.$login.f.orgstr
344
+ f_filiale: "榆林."+this.$login.f.orgs
345
345
  }
346
346
  }),
347
347
  showModal: false, // 控制发起类型选择
@@ -533,7 +533,7 @@ export default {
533
533
  condition: this.$refs.cp.$refs.cri.condition,
534
534
  data: {
535
535
  userid: this.$login.f.id,
536
- f_filiale: this.$login.f.orgstr
536
+ f_filiale: "榆林."+this.$login.f.orgs
537
537
  }
538
538
  }
539
539
  }
package/src/components/product/Process/ExplorationUser.vue CHANGED
@@ -92,7 +92,7 @@ export default {
92
92
  condition: `u.id = ${servicedata.id}`,
93
93
  data: {
94
94
  userid: this.$login.f.id,
95
- f_filiale: this.$login.f.orgstr
95
+ f_filiale: "榆林."+this.$login.f.orgs
96
96
  }
97
97
  }
98
98
  let res = await this.$resetpost(
package/src/components/product/Process/New1ExplorationUser.vue CHANGED
@@ -77,7 +77,7 @@ export default {
77
77
  condition: `u.id = ${servicedata.id}`,
78
78
  data: {
79
79
  userid: this.$login.f.id,
80
- f_filiale: this.$login.f.orgstr
80
+ f_filiale: "榆林."+this.$login.f.orgs
81
81
  }
82
82
  }
83
83
  let res = await this.$resetpost(
@@ -124,7 +124,7 @@ export default {
124
124
  condition: `u.id = ${servicedata.id}`,
125
125
  data: {
126
126
  userid: this.$login.f.id,
127
- f_filiale: this.$login.f.orgstr
127
+ f_filiale: "榆林."+this.$login.f.orgs
128
128
  }
129
129
  }
130
130
  let res = await this.$resetpost(
package/src/components/product/Process/NewExplorationSelect.vue CHANGED
@@ -342,7 +342,7 @@ export default {
342
342
  model: new PagedList('rs/sql/checkuser', 20, {
343
343
  data: {
344
344
  userid: this.$login.f.id,
345
- f_filiale: this.$login.f.orgstr
345
+ f_filiale: "榆林."+this.$login.f.orgs
346
346
  }
347
347
  }),
348
348
  // showModal: false, // 控制发起类型选择
@@ -532,7 +532,7 @@ export default {
532
532
  condition: this.$refs.cp.$refs.cri.condition,
533
533
  data: {
534
534
  userid: this.$login.f.id,
535
- f_filiale: this.$login.f.orgstr
535
+ f_filiale: "榆林."+this.$login.f.orgs
536
536
  }
537
537
  }
538
538
  }
package/src/components/product/Process/NewExplorationUser.vue CHANGED
@@ -87,7 +87,7 @@ export default {
87
87
  condition: `u.id = ${servicedata.id}`,
88
88
  data: {
89
89
  userid: this.$login.f.id,
90
- f_filiale: this.$login.f.orgstr
90
+ f_filiale: "榆林."+this.$login.f.orgs
91
91
  }
92
92
  }
93
93
  let res = await this.$resetpost(
package/src/components/product/Process/Processes/InstallationDetails.vue CHANGED
@@ -907,7 +907,7 @@ export default {
907
907
  async getAreaList () {
908
908
  let data = {
909
909
  tablename: 't_area_address',
910
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
910
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
911
911
  }
912
912
  let http = new HttpResetClass()
913
913
  let res = await http.load(
@@ -929,7 +929,7 @@ export default {
929
929
  let pcdText = `and f_residential_area like '%${val}%'`
930
930
  let data = {
931
931
  tablename: 't_area_address',
932
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用' ${pcdText}`
932
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用' ${pcdText}`
933
933
  }
934
934
  new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
935
935
  console.log('请求发送完成！！！！！'+JSON.stringify(res))
@@ -1052,7 +1052,7 @@ export default {
1052
1052
  condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
1053
1053
  data: {
1054
1054
  userid: this.$login.f.id,
1055
- f_filiale: this.$login.f.orgstr
1055
+ f_filiale: "榆林."+this.$login.f.orgs
1056
1056
  }
1057
1057
  }
1058
1058
  },
@@ -1115,7 +1115,7 @@ export default {
1115
1115
  condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
1116
1116
  data: {
1117
1117
  userid: this.$login.f.id,
1118
- f_filiale: this.$login.f.orgstr
1118
+ f_filiale: "榆林."+this.$login.f.orgs
1119
1119
  }
1120
1120
  }
1121
1121
  }
package/src/components/product/Process/Processes/selectChaiChuUserinfo.vue CHANGED
@@ -151,7 +151,7 @@ export default {
151
151
  this.showselect = false
152
152
  },
153
153
  searchCondition (args) {
154
- args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' and ui.f_user_state = '正常'`
154
+ args.condition = `${args.condition} and ui.f_filiale like '%${"榆林."+this.$login.f.orgs}%' and ui.f_user_state = '正常'`
155
155
  this.model.search(args.condition, args.model)
156
156
  },
157
157
  clear () {
@@ -169,7 +169,7 @@ export default {
169
169
  async getArea () {
170
170
  let data = {
171
171
  tablename: 't_area_address',
172
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
172
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
173
173
  }
174
174
  let http = new HttpResetClass()
175
175
  let res = await http.load(
package/src/components/product/Process/Processes/selectOldUserinfo.vue CHANGED
@@ -161,7 +161,7 @@ export default {
161
161
  this.showselect = false
162
162
  },
163
163
  searchCondition (args) {
164
- args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%'`
164
+ args.condition = `${args.condition} and ui.f_filiale like '%${"榆林."+this.$login.f.orgs}%'`
165
165
 
166
166
  this.model.search(args.condition, args.model)
167
167
  },
@@ -180,7 +180,7 @@ export default {
180
180
  async getArea () {
181
181
  let data = {
182
182
  tablename: 't_area_address',
183
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
183
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
184
184
  }
185
185
  let http = new HttpResetClass()
186
186
  let res = await http.load(
package/src/components/product/Process/Processes/selectUserinfo.vue CHANGED
@@ -152,9 +152,9 @@ export default {
152
152
  },
153
153
  searchCondition (args) {
154
154
  if (this.selectdata.f_apply_type === '分户挂表'){
155
- args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' and ui.f_user_state = '分户挂表'`
155
+ args.condition = `${args.condition} and ui.f_filiale like '%${"榆林."+this.$login.f.orgs}%' and ui.f_user_state = '分户挂表'`
156
156
  }else if (this.selectdata.f_apply_type === '改线业务'){
157
- args.condition = `${args.condition} and ui.f_filiale like '%${this.$login.f.orgstr}%' and ui.f_user_state = '正常'`
157
+ args.condition = `${args.condition} and ui.f_filiale like '%${"榆林."+this.$login.f.orgs}%' and ui.f_user_state = '正常'`
158
158
  }
159
159
  this.model.search(args.condition, args.model)
160
160
  },
@@ -173,7 +173,7 @@ export default {
173
173
  async getArea () {
174
174
  let data = {
175
175
  tablename: 't_area_address',
176
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
176
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
177
177
  }
178
178
  let http = new HttpResetClass()
179
179
  let res = await http.load(
package/src/components/product/Process/Service/ServiceControl.vue CHANGED
@@ -1149,7 +1149,7 @@ export default {
1149
1149
  async getResidentialArea () {
1150
1150
  let data = {
1151
1151
  tablename: 't_area_address',
1152
- condition: `f_filiale in ('${this.$login.f.orgstr}','榆林.榆川天然气') and f_area_status = '启用'`
1152
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
1153
1153
  }
1154
1154
  let http = new HttpResetClass()
1155
1155
  let res = await http.load(
@@ -1292,7 +1292,7 @@ export default {
1292
1292
  }
1293
1293
 
1294
1294
  let data = {
1295
- 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}'`
1295
+ 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}'`
1296
1296
  }
1297
1297
 
1298
1298
  if (this.show_data.f_apply_type === '民用报建') {
@@ -1549,7 +1549,7 @@ export default {
1549
1549
  f_user_id: userinfo.f_user_id,
1550
1550
  f_userinfo_id: userinfo.f_userinfo_id,
1551
1551
  record: {
1552
- f_filiale: this.$login.f.orgstr,
1552
+ f_filiale: "榆林."+this.$login.f.orgs,
1553
1553
  f_instruct_meta_data: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
1554
1554
  f_instruct_title: this.show_data.button.button_name === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
1555
1555
  f_instruct_type: '阀门控制',
@@ -1659,7 +1659,7 @@ export default {
1659
1659
  }
1660
1660
 
1661
1661
  let data = {
1662
- 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}'`
1662
+ 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}'`
1663
1663
  }
1664
1664
 
1665
1665
  if (this.show_data.f_apply_type === '民用报建') {
@@ -1940,7 +1940,7 @@ export default {
1940
1940
  let pcdText = `and f_residential_area like '%${val}%'`
1941
1941
  let data = {
1942
1942
  tablename: 't_area_address',
1943
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用' ${pcdText}`
1943
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用' ${pcdText}`
1944
1944
  }
1945
1945
  new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
1946
1946
  console.log('请求发送完成！！！！！'+JSON.stringify(res))
@@ -2105,7 +2105,7 @@ export default {
2105
2105
  f_operator: this.$login.f.name,
2106
2106
  f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
2107
2107
  f_orgid: this.$login.f.orgid,
2108
- f_orgname: this.$login.f.orgstr
2108
+ f_orgname: "榆林."+this.$login.f.orgs
2109
2109
  }
2110
2110
  this.show_data.onetomany[index].fields.forEach(item => {
2111
2111
  data[item.field] = item.value
package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue CHANGED
@@ -155,10 +155,11 @@
155
155
  userid: this.selectdata.userid
156
156
  }, {resolveMsg: null, rejectMsg: null})
157
157
  let user = res.data
158
+ debugger
158
159
  this.data.orgs = user.orgs
159
160
  this.data.parentname = user.deps
160
161
  } catch (e) {
161
- this.data.orgs = this.$login.f.orgstr
162
+ this.data.orgs = "榆林."+this.$login.f.orgs
162
163
  this.data.parentname = this.$login.f.deps
163
164
  }
164
165
  }
@@ -252,7 +253,7 @@
252
253
  async getResidentialArea () {
253
254
  let data = {
254
255
  tablename: 't_area_address',
255
- condition: `f_filiale like '%${this.$login.f.orgstr}%' and f_area_status = '启用'`
256
+ condition: `f_filiale like '%${"榆林."+this.$login.f.orgs}%' and f_area_status = '启用'`
256
257
  }
257
258
  let http = new HttpResetClass()
258
259
  let res = await http.load(
package/src/components/product/Supervisory/SupervisoryList.vue CHANGED
@@ -355,7 +355,7 @@
355
355
  return {
356
356
  model: new PagedList('rs/sql/supervisory', 20, {
357
357
  data: {
358
- f_filiale:this.$login.f.orgstr
358
+ f_filiale: "榆林."+this.$login.f.orgs
359
359
  },
360
360
  }),
361
361
  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -543,7 +543,7 @@
543
543
  condition: this.$refs.cp.$refs.cri.condition,
544
544
  data: {
545
545
  // orgid: this.$login.f.orgid
546
- f_filiale: this.$login.f.orgstr
546
+ f_filiale: "榆林."+this.$login.f.orgs
547
547
  }
548
548
  }
549
549
  },
package/src/components/product/Supervisory/YiBanSupervisoryList.vue CHANGED
@@ -338,7 +338,7 @@
338
338
  return {
339
339
  model: new PagedList('rs/sql/yiBanSupervisory', 20, {
340
340
  data: {
341
- f_filiale: this.$login.f.orgstr
341
+ f_filiale: "榆林."+this.$login.f.orgs
342
342
  },
343
343
  }),
344
344
  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -525,7 +525,7 @@
525
525
  condition: this.$refs.cp.$refs.cri.condition,
526
526
  data: {
527
527
  // orgid: this.$login.f.orgid
528
- f_filiale: this.$login.f.orgstr
528
+ f_filiale: "榆林."+this.$login.f.orgs
529
529
  }
530
530
  }
531
531
  },