manage-client 4.0.77 → 4.0.78

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/.gradle/8.5/checksums/checksums.lock +0 -0
  2. package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
  3. package/.gradle/8.5/dependencies-accessors/gc.properties +0 -0
  4. package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
  5. package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
  6. package/.gradle/8.5/fileChanges/last-build.bin +0 -0
  7. package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
  8. package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
  9. package/.gradle/8.5/gc.properties +0 -0
  10. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  11. package/.gradle/file-system.probe +0 -0
  12. package/.gradle/vcs-1/gc.properties +0 -0
  13. package/build/dev-server.js +4 -4
  14. package/package.json +1 -1
  15. package/src/components/sale/businessquery/InspectListUser.vue +39 -28
  16. package/src/filiale/jingyang/ChargeQuery.vue +1 -1
  17. package/src/filiale/jingyang/NewGasStatistics.vue +9 -1
  18. package/src/filiale/jingyang/usergas.vue +1 -1
  19. package/src/filiale/jinbin/exportConfig.js +0 -1110
  20. package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
  21. package/src/filiale/jinbin/sale.js +0 -7
package/.gradle/8.5/gc.properties ADDED
File without changes
package/.gradle/file-system.probe ADDED
Binary file
package/.gradle/vcs-1/gc.properties ADDED
File without changes
package/build/dev-server.js CHANGED
@@ -11,17 +11,17 @@ var compiler = webpack(config)
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan = 'http://192.168.50.67:31567/'
15
- var qtx = 'http://192.168.50.67:31567/'
14
+ var shaoguan = 'http://119.146.1.106:8300/'
15
+ var qtx = 'http://36.103.222.144:6300/'
16
16
  // var bendi = 'http://220.194.141.253:8600/'
17
17
  // var bendi = 'http://203.57.101.233:9001'
18
18
  // var bendi = 'http://172.168.1.11:9001/'
19
19
  // var bendi = 'http://203.57.101.233:9001/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://192.168.50.67:31567/'
22
+ var bendi = 'http://203.57.101.233:9001/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.67:31567/'
24
+ var wode = 'http://203.57.101.233:9001/'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.77",
3
+ "version": "4.0.78",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/InspectListUser.vue CHANGED
@@ -32,7 +32,7 @@
32
32
  close-on-select></v-select>
33
33
  </div>
34
34
  <div class="col-sm-2 flex-row" style="white-space: nowrap">
35
- <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
35
+ <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.meter_classify.includes('物联网表')" >未购天数</label>
36
36
  <label class="font_normal_body" v-else>未抄天数</label>
37
37
  <div class="row">
38
38
  <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
@@ -114,7 +114,7 @@
114
114
  </v-select>
115
115
  </div>
116
116
  <div class="col-sm-2" >
117
- <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
117
+ <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.meter_classify.includes('物联网表')">购气次数</label>
118
118
  <label class="font_normal_body" v-else>抄表次数</label>
119
119
  <input type="text" style="width:25%" class="input_search" v-model="model.cishumin"
120
120
  condition="cishu >= {} " placeholder="">
@@ -123,15 +123,23 @@
123
123
  condition="cishu <= {} " placeholder="">
124
124
  </div>
125
125
  <div class="col-sm-2">
126
- <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
127
- <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
128
- <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
126
+ <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表')">&nbsp;&nbsp;购气量</label>
127
+ <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">&nbsp;&nbsp;用气量</label>
128
+ <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">购气金额</label>
129
129
  <input type="text" style="width:25%" class="input_search" v-model="model.pregasmin"
130
130
  condition="pregas >= {} " placeholder="">
131
131
  <label class="font_normal_body"> ≤ x ≤ </label>
132
132
  <input type="text" style="width:25%" class="input_search" v-model="model.pregasmax"
133
133
  condition="pregas <= {} " placeholder="">
134
134
  </div>
