sale-client 3.5.260 → 3.5.261

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 (4) hide show
  1. package/build/dev-server.js +82 -82
  2. package/package.json +1 -1
  3. package/src/components/revenue/batchPreloads/batchPreloadsList.vue +9 -0
  4. package/src/filiale/shanxian/ChangeMeter.vue +16 -9
package/build/dev-server.js CHANGED
@@ -1,82 +1,82 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
3
- var merge = require('webpack-merge')
4
- var baseConfig = require('./webpack.dev.conf')
5
- var devConfig = {
6
- devServer: {
7
- contentBase: path.join(__dirname, 'src'),
8
- hot: true,
9
- publicPath: baseConfig.output.publicPath,
10
- historyApiFallback: true,
11
- host: "127.0.0.1",
12
- port: 8089,
13
- open: true,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/rs/file': {
21
- target: serverRul
22
- },
23
- // 查找资源服务数据
24
- '/rs/search': {
25
- target: serverRul
26
- },
27
- // 查找资源服务数据
28
- '/rs/logic/getLogin': {
29
- target: serverRul
30
- },
31
- // 查找资源服务数据
32
- '/rs/logic/getInitData': {
33
- target: serverRul
34
- },
35
- '/rs/logic/getSaleInitData': {
36
- target: serverRul
37
- },
38
- // 用户登录服务地址
39
- '/rs/user': {
40
- target: serverRul
41
- },
42
- '/rs/path': {
43
- target: serverRul
44
- },
45
- '/rs/data': {
46
- target: serverRul
47
- },
48
- '/rs/license': {
49
- target: serverRul
50
- },
51
- '/rs/db': {
52
- target: serverRul
53
- },
54
- '/excel': {
55
- target: serverRul
56
- },
57
- '/rs/config': {
58
- target: serverRul
59
- },
60
- '/rs/report': {
61
- target: serverRul
62
- },
63
- '/rs/vue': {
64
- target: serverRul
65
- },
66
- '/rs/logic': {
67
- target: localUrl
68
- },
69
- '/rs/sql': {
70
- target: localUrl
71
- },
72
- '/webmeter': {
73
- target: serverRul
74
- },
75
- '/rs': {
76
- target: serverRul
77
- // changeOrigin: true
78
- }
79
- }
80
- }
81
- }
82
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
3
+ var merge = require('webpack-merge')
4
+ var baseConfig = require('./webpack.dev.conf')
5
+ var devConfig = {
6
+ devServer: {
7
+ contentBase: path.join(__dirname, 'src'),
8
+ hot: true,
9
+ publicPath: baseConfig.output.publicPath,
10
+ historyApiFallback: true,
11
+ host: '127.0.0.1',
12
+ port: 8089,
13
+ open: true,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/rs/file': {
21
+ target: serverRul
22
+ },
23
+ // 查找资源服务数据
24
+ '/rs/search': {
25
+ target: serverRul
26
+ },
27
+ // 查找资源服务数据
28
+ '/rs/logic/getLogin': {
29
+ target: serverRul
30
+ },
31
+ // 查找资源服务数据
32
+ '/rs/logic/getInitData': {
33
+ target: serverRul
34
+ },
35
+ '/rs/logic/getSaleInitData': {
36
+ target: serverRul
37
+ },
38
+ // 用户登录服务地址
39
+ '/rs/user': {
40
+ target: serverRul
41
+ },
42
+ '/rs/path': {
43
+ target: serverRul
44
+ },
45
+ '/rs/data': {
46
+ target: serverRul
47
+ },
48
+ '/rs/license': {
49
+ target: serverRul
50
+ },
51
+ '/rs/db': {
52
+ target: serverRul
53
+ },
54
+ '/excel': {
55
+ target: serverRul
56
+ },
57
+ '/rs/config': {
58
+ target: serverRul
59
+ },
60
+ '/rs/report': {
61
+ target: serverRul
62
+ },
63
+ '/rs/vue': {
64
+ target: serverRul
65
+ },
66
+ '/rs/logic': {
67
+ target: localUrl
68
+ },
69
+ '/rs/sql': {
70
+ target: localUrl
71
+ },
72
+ '/webmeter': {
73
+ target: serverRul
74
+ },
75
+ '/rs': {
76
+ target: serverRul
77
+ // changeOrigin: true
78
+ }
79
+ }
80
+ }
81
+ }
82
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.260",
3
+ "version": "3.5.261",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/batchPreloads/batchPreloadsList.vue CHANGED
@@ -57,6 +57,7 @@
57
57
  <th>用户姓名</th>
