sale-client 3.5.199 → 3.5.200

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/revenue/base/rightview/CardList.vue +14 -1
  3. package/src/filiale/xiangyun/IOTRefund.vue +18 -14
  4. package/src/filiale/xiangyun/cardRefund.vue +16 -11
  5. package/src/filiale/xiangyun/machineRefund.vue +18 -12
  6. package/src/main.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.199",
3
+ "version": "3.5.200",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/base/rightview/CardList.vue CHANGED
@@ -177,13 +177,24 @@
177
177
  /**
178
178
  * 发票补打
179
179
  */
180
- let reprintGen = function *(self, row) {
180
+ let reprintGen = async function* (self, row) {
181
181
  try {
182
182
  row.billUrl = self.getBillUrl(row)
183
183
  if (!row.billUrl) {
184
184
  self.$showMessage('当前操作类型暂时没有票据')
185
185
  return
186
186
  }
187
+ if (row.type === '调价预存') {
188
+ let id = await self.$resetpost('rs/sql/singleTable_OrderBy', {
189
+ data: {
190
+ items: 'f_surplus_id',
191
+ tablename: 't_sellinggas',
192
+ condition: `id = '${row.id}'`,
193
+ orderitem: 'id'
194
+ }
195
+ }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
196
+ row.id = id.data[0].f_surplus_id
197
+ }
187
198
  row.f_bill_type = row.type
188
199
  row.f_bill_style = '普通收据'
189
200
  row.f_operator = self.$login.f.name
@@ -445,6 +456,8 @@
445
456
  }
446
457
  } else if (type === '预存缴费') {
447
458
  name = 'rs/report/pre_sell'
459
+ } else if (type === '调价预存') {
460
+ name = 'rs/report/refund_sell'
448
461
  } else if (type === '退费') {
449
462
  name = 'rs/report/refund_sell'
450
463
  } else if (type === '调价补费') {
package/src/filiale/xiangyun/IOTRefund.vue CHANGED
@@ -11,7 +11,7 @@
11
11
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
12
12
  class="datepicker"
13
13
  placeholder="起始时间"
14
- style="width:80%"
14
+ style="width:60%"
15
15
  v-model="model.f_start_date"
16
16
  v-ref:f_start_date
17
17
  ></datepicker>
@@ -21,7 +21,7 @@
21
21
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
22
22
  class="datepicker"
23
23
  placeholder="结束时间"
24
- style="width:80%"
24
+ style="width:60%"
25
25
  v-model="model.f_end_date"
26
26
  v-ref:f_end_date
27
27
  ></datepicker>
@@ -33,32 +33,32 @@
33
33
  <div class="row">
34
34
  <div class="col-sm-4">
35
35
  <label for="f_paper_account" class="font_normal_body ">结算金额</label>
36
- <input class="input_search" style="width:80%" disabled v-model="model.f_oughtfee">
36
+ <input class="input_search" style="width:60%" disabled v-model="model.f_oughtfee">
37
37
  </div>
38
38
  <div class="col-sm-4">
39
39
  <label for="f_paper_account" class="font_normal_body ">结算气量</label>
40
- <input class="input_search" style="width:80%" disabled v-model="model.f_oughtamount">
40
+ <input class="input_search" style="width:60%" disabled v-model="model.f_oughtamount">
41
41
  </div>
42
42
  <div class="col-sm-4">
43
43
  <label for="f_paper_account" class="font_normal_body ">累购金额</label>
44
- <input class="input_search" style="width:80%" disabled v-model="model.f_preamount">
44
+ <input class="input_search" style="width:60%" disabled v-model="model.f_preamount">
45
45
  </div>
46
46
  <div class="col-sm-4">
47
47
  <label for="f_paper_account" class="font_normal_body ">累购气量</label>
48
- <input class="input_search" style="width:80%" disabled v-model="model.f_pregas">
48
+ <input class="input_search" style="width:60%" disabled v-model="model.f_pregas">
49
49
  </div>
50
50
 
51
51
  <div class="col-sm-4">
52
52
  <label for="f_paper_account" class="font_normal_body ">待退金额</label>
53
- <input class="input_search" style="width:80%" disabled v-model="model.f_refund_fee">
53
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refund_fee">
54
54
  </div>
55
55
  <div class="col-sm-4">
56
56
  <label for="f_paper_account" class="font_normal_body ">已退金额</label>
57
- <input class="input_search" style="width:80%" disabled v-model="model.f_refunded_fee">
57
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refunded_fee">
58
58
  </div>
59
59
  <div class="col-sm-8">
60
- <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
61
- <input class="input_search" style="width:80%" v-model="model.f_comments">
60
+ <label for="f_paper_account" class="font_normal_body ">备&emsp;&emsp;注</label>
61
+ <input class="input_search" style="width:60%" v-model="model.f_comments">
62
62
  </div>
63
63
  <div class="col-sm-4 form-group">
64
64
  <label class="font_normal_body">退费金额</label>
@@ -67,7 +67,10 @@
67
67
  disabled
68
68
  placeholder="退费金额">
69
69
  </div>
70
-
70
+ <div class="col-sm-8">
71
+ <label for="f_paper_account" class="font_normal_body ">收款事由</label>
72
+ <input class="input_search" style="width:60%" v-model="model.f_reason">
73
+ </div>
71
74
  </div>
72
75
  </form>
73
76
  <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
@@ -97,6 +100,7 @@
97
100
  f_refunded_fee: '',
98
101
  f_refund_fee: '',
99
102
  f_comments: '',
103
+ f_reason: '',
100
104
  f_pregas: '',
101
105
  f_preamount: '',
102
106
  f_oughtfee: '',
@@ -113,13 +117,12 @@
113
117
  priceCalculation: false, // 划气量控制
114
118
  showupload: true, // 默认显示附件上传组件
115
119
  hasPrint: true, // 默认打票
116
- floor: true, //是否取整收费
117
- hasBillManage: true, // 默认不启用发票管理
120
+ floor: true, // 是否取整收费
121
+ hasBillManage: false, // 默认不启用发票管理
118
122
  billType: '燃气费', // 票据类型（燃气费，其他费用，调用的发票代码不同）
119
123
  printType: '普通收据', // 收据/电子票/专用发票/国税发票
120
124
  payment: '现金缴费'
121
125
  },
122
- blodid: '',
123
126
  hasValidateBill: false,
124
127
  validateOk: false,
125
128
  printModel: {},
@@ -148,6 +151,7 @@
148
151
  f_refund_gas: 0,
149
152
  f_refund_fee: this.model.f_refund_fee,
150
153
  f_comments: this.model.f_comments,
154
+ f_reason: this.model.f_reason,
151
155
  f_balance: this.data.f_balance,
152
156
  f_balance_amount: this.data.f_balance_amount,
153
157
  f_start_date: this.model.f_start_date,
package/src/filiale/xiangyun/cardRefund.vue CHANGED
@@ -11,7 +11,7 @@
11
11
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
12
12
  class="datepicker"
13
13
  placeholder="起始时间"
14
- style="width:80%"
14
+ style="width:60%"
15
15
  v-model="model.f_start_date"
16
16
  v-ref:f_start_date
17
17
  ></datepicker>
@@ -21,7 +21,7 @@
21
21
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
22
22
  class="datepicker"
23
23
  placeholder="结束时间"
24
- style="width:80%"
24
+ style="width:60%"
25
25
  v-model="model.f_end_date"
26
26
  v-ref:f_end_date
27
27
  ></datepicker>
@@ -33,24 +33,24 @@
33
33
  <div class="row">
34
34
  <div class="col-sm-4">
35
35
  <label for="f_paper_account" class="font_normal_body ">累购金额</label>
36
- <input class="input_search" style="width:80%" disabled v-model="model.f_preamount">
36
+ <input class="input_search" style="width:60%" disabled v-model="model.f_preamount">
37
37
  </div>
38
38
  <div class="col-sm-4">
39
39
  <label for="f_paper_account" class="font_normal_body ">累购气量</label>
40
- <input class="input_search" style="width:80%" disabled v-model="model.f_pregas">
40
+ <input class="input_search" style="width:60%" disabled v-model="model.f_pregas">
41
41
  </div>
42
42
 
43
43
  <div class="col-sm-4">
44
44
  <label for="f_paper_account" class="font_normal_body ">待退金额</label>
45
- <input class="input_search" style="width:80%" disabled v-model="model.f_refund_fee">
45
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refund_fee">
46
46
  </div>
47
47
  <div class="col-sm-4">
48
48
  <label for="f_paper_account" class="font_normal_body ">已退金额</label>
49
- <input class="input_search" style="width:80%" disabled v-model="model.f_refunded_fee">
49
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refunded_fee">
50
50
  </div>
51
51
  <div class="col-sm-8">
52
- <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
53
- <input class="input_search" style="width:80%" v-model="model.f_comments">
52
+ <label for="f_paper_account" class="font_normal_body ">备&emsp;&emsp;注</label>
53
+ <input class="input_search" style="width:60%" v-model="model.f_comments">
54
54
  </div>
55
55
  <div class="col-sm-4 form-group">
56
56
  <label class="font_normal_body">退费金额</label>
@@ -59,7 +59,10 @@
59
59
  disabled
60
60
  placeholder="退费金额">
61
61
  </div>
62
-
62
+ <div class="col-sm-8">
63
+ <label for="f_paper_account" class="font_normal_body ">收款事由</label>
64
+ <input class="input_search" style="width:60%" v-model="model.f_reason">
65
+ </div>
63
66
  </div>
64
67
  </form>
65
68
  <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
@@ -89,6 +92,7 @@
89
92
  f_refunded_fee: '',
90
93
  f_refund_fee: '',
91
94
  f_comments: '',
95
+ f_reason: '',
92
96
  f_pregas: '',
93
97
  f_preamount: '',
94
98
  f_price: 0
@@ -103,8 +107,8 @@
103
107
  priceCalculation: false, // 划气量控制
104
108
  showupload: true, // 默认显示附件上传组件
105
109
  hasPrint: true, // 默认打票
106
- floor: true, //是否取整收费
107
- hasBillManage: true, // 默认不启用发票管理
110
+ floor: true, // 是否取整收费
111
+ hasBillManage: false, // 默认不启用发票管理
108
112
  billType: '燃气费', // 票据类型（燃气费，其他费用，调用的发票代码不同）
109
113
  printType: '普通收据', // 收据/电子票/专用发票/国税发票
110
114
  payment: '现金缴费'
@@ -137,6 +141,7 @@
137
141
  f_refund_gas: 0,
138
142
  f_refund_fee: this.model.f_refund_fee,
139
143
  f_comments: this.model.f_comments,
144
+ f_reason: this.model.f_reason,
140
145
  f_balance: this.data.f_balance,
141
146
  f_start_date: this.model.f_start_date,
142
147
  f_end_date: this.model.f_end_date,
package/src/filiale/xiangyun/machineRefund.vue CHANGED
@@ -11,7 +11,7 @@
11
11
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
12
12
  class="datepicker"
13
13
  placeholder="起始时间"
14
- style="width:80%"
14
+ style="width:60%"
15
15
  v-model="model.f_start_date"
16
16
  v-ref:f_start_date
17
17
  ></datepicker>
@@ -21,7 +21,7 @@
21
21
  <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
22
22
  class="datepicker"
23
23
  placeholder="结束时间"
24
- style="width:80%"
24
+ style="width:60%"
25
25
  v-model="model.f_end_date"
26
26
  v-ref:f_end_date
27
27
  ></datepicker>
@@ -33,32 +33,32 @@
33
33
  <div class="row">
34
34
  <div class="col-sm-4">
35
35
  <label for="f_paper_account" class="font_normal_body ">结算金额</label>
36
- <input class="input_search" style="width:80%" disabled v-model="model.f_oughtfee">
36
+ <input class="input_search" style="width:60%" disabled v-model="model.f_oughtfee">
37
37
  </div>
38
38
  <div class="col-sm-4">
39
39
  <label for="f_paper_account" class="font_normal_body ">结算气量</label>
40
- <input class="input_search" style="width:80%" disabled v-model="model.f_oughtamount">
40
+ <input class="input_search" style="width:60%" disabled v-model="model.f_oughtamount">
41
41
  </div>
42
42
  <div class="col-sm-4">
43
43
  <label for="f_paper_account" class="font_normal_body ">累购金额</label>
44
- <input class="input_search" style="width:80%" disabled v-model="model.f_preamount">
44
+ <input class="input_search" style="width:60%" disabled v-model="model.f_preamount">
45
45
  </div>
46
46
  <div class="col-sm-4">
47
47
  <label for="f_paper_account" class="font_normal_body ">累购气量</label>
48
- <input class="input_search" style="width:80%" disabled v-model="model.f_pregas">
48
+ <input class="input_search" style="width:60%" disabled v-model="model.f_pregas">
49
49
  </div>
50
50
 
51
51
  <div class="col-sm-4">
52
52
  <label for="f_paper_account" class="font_normal_body ">待退金额</label>
53
- <input class="input_search" style="width:80%" disabled v-model="model.f_refund_fee">
53
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refund_fee">
54
54
  </div>
55
55
  <div class="col-sm-4">
56
56
  <label for="f_paper_account" class="font_normal_body ">已退金额</label>
57
- <input class="input_search" style="width:80%" disabled v-model="model.f_refunded_fee">
57
+ <input class="input_search" style="width:60%" disabled v-model="model.f_refunded_fee">
58
58
  </div>
59
59
  <div class="col-sm-8">
60
- <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
61
- <input class="input_search" style="width:80%" v-model="model.f_comments">
60
+ <label for="f_paper_account" class="font_normal_body ">备&emsp;&emsp;注</label>
61
+ <input class="input_search" style="width:60%" v-model="model.f_comments">
62
62
  </div>
63
63
  <div class="col-sm-4 form-group">
64
64
  <label class="font_normal_body">退费金额</label>
@@ -67,6 +67,10 @@
67
67
  disabled
68
68
  placeholder="退费金额">
69
69
  </div>
70
+ <div class="col-sm-8">
71
+ <label for="f_paper_account" class="font_normal_body ">收款事由</label>
72
+ <input class="input_search" style="width:60%" v-model="model.f_reason">
73
+ </div>
70
74
 
71
75
  </div>
72
76
  </form>
@@ -97,6 +101,7 @@
97
101
  f_refunded_fee: '',
98
102
  f_refund_fee: '',
99
103
  f_comments: '',
104
+ f_reason: '',
100
105
  f_pregas: '',
101
106
  f_preamount: '',
102
107
  f_oughtfee: '',
@@ -113,8 +118,8 @@
113
118
  priceCalculation: false, // 划气量控制
114
119
  showupload: true, // 默认显示附件上传组件
115
120
  hasPrint: true, // 默认打票
116
- floor: true, //是否取整收费
117
- hasBillManage: true, // 默认不启用发票管理
121
+ floor: true, // 是否取整收费
122
+ hasBillManage: false, // 默认不启用发票管理
118
123
  billType: '燃气费', // 票据类型（燃气费，其他费用，调用的发票代码不同）
119
124
  printType: '普通收据', // 收据/电子票/专用发票/国税发票
120
125
  payment: '现金缴费'
@@ -147,6 +152,7 @@
147
152
  f_refund_gas: 0,
148
153
  f_refund_fee: this.model.f_refund_fee,
149
154
  f_comments: this.model.f_comments,
155
+ f_reason: this.model.f_reason,
150
156
  f_balance: this.data.f_balance,
151
157
  f_start_date: this.model.f_start_date,
152
158
  f_end_date: this.model.f_end_date,
package/src/main.js CHANGED
@@ -11,7 +11,7 @@ Vue.config.silent = true
11
11
 
12
12
  all()
13
13
  system(false)
14
- sale('tongchuan')
14
+ sale('xiangyun')
15
15
  address()
16
16
  ldap()
17
17
  require('system-clients/src/styles/less/bootstrap.less')