135
+ <div class="col-sm-2" v-if="$parent.$parent.meter_classify.includes('卡表')">
136
+ <label class="font_normal_body">购气金额</label>
137
+ <input type="text" style="width:25%" class="input_search" v-model="model.collectionmin"
138
+ condition="collection >= {} " placeholder="">
139
+ <label class="font_normal_body"> ≤ x ≤ </label>
140
+ <input type="text" style="width:25%" class="input_search" v-model="model.collectionmax"
141
+ condition="collection <= {} " placeholder="">
142
+ </div>
135
143
 
136
144
  <div class="col-sm-2">
137
145
  <label class="font_normal_body">&emsp;&emsp;表号</label>
@@ -204,16 +212,17 @@
204
212
  <th><nobr>表具状态</nobr></th>
205
213
  <th><nobr>气表品牌</nobr></th>
206
214
  <th><nobr>气价名称</nobr></th>
207
- <th><nobr>最后购气日期</nobr></th>
208
- <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>总购气次数</nobr></th>
209
- <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>
215
+ <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内最后购气日期</nobr></th>
216
+ <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内最后抄表日期</nobr></th>
217
+ <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内购气次数</nobr></th>
218
+ <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内抄表次数</nobr></th>
210
219
 
211
- <th v-show="$parent.$parent.$parent.meter_classify === '卡表'"><nobr>总购气量</nobr></th>
212
- <th v-show="$parent.$parent.$parent.meter_classify === '物联网表'"><nobr>总购金额</nobr></th>
213
- <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>
220
+ <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表')"><nobr>区间内购气量</nobr></th>
221
+ <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内购气金额</nobr></th>
222
+ <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内用气量</nobr></th>
214
223
 
215
- <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
216
- <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
224
+ <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内未购气天数</nobr></th>
225
+ <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内未抄表天数</nobr></th>
217
226
  <th><nobr>组织机构</nobr></th>
218
227
  <th><nobr>安检次数</nobr></th>
219
228
  <th><nobr>最后安检时间</nobr></th>
@@ -240,6 +249,7 @@
240
249
 
241
250
  <td style="text-align: center;"><nobr>{{row.cishu}}</nobr></td>
242
251
  <td style="text-align: center;"><nobr>{{row.pregas}}</nobr></td>
252
+ <td style="text-align: center;" v-show="$parent.$parent.$parent.meter_classify.includes('卡表')"><nobr>{{row.collection}}</nobr></td>
243
253
  <td style="text-align: center;"><nobr>{{row.diffday}}</nobr></td>
244
254
  <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
245
255
  <td style="text-align: center;"><nobr>{{row.f_checknum}}</nobr></td>
@@ -250,9 +260,9 @@
250
260
  <table class="table-hover">
251
261
  <tr style="position: relative" class="table-bordered">
252
262
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
253
- <td v-if="meter_classify === '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
254
- <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
255
- <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
263
+ <td v-if="meter_classify.includes('卡表')" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
264
+ <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
265
+ <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">购气金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
256
266
  </tr>
257
267
  </table>
258
268
  </div>
@@ -392,7 +402,7 @@
392
402
  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
393
403
 
394
404
  let readySomething = async function (self) {
395
-
405
+ self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
396
406
  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
397
407
 
398
408
  // await self.$refs.paged.$refs.cri.search()
@@ -406,7 +416,7 @@
406
416
  footer:[],
407
417
  org:[this.$login.f.orgid],
408
418
  criteriaShow: false,
409
- meter_classify:'卡表',
419
+ meter_classify:'气量卡表',
410
420
  filialeNameStr: null,
411
421
  filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
412
422
  userid: this.$login.f.id,
@@ -414,8 +424,8 @@
414
424
  getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",
415
425
  "f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
416
426
  "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
417
- "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
418
- "diffday":"未购气总天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"},
427
+ "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气量","collection":"区间内购气金额",
428
+ "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"},
419
429
  model: new PagedList('api/af-revenue/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
420
430
  rows: null,
421
431
  //orgid:'',
@@ -451,15 +461,15 @@
451
461
  },
