sale-client 4.2.67 → 4.2.68

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 (51) hide show
  1. package/build/dev-server.js +52 -30
  2. package/index.html +7 -2
  3. package/package.json +1 -1
  4. package/src/App.vue +1 -1
  5. package/src/components/FilesManage/MeterinfoTest.vue +26 -13
  6. package/src/components/revenue/HandManager/MeterBookUser.vue +726 -726
  7. package/src/components/revenue/base/leftview/HiddenDangerInfo.vue +136 -0
  8. package/src/components/revenue/base/leftview/otherinfo.vue +2 -1
  9. package/src/components/revenue/comprehen/ComprehenOperation/QrPay/QrPaymentDetailed.vue +423 -423
  10. package/src/components/revenue/comprehen/Maintenance/hand/handOperate.vue +469 -469
  11. package/src/components/revenue/machineHandManage/ArrearsQuery.vue +938 -938
  12. package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue +970 -970
  13. package/src/filiale/alashan/eticket/EticketRecordList.vue +428 -428
  14. package/src/filiale/bayan/ChargeList.vue +1010 -1010
  15. package/src/filiale/bayan/StockListmain.vue +543 -543
  16. package/src/filiale/bazhong/UserInfoDetailManageNew.vue +245 -245
  17. package/src/filiale/bazhong/ic_detail/ChangeMeterQueryUser.vue +370 -370
  18. package/src/filiale/bazhong/sale.js +8 -8
  19. package/src/filiale/beifangshiye/OtherChargeNew.vue +625 -625
  20. package/src/filiale/fugou/MeterinfoTest.vue +27 -14
  21. package/src/filiale/lixianV3/ArrearsQuery.vue +938 -938
  22. package/src/filiale/lixianV3/InsuranceChargesDetails.vue +425 -425
  23. package/src/filiale/meihekou/common/userinfo_detail/ic_detail/MachineRecordQuery.vue +281 -281
  24. package/src/filiale/qianneng/revenue/sms/AccountMessageList.vue +508 -508
  25. package/src/filiale/ronghao/ArrearsQuery.vue +974 -974
  26. package/src/filiale/ronghao/CardService.js +2144 -2144
  27. package/src/filiale/ronghao/InsuranceManage.vue +58 -58
  28. package/src/filiale/ronghao/MachineChargeService.js +149 -149
  29. package/src/filiale/ronghao/NoCardMeterCenter.vue +534 -534
  30. package/src/filiale/ronghao/PaymentCode.vue +174 -174
  31. package/src/filiale/ronghao/PriceChangeCompensation/CompensationManage.vue +26 -26
  32. package/src/filiale/ronghao/PriceChangeCompensation/IotCompensation.vue +318 -318
  33. package/src/filiale/ronghao/PriceChangeCompensation/JbCompensation.vue +343 -343
  34. package/src/filiale/ronghao/PriceChangeCompensation/SurplusRecordDetail.vue +74 -74
  35. package/src/filiale/ronghao/ReplaceCardManage.vue +415 -415
  36. package/src/filiale/ronghao/Upload.vue +654 -654
  37. package/src/filiale/ronghao/cardDown.vue +1141 -1141
  38. package/src/filiale/ronghao/changemeterOperate.vue +315 -315
  39. package/src/filiale/ronghao/fillgasSpecific.vue +313 -313
  40. package/src/filiale/ronghao/ic_detail/ChargeRecordQuery.vue +106 -106
  41. package/src/filiale/ronghao/ic_detail/WatchCollection.vue +115 -115
  42. package/src/filiale/ronghao/ic_detail/WebHandQueryUser.vue +411 -411
  43. package/src/filiale/ronghao/machineDown.vue +1176 -1176
  44. package/src/filiale/ronghao/replacementSingleInfoOperation.vue +315 -315
  45. package/src/filiale/ronghao/specificInformation.vue +537 -537
  46. package/src/filiale/yangchun/ChargeList.vue +954 -954
  47. package/src/filiale/yuncheng/changemeterListMaintain.vue +504 -504
  48. package/src/filiale/zhongsheng/BlackListList.vue +293 -293
  49. package/src/filiale/zhongyi/HandQueryUser.vue +389 -389
  50. package/src/main.js +1 -1
  51. package/src/sale.js +2 -0
