manage-client 4.1.104 → 4.1.105-dxls

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 (21) hide show
  1. package/build/dev-server.js +37 -63
  2. package/index.html +12 -11
  3. package/package.json +1 -1
  4. package/src/App.vue +21 -9
  5. package/src/components/sale/businessquery/ArrearsQuery.vue +7 -7
  6. package/src/components/sale/businessquery/FMYGasQuery.vue +9 -9
  7. package/src/components/sale/businessquery/NewFMYGasQuery.vue +8 -8
  8. package/src/components/sale/businessquery/cardGasStatistics.vue +6 -7
  9. package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue +13 -1
  10. package/src/filiale/WEINAN/BussinessType.vue +0 -1
  11. package/src/filiale/WEINAN/businessquery/abnormalQuery.vue +65 -15
  12. package/src/filiale/bayan/ChargeQuery.vue +3 -12
  13. package/src/filiale/meihekou/HandplanQuery.vue +5 -0
  14. package/src/filiale/shexian/sale.js +0 -4
  15. package/src/filiale/tongchuan/GasInspection.vue +1 -0
  16. package/src/filiale/xinjiangdexin/NewGasStatistics.vue +7 -8
  17. package/src/filiale/xinjiangdexin/RecordInfoQuery.vue +10 -12
  18. package/src/filiale/xinjiangdexin/UserGasAll.vue +13 -1
  19. package/src/main.js +1 -1
  20. package/src/components/Test.vue +0 -14
  21. package/src/filiale/shexian/InspectListUser.vue +0 -690
package/build/dev-server.js CHANGED
@@ -6,125 +6,99 @@ const proxyMiddleware = require('http-proxy-middleware')
6
6
  const app = express()
7
7
  const compiler = webpack(config)
8
8
 
9
- const server = 'https://www.qtxbnrq.cn:6300'
10
- const local = 'https://www.qtxbnrq.cn:6300'
9
+ const server = 'http://192.168.50.67:31567/'
10
+ const local = 'http://127.0.0.1:9026/'
11
11
  const proxyTable = {
12
12
  '/rs/logic/exportfile': {
13
- target: server,
14
- changeOrigin: true
13
+ target: server
15
14
  },
16
15
  '/dataManage': {
17
- target: server,
18
- changeOrigin: true
16
+ target: server
19
17
  },
20
18
  '/api/af-revenue/sql/': {
21
- // pathRewrite: {
22
- // '^/api/af-revenue': '/'
23
- // },
24
- target: local,
25
- changeOrigin: true
19
+ pathRewrite: {
20
+ '^/api/af-revenue': '/'
21
+ },
22
+ target: local
26
23
  },
27
24
  '/api/af-revenue/report/': {
28
- // pathRewrite: {
29
- // '^/api/af-revenue': '/'
30
- // },
31
- target: local,
32
- changeOrigin: true
25
+ pathRewrite: {
26
+ '^/api/af-revenue': '/'
27
+ },
28
+ target: local
33
29
  },
34
30
  '/api/af-revenue/logic': {
35
- // pathRewrite: {
36
- // '^/api/af-revenue': '/'
37
- // },
38
- target: local,
39
- changeOrigin: true
31
+ pathRewrite: {
32
+ '^/api/af-revenue': '/'
33
+ },
34
+ target: local
40
35
  },
41
36
  '/api': {
42
- target: server,
43
- changeOrigin: true
37
+ target: server
44
38
  },
45
39
  '/rs/sql/chargeQuery_by_gasproperties': {
46
- target: server,
47
- changeOrigin: true
40
+ target: server
48
41
  },
49
42
  '/rs/logic/chargeQuery_by_gasproperties_line': {
50
- target: server,
51
- changeOrigin: true
43
+ target: server
52
44
  },
53
45
  '/files': {
54
- target: server,
55
- changeOrigin: true
46
+ target: server
56
47
  },
57
48
  // 查找资源服务数据
58
49
  '/rs/search': {
59
- target: server,
60
- changeOrigin: true
50
+ target: server
61
51
  },
62
52
  // 查找资源服务数据
63
53
  '/rs/logic/getLogin': {
64
- target: server,
65
- changeOrigin: true
54
+ target: server
66
55
  },
67
56
  // 查找资源服务数据
68
57
  '/rs/logic/getInitData': {
69
- target: server,
70
- changeOrigin: true
58
+ target: server
71
59
  },
72
60
  '/rs/logic/getSaleInitData': {
73
- target: server,
74
- changeOrigin: true
61
+ target: server
75
62
  },
76
63
  // 用户登录服务地址
77
64
  '/rs/user': {
78
- target: server,
79
- changeOrigin: true
65
+ target: server
80
66
  },
81
67
  '/rs/path/getParams': {
82
- target: server,
83
- changeOrigin: true
68
+ target: server
84
69
  },
85
70
  '/rs/data': {
86
- target: server,
87
- changeOrigin: true
71
+ target: server
88
72
  },
89
73
  '/rs/license': {
90
- target: server,
91
- changeOrigin: true
74
+ target: server
92
75
  },
93
76
  '/rs/db': {
94
- target: server,
95
- changeOrigin: true
77
+ target: server
96
78
  },
97
79
  '/excel': {
98
- target: server,
99
- changeOrigin: true
80
+ target: server
100
81
  },
101
82
  '/rs/config': {
102
- target: server,
103
- changeOrigin: true
83
+ target: server
104
84
  },
105
85
  '/rs/sql/getLicenseById': {
106
- target: server,
107
- changeOrigin: true
86
+ target: server
108
87
  },
109
88
  '/rs/report': {
110
- target: server,
111
- changeOrigin: true
89
+ target: server
112
90
  },
113
91
  '/rs/vue': {
114
- target: server,
115
- changeOrigin: true
92
+ target: server
116
93
  },
117
94
  '/rs/file': {
118
- target: server,
119
- changeOrigin: true
95
+ target: server
120
96
  },
121
97
  '/rs/sql/singleTable': {
122
- target: server,
123
- changeOrigin: true
98
+ target: server
124
99
  },
125
100
  '/rs': {
126
- target: server,
127
- changeOrigin: true
101
+ target: server
128
102
  }
129
103
  }
