sale-client 3.6.274 → 3.6.276

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.274",
3
+ "version": "3.6.276",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -383,8 +383,8 @@
383
383
  }
384
384
  }
385
385
  let asyncCardMeterCenter = async function (self) {
386
- await self.$getConfig(self, 'IOTMeterCenter')
387
386
  await self.$getConfig(self, 'ChangeMeter')
387
+ await self.$getConfig(self, 'IOTMeterCenter')
388
388
 
389
389
  // 添加 “系统余额透支” 付款方式
390
390
  let i = -1
@@ -1,143 +1,143 @@
1
- <template>
2
- <div class="col-sm-12 binary" >
3
- <div class="col-sm-6 binary-left" style="overflow-y: auto;width: 35%">
4
- <user-base-info :row="row" @cancel-main="cancel"></user-base-info>
5
- </div>
6
- <div class="col-sm-6 binary-right" style="padding-right:25px;padding-left: 20px;width: 65%">
7
- <saletabbut v-if="row" v-ref:list :active="-1">
8
- <saletab header="流水查询" v-if="permission('流水查询')">
9
- <record-query-user :row="row" v-if="show == '流水查询'" @deal-msg="dealMsg"></record-query-user>
10
- </saletab>
11
- <saletab header="收费查询" v-if="permission('收费查询')">
12
- <charge-query-user :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
13
- </saletab>
14
- <saletab header="补气查询" v-if="permission('补气查询')">
15
- <fill-gas-query-user :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
16
- </saletab>
17
- <saletab header="换表查询" v-if="permission('换表查询')">
18
- <change-meter-query-user :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
19
- </saletab>
20
- <saletab header="其他收费" v-if="permission('其他收费')">
21
- <other-charge-query-user :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
22
- </saletab>
23
- <saletab header="过户查询" v-if="permission('过户查询')">
24
- <transfer-query-user :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
25
- </saletab>
26
- <saletab header="价格调整" v-if="permission('价格调整')">
27
- <price-change-query-user :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
28
- </saletab>
29
- <saletab header="附件查看" v-if="permission('附件查看')">
30
- <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
31
- </saletab>
32
- <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
33
- <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
34
- </saletab>
35
- <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
36
- <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
37
- </saletab>
38
- <saletab header="抄表结算" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表结算')">
39
- <hand-query-user :row="row" v-if="show == '抄表结算'" @deal-msg="dealMsg"></hand-query-user>
40
- </saletab>
41
- <saletab header="变更记录" v-if="permission('变更记录')">
42
- <change-record :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
43
- </saletab>
44
- <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
45
- <query-instruct :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
46
- </saletab>
47
- <tab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
48
- <watch-warning :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
49
- </tab>
50
- <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
51
- <watch-collection :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
52
- </saletab>
53
-
54
- </saletabbut>
55
- </div>
56
- </div>
57
- </template>
58
-
59
- <script>
60
- import {HttpResetClass} from 'vue-client'
61
- // 导入IC卡相关查询界面
62
- import ChangeMeterQueryUser from './ic_detail/ChangeMeterQueryUser'
63
- import ChargeQueryUser from './ic_detail/ChargeQueryUser'
64
- import ChargeRecordQueryUser from './ic_detail/ChargeRecordQuery'
65
- import FillCardQueryUser from './ic_detail/FillCardQueryUser'
66
- import FillGasQueryUser from './ic_detail/FillGasQueryUser'
67
- import HandQueryUser from './ic_detail/HandQueryUser'
68
- import OtherChargeQueryUser from './ic_detail/OtherChargeQueryUser'
69
- import RecordQueryUser from './ic_detail/RecordQueryUser'
70
- import TransferQueryUser from './ic_detail/TransferQueryUser'
71
- import CardHandRecord from './ic_detail/CardHandRecord'
72
-
73
- // 导入物联网相关查询
74
- import QueryInstruct from './iot_detail/QueryInstruct'
75
- import WatchCollection from './iot_detail/WatchCollection'
76
- import WatchWarning from './iot_detail/WatchWarning'
77
- import PriceChangeQueryUser from './ic_detail/PriceChangeQueryUser'
78
- import ChangeRecord from './ic_detail/ChangeRecord'
79
-
80
- export default {
81
- title: '用户详细信息',
82
- props: ['f_userinfo_id'],
83
- components: {
84
- PriceChangeQueryUser,
85
- ChangeMeterQueryUser,
86
- ChargeQueryUser,
87
- ChargeRecordQueryUser,
88
- FillCardQueryUser,
89
- FillGasQueryUser,
90
- HandQueryUser,
91
- OtherChargeQueryUser,
92
- RecordQueryUser,
93
- TransferQueryUser,
94
- WatchWarning,
95
- WatchCollection,
96
- QueryInstruct,
97
- ChangeRecord,
98
- CardHandRecord
99
- },
100
- data () {
101
- return {
102
- row: null,
103
- name: '收费查询',
104
- show: ''
105
- }
106
- },
107
- ready () {
108
- this.search()
109
- },
110
- methods: {
111
- permission (name) {
112
- if (this.$login.r.find(value => value == '收费综合查询')) {
113
- if (!this.$login.r.find(value => value == name)) {
114
- return false
115
- }
116
- }
117
- return true
118
- },
119
- async search () {
120
- let http = new HttpResetClass()
121
-
122
- let condition = `f_userinfo_id = '${this.f_userinfo_id}'`
123
-
124
- let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
125
- {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
126
- this.row = getBaseInfo.data[0]
127
- },
128
-
129
- cancel (val) {
130
- this.$emit('cancel-main', val)
131
- },
132
-
133
- butOper (val) {
134
- this.name = val
135
- }
136
- },
137
- watch: {
138
- 'f_userinfo_id' () {
139
- this.search()
140
- }
141
- }
142
- }
143
- </script>
1
+ <template>
2
+ <div class="col-sm-12 binary" >
3
+ <div class="col-sm-6 binary-left" style="overflow-y: auto;width: 35%">
4
+ <user-base-info :row="row" @cancel-main="cancel"></user-base-info>
5
+ </div>
6
+ <div class="col-sm-6 binary-right" style="padding-right:25px;padding-left: 20px;width: 65%">
7
+ <saletabbut v-if="row" v-ref:list :active="-1">
8
+ <saletab header="流水查询" v-if="permission('流水查询')">
9
+ <record-query-user :row="row" v-if="show == '流水查询'" @deal-msg="dealMsg"></record-query-user>
10
+ </saletab>
11
+ <saletab header="收费查询" v-if="permission('收费查询')">
12
+ <charge-query-user :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
13
+ </saletab>
14
+ <saletab header="补气查询" v-if="permission('补气查询')">
15
+ <fill-gas-query-user :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
16
+ </saletab>
17
+ <saletab header="换表查询" v-if="permission('换表查询')">
18
+ <change-meter-query-user :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
19
+ </saletab>
20
+ <saletab header="其他收费" v-if="permission('其他收费')">
21
+ <other-charge-query-user :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
22
+ </saletab>
23
+ <saletab header="过户查询" v-if="permission('过户查询')">
24
+ <transfer-query-user :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
25
+ </saletab>
26
+ <saletab header="价格调整" v-if="permission('价格调整')">
27
+ <price-change-query-user :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
28
+ </saletab>
29
+ <saletab header="附件查看" v-if="permission('附件查看')">
30
+ <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
31
+ </saletab>
32
+ <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
33
+ <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
34
+ </saletab>
35
+ <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
36
+ <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
37
+ </saletab>
38
+ <saletab header="抄表结算" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表结算')">
39
+ <hand-query-user :row="row" v-if="show == '抄表结算'" @deal-msg="dealMsg"></hand-query-user>
40
+ </saletab>
41
+ <saletab header="变更记录" v-if="permission('变更记录')">
42
+ <change-record :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
43
+ </saletab>
44
+ <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
45
+ <query-instruct :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
46
+ </saletab>
47
+ <tab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
48
+ <watch-warning :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
49
+ </tab>
50
+ <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
51
+ <watch-collection :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
52
+ </saletab>
53
+
54
+ </saletabbut>
55
+ </div>
56
+ </div>
57
+ </template>
58
+
59
+ <script>
60
+ import {HttpResetClass} from 'vue-client'
61
+ // 导入IC卡相关查询界面
62
+ import ChangeMeterQueryUser from './ic_detail/ChangeMeterQueryUser'
63
+ import ChargeQueryUser from './ic_detail/ChargeQueryUser'
64
+ import ChargeRecordQueryUser from './ic_detail/ChargeRecordQuery'
65
+ import FillCardQueryUser from './ic_detail/FillCardQueryUser'
66
+ import FillGasQueryUser from './ic_detail/FillGasQueryUser'
67
+ import HandQueryUser from './ic_detail/HandQueryUser'
68
+ import OtherChargeQueryUser from './ic_detail/OtherChargeQueryUser'
69
+ import RecordQueryUser from './ic_detail/RecordQueryUser'
70
+ import TransferQueryUser from './ic_detail/TransferQueryUser'
71
+ import CardHandRecord from './ic_detail/CardHandRecord'
72
+
73
+ // 导入物联网相关查询
74
+ import QueryInstruct from './iot_detail/QueryInstruct'
75
+ import WatchCollection from './iot_detail/WatchCollection'
76
+ import WatchWarning from './iot_detail/WatchWarning'
77
+ import PriceChangeQueryUser from './ic_detail/PriceChangeQueryUser'
78
+ import ChangeRecord from './ic_detail/ChangeRecord'
79
+
80
+ export default {
81
+ title: '用户详细信息',
82
+ props: ['f_userinfo_id'],
83
+ components: {
84
+ PriceChangeQueryUser,
85
+ ChangeMeterQueryUser,
86
+ ChargeQueryUser,
87
+ ChargeRecordQueryUser,
88
+ FillCardQueryUser,
89
+ FillGasQueryUser,
90
+ HandQueryUser,
91
+ OtherChargeQueryUser,
92
+ RecordQueryUser,
93
+ TransferQueryUser,
94
+ WatchWarning,
95
+ WatchCollection,
96
+ QueryInstruct,
97
+ ChangeRecord,
98
+ CardHandRecord
99
+ },
100
+ data () {
101
+ return {
102
+ row: null,
103
+ name: '收费查询',
104
+ show: ''
105
+ }
106
+ },
107
+ ready () {
108
+ this.search()
109
+ },
110
+ methods: {
111
+ permission (name) {
112
+ if (this.$login.r.find(value => value == '收费综合查询')) {
113
+ if (!this.$login.r.find(value => value == name)) {
114
+ return false
115
+ }
116
+ }
117
+ return true
118
+ },
119
+ async search () {
120
+ let http = new HttpResetClass()
121
+
122
+ let condition = `f_userinfo_id = '${this.f_userinfo_id}'`
123
+
124
+ let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
125
+ {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
126
+ this.row = getBaseInfo.data[0]
127
+ },
128
+
129
+ cancel (val) {
130
+ this.$emit('cancel-main', val)
131
+ },
132
+
133
+ butOper (val) {
134
+ this.name = val
135
+ }
136
+ },
137
+ watch: {
138
+ 'f_userinfo_id' () {
139
+ this.search()
140
+ }
141
+ }
142
+ }
143
+ </script>
@@ -319,7 +319,7 @@
319
319
  this.eticket_msg = false
320
320
  this.disabled = false
321
321
  this.eticket_show = true
322
- this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type)
322
+ this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type, false, this.invoice_is_pax, this.row.f_paper_type)
323
323
  },
324
324
  eticket_toggle () {
325
325
  this.eticket_show = false
@@ -302,7 +302,7 @@ export default {
302
302
  confirm () {
303
303
  this.eticket_msg = false
304
304
  this.eticket_show = true
305
- this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '结算收费', this.invoice_is_pax, this.invoice_type)
305
+ this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '结算收费', false, this.invoice_is_pax, this.invoice_type)
306
306
  },
307
307
  selfSearch (args) {
308
308
  if (!this.orgCondtionStr) {