package/build/dev-server.js CHANGED
@@ -1,7 +1,7 @@
1
1
  var path = require('path')
2
2
  var checkVersion = require('./versionCheck.js')
3
3
  checkVersion()
4
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
4
+ const [ serverRul, localUrl ] = ['http://61.163.123.47:30785', 'http://127.0.0.1:9026']
5
5
  var merge = require('webpack-merge')
6
6
  var baseConfig = require('./webpack.dev.conf')
7
7
  var devConfig = {
@@ -19,48 +19,70 @@ var devConfig = {
19
19
  children: false // 不输出子模块构建信息
20
20
  },
21
21
  proxy: {
22
- // '/api/af-revenue/batchdeduction/all': {
23
- // pathRewrite: {
24
- // '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
25
- // },
26
- // target: localUrl
27
- // },
28
- // '/api/af-revenue/logic': {
29
- // pathRewrite: {
30
- // '/api/af-revenue/logic': '/logic'
31
- // },
32
- // target: localUrl
33
- // },
22
+ // '/api/af-revenue/logic/depositCharge': {
23
+ // pathRewrite: {
24
+ // '/api/af-revenue/logic': '/logic'
25
+ // },
26
+ // target: 'http://127.0.0.1:9026',
27
+ // changeOrigin: true
28
+ // },
29
+ // '/api/af-revenue/logic': {
30
+ // pathRewrite: {
31
+ // '/api/af-revenue/logic': '/logic'
32
+ // },
33
+ // target: localUrl,
34
+ // changeOrigin: true
35
+ // },
34
36
  // '/api/af-revenue/file': {
37
+ // pathRewrite: {
38
+ // '/api/af-revenue/file': '/file'
39
+ // },
40
+ // target: localUrl,
41
+ // changeOrigin: true
42
+ // },
43
+ // 'api/af-revenue/entity/save': {
44
+ // pathRewrite: {
45
+ // '/api/af-revenue/entity/save': '/entity/save'
46
+ // },
47
+ // target: localUrl,
48
+ // changeOrigin: true
49
+ // },
50
+ // '/singlepage': {
35
51
  // // pathRewrite: {
36
- // // '/api/af-revenue/file': '/file'
52
+ // // '/weixin2/rs': '/rs'
37
53
  // // },
38
- // target: localUrl
54
+ // target: localUrl,
55
+ // changeOrigin: true
39
56
  // },
40
- // '/weixin2/rs':{
41
- //
42
- // target: 'http://410663id1ia4.vicp.fun'
57
+ // '/weixin2/rs': {
58
+ // pathRewrite: {
59
+ // '/weixin2/rs': '/singlepage/weixin2/rs'
60
+ // },
61
+ // target: localUrl,
62
+ // changeOrigin: true
43
63
  // },
44
64
  // '/api/af-revenue/sql': {
45
65
  // pathRewrite: {
46
66
  // '/api/af-revenue/sql': '/sql'
47
67
  // },
48
- // target: localUrl
68
+ // target: localUrl,
69
+ // changeOrigin: true
70
+ // },
71
+ // '/rs/pay': {
72
+ // target: serverRul,
73
+ // changeOrigin: true
49
74
  // },
50
- '/rs/pay': {
51
- target: 'http://localhost:8080'
52
- },
53
- '/api/af-revenue': {
54
- pathRewrite: {
55
- '/api/af-revenue': '/af-revenue'
56
- },
57
- target: "http://localhost:8080"
58
- },
59
75
  '/api': {
60
- target: serverRul
76
+ target: serverRul,
77
+ changeOrigin: true
78
+ },
79
+ '/resource': {
80
+ target: serverRul,
81
+ changeOrigin: true
61
82
  },
62
83
  '/rs': {
63
- target: serverRul
84
+ target: serverRul,
85
+ changeOrigin: true
64
86
  }
65
87
  }
66
88
  }