130
104
 
package/index.html CHANGED
@@ -6,22 +6,23 @@
6
6
  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
7
7
  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
8
8
  <META HTTP-EQUIV="expires" CONTENT="0">
9
- <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
10
- <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=4889f1e58df01cb40415536c8907bf64&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
11
- <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
12
- <title>燃气客服系统</title>
9
+ <title>奥枫信息系统</title>
13
10
  <style media="screen">
14
11
  /*url(./static/newmainbg.jpg)*/
15
- body{width: 100%;background:#7f8eaf no-repeat center bottom; background-size: cover;}
16
- body .loginbg{ width:100%; height:100%; background:url(./static/loginbgmain.jpg) no-repeat center top;}
12
+ body {
13
+ width: 100%;
14
+ background: #7f8eaf no-repeat center bottom;
15
+ background-size: cover;
16
+ }
17
+
18
+ body .loginbg {
19
+ width: 100%;
20
+ height: 100%;
21
+ background: url(./static/loginbg.jpg) no-repeat center top;
22
+ }
17
23
  </style>
18
24
  </head>
19
25
  <body id="bodymain" class="themeOne">
20
26
  <app></app>
21
27
  </body>
22
28
  </html>
23
- <style>
24
- * {
25
- font-family: PingFangSC-Regular;
26
- }
27
- </style>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.104",
3
+ "version": "4.1.105-dxls",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/App.vue CHANGED
@@ -1,17 +1,29 @@
1
1
  <template>
2
- <app-base class="bg">
3
- <div class='flex'>
4
- <article>
5
- <route :comp="{name: 'login'}"></route>
6
- </article>
7
- </div>
8
- </app-base>
2
+ <div>
3
+ <app-base class="bg">
4
+ <div class='flex'>
5
+ <article>
6
+ <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
7
+ <!--<route :comp="{name: 'meter-reading'}"></route>-->
8
+ <!--<route :comp="{name: 'Gasproperties'}"></route>-->
9
+ <!--<route :comp="{name: 'vender-management'}"></route>-->
10
+ <!--<route :comp="{name: 'malfunction-home'}"></route>-->
11
+ <route :comp="{name: 'login'}"></route>
12
+ <!-- <route :comp="{name: 'call-report-main-page'}"></route>-->
13
+ <!-- <route :comp="{name: 'load-data'}"></route> -->
14
+ <!--<route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
15
+ <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['api/af-revenue/sql/getMeterBrand','api/af-revenue/sql/getPriceType','api/af-revenue/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
16
+ </article>
17
+ </div>
18
+ </app-base>
19
+ </div>
9
20
  </template>
10
21
 
11
22
  <script>
12
- import Test from './components/Test'
23
+
13
24
 
14
25
  export default {
15
- components: { Test }
26
+
27
+
16
28
  }
17
29
  </script>
package/src/components/sale/businessquery/ArrearsQuery.vue CHANGED
@@ -177,13 +177,6 @@
177
177
  condition="f_user_type = '{}'"
178
178
  close-on-select></v-select>
179
179
  </div>
180
- <div class="col-sm-2 form-group">
181
- <label class="font_normal_body">气表类型</label>
182
- <v-select :value.sync="model.f_meter_type" multiple
183
- :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
184
- condition="f_meter_type in {}"
185
- close-on-select></v-select>
186
- </div>
187
180
  <div class="col-sm-2 form-group">
188
181
  <label class="font_normal_body">用气性质</label>
189
182
  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
@@ -191,6 +184,13 @@
191
184
  condition="f_gasproperties = '{}'"
192
185
  close-on-select></v-select>
193
186
  </div>
187
+ <div class="col-sm-2 form-group">
188
+ <label class="font_normal_body">气表类型</label>
189
+ <v-select :value.sync="model.f_meter_type" multiple
190
+ :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
191
+ condition="f_meter_type in {}"
192
+ close-on-select></v-select>
193
+ </div>
194
194
  <div class="col-sm-2 form-group">
195
195
  <label class="font_normal_body">气价类型</label>
196
196
  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
package/src/components/sale/businessquery/FMYGasQuery.vue CHANGED
@@ -127,6 +127,15 @@
127
127
  condition="f_user_type = '{}'"
128
128
  close-on-select></v-select>
129
129
  </div>
130
+ <div class="col-sm-2 form-group">
131
+ <label class="font_normal_body">用气性质</label>
132
+ <v-select :value.sync="model.f_gasproperties"
133
+ v-model="model.f_gasproperties"
134
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
135
+ :multiple="true"
136
+ condition="f_gasproperties in {}">
137
+ </v-select>
138
+ </div>
130
139
  <div class="col-sm-2 form-group" >
131
140
  <label class="font_normal_body">客户状态</label>
132
141
  <v-select :value.sync="model.f_user_state"
@@ -143,15 +152,6 @@
143
152
  condition="f_table_state = '{}'"
144
153
  close-on-select></v-select>
145
154
  </div>
146
- <div class="col-sm-2 form-group">
147
- <label class="font_normal_body">用气性质</label>
148
- <v-select :value.sync="model.f_gasproperties"
149
- v-model="model.f_gasproperties"
150
- :options='$parent.$parent.gasproperties' placeholder='请选择'
151
- :multiple="true"
152
- condition="f_gasproperties in {}">
153
- </v-select>
154
- </div>
155
155
  <div class="col-sm-2 form-group">
156
156
  <label class="font_normal_body">气价类型</label>
157
157
  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
package/src/components/sale/businessquery/NewFMYGasQuery.vue CHANGED
@@ -119,14 +119,6 @@
119
119
  condition="f_meter_classify like '%{}%'"
120
120
  close-on-select></v-select>
121
121
  </div>
122
- <div class="col-sm-2 form-group">
123
- <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>
124
- <v-select :value.sync="model.f_user_type"
125
- @change="$parent.$parent.userTypeChange()"
126
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
127
- condition="f_user_type = '{}'"
128
- close-on-select></v-select>
129
- </div>
130
122
  <div class="col-sm-2 form-group" >
131
123
  <label class="font_normal_body">客户状态</label>
132
124
  <v-select :value.sync="model.f_user_state"
@@ -135,6 +127,14 @@
135
127
  condition="f_user_state = '{}'"
136
128
  close-on-select></v-select>
137
129
  </div>
130
+ <div class="col-sm-2 form-group">
131
+ <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>
132
+ <v-select :value.sync="model.f_user_type"
133
+ @change="$parent.$parent.userTypeChange()"
134
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
135
+ condition="f_user_type = '{}'"
136
+ close-on-select></v-select>
137
+ </div>
138
138
  <div class="col-sm-2 form-group">
139
139
  <label class="font_normal_body">用气性质</label>
140
140
  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
package/src/components/sale/businessquery/cardGasStatistics.vue CHANGED
@@ -173,7 +173,9 @@
173
173
  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
174
174
  :options='$parent.$parent.usertypes' placeholder='请选择'
175
175
  condition="f_user_type = '{}'"
176
- close-on-select></v-select>
176
+ @change="$parent.$parent.userTypeChange()"
177
+ close-on-select>
178
+ </v-select>
177
179
  </div>
178
180
  <div class="col-sm-2 form-group">
179
181
  <label class="font_normal_body">用气性质</label>
@@ -414,9 +416,9 @@ export default {
414
416
  },
415
417
  userTypeChange () {
416
418
  this.gasproperties=[]
417
- if(this.$refs.paged.$refs.criteria.model !==null) {
418
- this.$refs.paged.$refs.criteria.model.f_gasproperties=''
419
- this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
419
+ if(this.$refs.paged.$refs.criteria.model !== null) {
420
+ this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
421
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type ? this.$refs.paged.$refs.criteria.model.f_user_type[0] : '')
420
422
  }
421
423
  else{
422
424
  this.gasproperties =[{label: '全部', value: ''}]
@@ -520,9 +522,6 @@ export default {
520
522
  usertypes() {
521
523
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
522
524
  },
523
- gasproperties() {
524
- return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
525
- },
526
525
  pricetypes() {
527
526
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
528
527
  },
package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue CHANGED
@@ -75,6 +75,7 @@
75
75
  <v-select style="width:60%" id="f_user_type"
76
76
  v-model="model.f_user_type"
77
77
  placeholder='客户类型'
78
+ @change="$parent.$parent.userTypeChange()"
78
79
  :value.sync="model.f_user_type"
79
80
  :options='$parent.$parent.usertypes'
80
81
  condition="f_user_type = '{}'"
@@ -87,7 +88,7 @@
87
88
  v-model="model.f_gasproperties"
88
89
  placeholder='用气性质'
89
90
  :value.sync="model.f_gasproperties"
90
- :options='$parent.$parent.Gasproperties'
91
+ :options='$parent.$parent.gasproperties'
91
92
  condition="f_gasproperties = '{}'"
92
93
  close-on-select>
93
94
  </v-select>
@@ -400,6 +401,7 @@
400
401
  },
401
402
  depid: [],
402
403
  operator: [],
404
+ gasproperties: [],
403
405
  other: [],
404
406
  sumsmodel: {},
405
407
  filename: '',
@@ -431,6 +433,16 @@
431
433
  },
432
434
 
433
435
  methods: {
436
+ userTypeChange () {
437
+ this.gasproperties = []
438
+ if(this.$refs.paged.$refs.cri.model !== null) {
439
+ this.$refs.paged.$refs.cri.model.f_gasproperties = ''
440
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type ? this.$refs.paged.$refs.cri.model.f_user_type[0] : '')
441
+ }
442
+ else{
443
+ this.gasproperties = [{label: '全部', value: ''}]
444
+ }
445
+ },
434
446
  getotherfooter() {
435
447
  this.other = [];
436
448
 
package/src/filiale/WEINAN/BussinessType.vue CHANGED
@@ -86,7 +86,6 @@ export default {
86
86
  name: '异常分布',
87
87
  type: 'pie',
88
88
  radius: '70%',
89
- minAngle: 15,
90
89
  avoidLabelOverlap: false,
91
90
  label: {
92
91
  show: true,
package/src/filiale/WEINAN/businessquery/abnormalQuery.vue CHANGED
@@ -154,6 +154,17 @@
154
154
  close-on-select>
155
155
  </v-select>
156
156
  </div>
157
+ <div class="col-sm-2 form-group" v-if="$parent.$parent.queryType === 'lostContact'">
158
+ <label for="type" class="font_normal_body ">开户状态</label>
159
+ <v-select :value.sync="model.type" :search="false"
160
+ v-model="model.type"
161
+ :options='$parent.$parent.whetherCard'
162
+ condition="type = '{}'"
163
+ placeholder='开户状态'
164
+ value-single="true"
165
+ close-on-select>
166
+ </v-select>
167
+ </div>
157
168
  </div>
158
169
  </div>
159
170
  </criteria>
@@ -205,6 +216,9 @@
205
216
  <th v-show="$parent.$parent.$parent.queryType === 'commandException'">
206
217
  <nobr>指令状态</nobr>
207
218
  </th>
219
+ <th v-show="$parent.$parent.$parent.queryType === 'lostContact'">
220
+ <nobr>开户状态</nobr>
221
+ </th>
208
222
  </tr>
209
223
  </template>
210
224
  <template partial='body'>
@@ -255,6 +269,9 @@
255
269
  <td v-show="$parent.$parent.$parent.queryType === 'commandException'" style="text-align: center;">
256
270
  <nobr>{{ row.f_instruct_state }}</nobr>
257
271
  </td>
272
+ <td v-show="$parent.$parent.$parent.queryType === 'lostContact'" style="text-align: center;">
273
+ <nobr>{{ row.type }}</nobr>
274
+ </td>
258
275
  </template>
259
276
  </data-grid>
260
277
  </criteria-paged>
@@ -315,7 +332,9 @@ export default {
315
332
  config: {
316
333
  defaultPrint: ['f_userinfo_code', 'f_user_id']
317
334
  },
318
- defaultfield: []
335
+ defaultfield: [],
336
+ _waitTimer: null,
337
+ _waitAttempt: 0,
319
338
  }
320
339
  },
321
340
  watch: {
@@ -336,6 +355,9 @@ export default {
336
355
  userusetypes () {
337
356
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
338
357
  },
358
+ whetherCard(){
359
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('开户状态')]
360
+ },
339
361
  // 动态获取SQL名称
340
362
  sqlName() {
341
363
  const sqlNameMap = {
@@ -373,20 +395,43 @@ export default {
373
395
  },
374
396
  ready() {
375
397
  // 初始化默认查询配置
376
- this.initQueryConfig(this.queryType)
377
- if (this.$refs.paged.$refs.cri.model) {
378
- this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
379
- this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
380
- }
381
- readySomething(this).then(() => {
382
- this.$emit('ready')
383
- }).catch((error) => {
384
- this.$emit('error', error)
398
+ this.waitForChild(() => {
399
+ this.initQueryConfig(this.queryType)
400
+ if (this.$refs.paged.$refs.cri.model) {
401
+ this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
402
+ this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
403
+ }
404
+ readySomething(this).then(() => {
405
+ this.$emit('ready')
406
+ }).catch((error) => {
407
+ this.$emit('error', error)
408
+ })
409
+ // 添加回车键监听
410
+ document.addEventListener('keyup', this.handleKeyUp)
385
411
  })
386
- // 添加回车键监听
387
- document.addEventListener('keyup', this.handleKeyUp)
388
412
  },
389
413
  methods: {
414
+ waitForChild(callback) {
415
+ // 如果组件已销毁，停止等待
416
+ if (this._isDestroyed) return;
417
+
418
+ // 检查子组件是否就绪
419
+ if (this.$refs.paged && this.$refs.paged.$refs.cri) {
420
+ // 就绪，执行回调
421
+ callback();
422
+ } else {
423
+ // 未就绪，继续轮询（最多尝试 100 次，约 2 秒）
424
+ if (this._waitAttempt > 100) {
425
+ console.error('子组件加载超时');
426
+ this.$message.error('组件加载失败，请刷新页面');
427
+ return;
428
+ }
429
+ this._waitAttempt++;
430
+ this._waitTimer = setTimeout(() => {
431
+ this.waitForChild(callback);
432
+ }, 20);
433
+ }
434
+ },
390
435
  userUseInstitutionChange () {
391
436
  this.userusenatures = []
392
437
  this.$refs.paged.$refs.cri.model.f_user_usenature = ''
@@ -433,7 +478,8 @@ export default {
433
478
  'f_meter_brand': '气表品牌',
434
479
  'f_user_usetype': '用气类型',
435
480
  'f_use_institution': '用气机构',
436
- 'f_user_usenature': '使用性质'
481
+ 'f_user_usenature': '使用性质',
482
+ 'type': '开户状态'
437
483
  },
438
484
  negative: {
439
485
  'f_userinfo_code': '客户编号',
@@ -571,8 +617,12 @@ export default {
571
617
  }
572
618
  },
573
619
  beforeDestroy() {
574
- // 组件销毁前移除事件监听
575
- document.removeEventListener('keyup', this.handleKeyUp)
620
+ // 清理定时器和事件监听
621
+ if (this._waitTimer) {
622
+ clearTimeout(this._waitTimer);
623
+ }
624
+ document.removeEventListener('keyup', this.handleKeyUp);
625
+ this._isDestroyed = true; // 自定义标志，用于停止轮询
576
626
  }
577
627
  }
578
628
  </script>
package/src/filiale/bayan/ChargeQuery.vue CHANGED
@@ -811,28 +811,19 @@
811
811
  <tr style="position: relative" class="table-bordered">
812
812
  <td
813
813
  style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
814
- 汇总信息
814
+ 全表汇总信息
815
815
  </td>
816
816
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
817
817
  气量合计:&emsp;{{(sumsmodel.f_pregas - 0).toFixed(2)}}
818
818
  </td>
819
819
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
820
- 应交金额合计:&emsp;{{(sumsmodel.fee - 0).toFixed(2)}}
820
+ 卡表收费合计:&emsp;{{(sumsmodel.f_preamount - 0).toFixed(2)}}
821
821
  </td>
822
822
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
823
- 违约金合计:&emsp;{{sumsmodel.f_delaypay}}
824
- </td>
825
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
826
- 燃气费合计:&emsp;{{(sumsmodel.f_preamount - 0).toFixed(2)}}
827
- </td>
828
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
829
- 预存金额合计:&emsp;{{sumsmodel.f_yucun}}
823
+ 物联网收费合计:&emsp;{{sumsmodel.f_yucun}}
830
824
  </td>
831
825
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
832
826
  收款合计:&emsp;{{(sumsmodel.f_collection - 0).toFixed(2)}}
833
- </td>
834
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
835
- 优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
836
827
  </td>
837
828
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
838
829
  一阶气量合计:&emsp;{{(sumsmodel.f_stairamount1 -0).toFixed(2)}}
package/src/filiale/meihekou/HandplanQuery.vue CHANGED
@@ -977,6 +977,11 @@
977
977
  }
978
978
 
979
979
  args.condition = `${args.condition} ` + this.orgCondtionStr
980
+ if(this.$refs.paged.$refs.cri.model.f_userinfo_code||this.$refs.paged.$refs.cri.model.f_meternumber){
981
+ this.model.params.withparam = 'with(nolock)'
982
+ } else {
983
+ this.model.params.withparam = 'with(index(ix_orgid_idate_hs_more1))'
984
+ }
980
985
  this.model.search(args.condition, args.model)
981
986
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
982
987
  },
package/src/filiale/shexian/sale.js CHANGED
@@ -14,10 +14,6 @@ export default function () {
14
14
  Vue.component('user-query', (resolve) => {
15
15
  require(['./UserQuery'], resolve)
16
16
  })
17
- // 用户稽查查询
18
- Vue.component('inspect-list-user', (resolve) => {
19
- require(['./InspectListUser'], resolve)
20
- })
21
17
  // 气量稽查查询
22
18
  Vue.component('inspect-list-gas', (resolve) => {
23
19
  require(['./InspectListGas'], resolve)
package/src/filiale/tongchuan/GasInspection.vue CHANGED
@@ -352,6 +352,7 @@
352
352
  <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
353
353
  <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
354
354
  <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
355
+ <th style="text-align: center;"><nobr>{{row.f_street}}</nobr></th>
355
356
  <th style="text-align: center;"><nobr>{{row.f_metertitles}}</nobr></th>
356
357
  <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
357
358
  <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>