58
58
  <th>用气性质</th>
59
59
  <th>收费金额</th>
60
+ <th>付款方式</th>
60
61
  <th>收费时间</th>
61
62
  <th>记录状态</th>
62
63
  <th>生成记录人员</th>
@@ -70,6 +71,7 @@
70
71
  <td>{{ row.f_user_name }}</td>
71
72
  <td>{{ row.f_gasproperties }}</td>
72
73
  <td>{{ row.f_collection }}</td>
74
+ <td>{{ row.f_payment }}</td>
73
75
  <td>{{ row.f_operate_date }}</td>
74
76
  <td>{{ row.f_state }}</td>
75
77
  <td>{{ row.f_operator }}</td>
@@ -222,4 +224,11 @@ export default {
222
224
  }
223
225
  </script>
224
226
  <style lang="less" scoped>
227
+ .table_sy {
228
+ tr {
229
+ td {
230
+ text-align: center;
231
+ }
232
+ }
233
+ }
225
234
  </style>
package/src/filiale/shanxian/ChangeMeter.vue CHANGED
@@ -552,16 +552,17 @@ export default {
552
552
  },
553
553
  async confirm () {
554
554
  let msg = ''
555
- if (this.row.f_meter_type.includes('机表')) {
555
+ if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
556
556
  if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
557
- msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
557
+ msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
558
558
  } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
559
559
  msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
560
560
  }
561
561
  }
562
- if (this.row.f_meter_type.includes('机表') && msg) {
562
+ if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
563
563
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
564
564
  if (res === 'confirm') {
565
+ let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
565
566
  let data = {
566
567
  downDate: this.$login.toStandardTimeString(),
567
568
  startDate: this.$login.toStandardDateString(),
@@ -575,9 +576,10 @@ export default {
575
576
  f_serial_number: this.model.f_serial_number,
576
577
  f_meterbase: this.model.f_using_base_old,
577
578
  f_meter_brand: this.row.f_meter_brand,
579
+ f_meter_classify: this.row.f_meter_type,
578
580
  f_price_id: this.row.f_price_id
579
581
  }
580
- this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
582
+ this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
581
583
  console.log('成功')
582
584
  if (this.model.metermessage.f_meter_type[0] != '机表') {
583
585
  this.$dispatch('refresh')
@@ -721,16 +723,17 @@ export default {
721
723
  this.Iotjisuan()
722
724
  }
723
725
  let msg = ''
724
- if (this.row.f_meter_type.includes('机表')) {
726
+ if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
725
727
  if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
726
- msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
728
+ msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
727
729
  } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
728
730
  msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
729
731
  }
730
732
  }
731
- if (this.row.f_meter_type.includes('机表') && msg) {
733
+ if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
732
734
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
733
735
  if (res === 'confirm') {
736
+ let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
734
737
  let data = {
735
738
  downDate: this.$login.toStandardTimeString(),
736
739
  startDate: this.$login.toStandardDateString(),
@@ -746,9 +749,13 @@ export default {
746
749
  f_meter_brand: this.row.f_meter_brand,
747
750
  f_price_id: this.row.f_price_id
748
751
  }
749
- this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
752
+ this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
750
753
  console.log('成功')
751
- this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
754
+ if (this.row.f_meter_type.includes('物联网表')) {
755
+ this.$dispatch('refresh')
756
+ } else {
757
+ this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
758
+ }
752
759
  })
753
760
  }
754
761
  })