package/index.html CHANGED
@@ -12,8 +12,13 @@
12
12
  body{width: 100%;background:#7f8eaf no-repeat center bottom; background-size: cover;}
13
13
  body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
14
14
  </style>
15
- <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
16
- <!--引入UI组件库（1.1版本） -->
15
+ <!--引入高德地图组件-->
16
+ <script type="text/javascript">
17
+ window._AMapSecurityConfig = {
18
+ securityJsCode: '91ebf08ec12862005c9ce8bbb888420f'
19
+ }
20
+ </script>
21
+ <script src="https://webapi.amap.com/maps?v=1.4.2&key=98e5146f671e38ea4d61bd37f5d064d8"></script>
17
22
  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
18
23
  </head>
19
24
  <body id="bodymain" class="themeOne">
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.67",
3
+ "version": "4.2.68",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/App.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  </template>
11
11
 
12
12
  <script>
13
- import Vue from 'vue'
13
+ // import Vue from 'vue'
14
14
 
15
15
  export default {
16
16
  ready () {
package/src/components/FilesManage/MeterinfoTest.vue CHANGED
@@ -355,8 +355,14 @@
355
355
  <label for="f_adjustable" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_adjustable','调压箱')}}</label>
356
356
  <input type="text" v-model="row.f_adjustable" v-show="false"
357
357
  v-validate:f_adjustable=getConfigValidate("f_adjustable",false)>
358
- <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
359
- v-model='row.f_adjustable' :search='true'></v-select>
358
+ <v-select :value.sync="row.f_adjustable"
359
+ :options='adjustables'
360
+ placeholder='调压箱'
361
+ close-on-select
362
+ @select-search="getAdjustables"
363
+ v-model='row.f_adjustable'
364
+ :search='true'>
365
+ </v-select>
360
366
  </div>
361
367
  <div class="col-sm-4 form-group" :class="[$m.f_hand_date.required ? 'has-error' : '']"
362
368
  v-show="(formconfig && formconfig.f_hand_date && formconfig.f_hand_date.required) || !onlyshowmust"
@@ -783,8 +789,26 @@
783
789
  }
784
790
  await this.getConcentrators()
785
791
  co(meterBookGen(this))
792
+ await this.getAdjustables()
786
793
  },
787
794
  methods: {
795
+ async getAdjustables (searchText) {
796
+ let condition = `f_orgid = '${this.$login.f.orgid}'`
797
+ if (searchText) {
798
+ condition = condition + ` and (f_adjustable_name like '%${searchText}%' or f_adjustable_id like '%${searchText}%')`
799
+ }
800
+ let data = {
801
+ items: 'id,f_adjustable_name,f_adjustable_id',
802
+ tablename: 't_adjustablebox',
803
+ condition: condition,
804
+ orderitem: 'id desc'
805
+ }
806
+ let result = await this.$resetpost('rs/sql/singleTable_OrderBy?pageNo=1&pageSize=100', {data: data}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
807
+ this.adjustables = [{label: '全部', value: ''}]
808
+ for (let row of result.data) {
809
+ this.adjustables.push({label: `[${row.f_adjustable_id}]-${row.f_adjustable_name}`, value: row})
810
+ }
811
+ },
788
812
  validateInput (event, key) {
789
813
  const value = event.target.value
790
814
  const sanitizedValue = value.replace(/[^0-9.]/g, '')
@@ -1112,17 +1136,6 @@
1112
1136
  return Array.from(new Set(result))
1113
1137
  },
1114
1138
 
1115
- adjustables () {
1116
- let arr = []
1117
- let filter = this.f_filialeid
1118
- this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
1119
- let temp = {}
1120
- temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
1121
- temp.value = item.value
1122
- arr.push(temp)
1123
- })
1124
- return [{label: '全部', value: ''}, ...arr]
1125
- },
1126
1139
  inputtores () {
1127
1140
  // return this.$login.f.f_gasman
1128
1141
  let rs = new Array()