452
462
  watch:{
453
463
  meter_classify(val){
454
- if (val === '卡表') {
464
+ if (val.includes('卡表')) {
455
465
  this.model.url = this.url = 'api/af-revenue/sql/inspectList'
456
466
  this.sqlName = 'inspectList'
457
467
  this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
458
468
  "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
459
469
  "f_createfile_date":"建档日期","f_user_type":"用户类型",
460
470
  "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
461
- "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
462
- "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
471
+ "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气量","collection":"区间内购气金额",
472
+ "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
463
473
  }else if (val === '机表') {
464
474
  this.model.url = this.url = 'api/af-revenue/sql/handinspectList'
465
475
  this.sqlName = 'handinspectList'
@@ -467,8 +477,8 @@
467
477
  "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
468
478
  "f_createfile_date":"建档日期","f_user_type":"用户类型",
469
479
  "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
470
- "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
471
- "diffday":"累计未抄表天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
480
+ "delivery_date":"区间内最后抄表日期","cishu":"区间内抄表次数","pregas":"区间内抄表气量",
481
+ "diffday":"区间内未抄表天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
472
482
  } else if (val === '物联网表') {
473
483
  this.model.url = this.url = 'api/af-revenue/sql/getWebMeterList'
474
484
  this.sqlName = 'getWebMeterList'
@@ -476,8 +486,8 @@
476
486
  "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
477
487
  "f_createfile_date":"建档日期", "f_user_type":"用户类型",
478
488
  "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
479
- "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购金额",
480
- "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
489
+ "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气金额",
490
+ "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
481
491
  }
482
492
  this.clear()
483
493
  this.model.rows = []
@@ -607,6 +617,7 @@
607
617
  this.$showMessage('请选择气表类型。。。')
608
618
  return
609
619
  }
620
+ this.model.params.meter_classify = this.meter_classify
610
621
  args.condition = args.condition+ ` ${this.filialeCodeStr}`
611
622
  this.model.search(args.condition, args.model)
612
623
  },
@@ -618,7 +629,7 @@
618
629
  if(key != 'startDate' && key != 'endDate')
619
630
  this.$refs.paged.$refs.cri.model[key] = []
620
631
  })
621
- this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
632
+ this.$refs.paged.$refs.cri.model.startDate = this.$login.toStartAndEndDateString()[0]
622
633
  this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
623
634
  }
624
635
  },
package/src/filiale/jingyang/ChargeQuery.vue CHANGED
@@ -974,7 +974,7 @@
974
974
  rowdata:{},
975
975
  initres: {
976
976
  org:[this.$login.f.orgid],
977
- dep:[],
977
+ dep:[this.$login.f.depids],
978
978
  user:[]
979
979
  },
980
980
  model: new PagedList('api/af-revenue/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
package/src/filiale/jingyang/NewGasStatistics.vue CHANGED
@@ -287,6 +287,12 @@
287
287
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
288
288
  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
289
289
  </td>
290
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
291
+ 非民用气量合计:&emsp;{{sumsmodel.f_fmy_gas}}
292
+ </td>
293
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
294
+ 非民用气费合计:&emsp;{{sumsmodel.f_fmy_fee}}
295
+ </td>
290
296
  </tr>
291
297
  </table>
292
298
  </div>
@@ -347,7 +353,9 @@
347
353
  f_stairamount2:0,
348
354
  f_stair2fee:0,
349
355
  f_stairamount3:0,
350
- f_stair3fee:0
356
+ f_stair3fee:0,
357
+ f_fmy_gas:0,
358
+ f_fmy_fee:0
351
359
  }),
352
360
  showbottomsum:false //页面下方是否有合计: 默认为false, 在watch修改
353
361
  }
package/src/filiale/jingyang/usergas.vue CHANGED
@@ -148,7 +148,7 @@
148
148
  </template>
149
149
  <script>
150
150
  import { PagedList } from 'vue-client'
151
- import defaultPrint from '../config/DefaultPrint'
151
+ import defaultPrint from './config/DefaultPrint'
152
152
  import exportConfig from './config/exportConfig.js'
153
153
  let readySomething = async function(self) {
154
154
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]