sale-client 3.6.172 → 3.6.174
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/build/dev-server.js +7 -10
- package/package.json +1 -1
- package/src/components/charge/business/IOTMeterCenter.vue +7 -5
- package/src/components/chargeBatch/CardList.vue +2 -2
- package/src/components/chargeBatch/RecordCancel.vue +2 -0
- package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue +57 -1
- package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue +8 -1
- package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue +8 -0
- package/src/filiale/gehua/PriceChangeCompensation/GroupCompensation.vue +22 -0
- package/src/filiale/gehua/PriceChangeCompensation/GroupJbCompensation.vue +368 -0
- package/src/filiale/gehua/PriceChangeCompensation/OweRecordQuery.vue +184 -0
- package/src/filiale/gehua/PriceChangeCompensation/SurplusRecordDetail.vue +85 -37
- package/src/filiale/gehua/sale.js +4 -0
- package/src/filiale/shanxian/components/revenue/InsuranceChargesDetails.vue +18 -0
- package/src/filiale/shexian/HighMeterCard.vue +8 -2
- package/src/filiale/shexian/Upload.vue +599 -0
- package/src/filiale/shexian/sale.js +1 -0
- package/src/filiale/wenxi/cardsHand.vue +1 -1
- package/static/mainicon/doc.jpg +0 -0
- package/static/mainicon/pdf.jpg +0 -0
package/build/dev-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [ serverRul, localUrl ] = ['http://
|
|
2
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
|
@@ -18,13 +18,7 @@ var devConfig = {
|
|
|
18
18
|
},
|
|
19
19
|
proxy: {
|
|
20
20
|
'/rs/file': {
|
|
21
|
-
target:
|
|
22
|
-
},
|
|
23
|
-
'/rs/logic/filemanage_fileSave': {
|
|
24
|
-
target: "http://127.0.0.1:4523/m1/719967-0-default"
|
|
25
|
-
},
|
|
26
|
-
'/rs/downloadfile': {
|
|
27
|
-
target: localUrl
|
|
21
|
+
target: serverRul
|
|
28
22
|
},
|
|
29
23
|
'/webapps': {
|
|
30
24
|
target: serverRul
|
|
@@ -79,10 +73,13 @@ var devConfig = {
|
|
|
79
73
|
target: serverRul
|
|
80
74
|
},
|
|
81
75
|
'/rs/logic': {
|
|
82
|
-
target:
|
|
76
|
+
target: 'http://127.0.0.1:8080'
|
|
83
77
|
},
|
|
84
78
|
'/rs/sql': {
|
|
85
|
-
target:
|
|
79
|
+
target: 'http://127.0.0.1:8080'
|
|
80
|
+
},
|
|
81
|
+
'/rs/entity': {
|
|
82
|
+
target: 'http://127.0.0.1:8080'
|
|
86
83
|
},
|
|
87
84
|
'/webmeter': {
|
|
88
85
|
target: serverRul
|
package/package.json
CHANGED
|
@@ -111,7 +111,7 @@
|
|
|
111
111
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
112
112
|
@blur="config.calculatePreByCollection && calculatePreByCollection()"
|
|
113
113
|
@keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
|
|
114
|
-
v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection
|
|
114
|
+
v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection ">
|
|
115
115
|
</div>
|
|
116
116
|
<div class="col-sm-1 form-group">
|
|
117
117
|
<give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
|
|
@@ -743,10 +743,12 @@
|
|
|
743
743
|
preamount () {
|
|
744
744
|
if (this.model.f_preamount && this.model.f_preamount > 0) {
|
|
745
745
|
try {
|
|
746
|
-
preamountGen(this)
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
746
|
+
preamountGen(this).then((res) => {
|
|
747
|
+
if (this.config.quickSale) {
|
|
748
|
+
this.checkInvoiceMsg((!this.$v.valid || this.validateOk || !this.islegal || this.clickConfirm))
|
|
749
|
+
// this.$els.sk.focus()
|
|
750
|
+
}
|
|
751
|
+
})
|
|
750
752
|
} catch (error) {
|
|
751
753
|
this.$showAlert(`发卡售气划价错误,错误类型:${error}`, 'danger', 0)
|
|
752
754
|
this.$dispatch('error', '发卡售气', this.model, error)
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
<a @click.stop="$parent.$parent.$parent.operate('票据明细', row)" href="#">票据明细打印</a>
|
|
72
72
|
</li>
|
|
73
73
|
<li
|
|
74
|
-
v-if="(row.type === '批量收费'||row.type === '
|
|
74
|
+
v-if="(row.type === '批量收费'||row.type === '团体调价补费' || row.type === '迁表' || row.type === '拆表' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费'|| row.type === '气费减免'||row.type === '维修收费' || row.type === '过户' || row.type === '换新表' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '其他收费' || row.type === '补卡'|| row.type === '调价补费'|| row.type=='预存缴费' || row.type==='卡表赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='物联网赠气')||row.type==='气损收费'">
|
|
75
75
|
<a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
|
|
76
76
|
</li>
|
|
77
77
|
<li v-else>
|
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
<advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
|
|
134
134
|
<machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'"></machinemetercenter-detail>
|
|
135
135
|
<gasloss-detail :data="row" v-if="row.type === '气损收费'"></gasloss-detail>
|
|
136
|
-
<batch-charge-detail :data="row" v-if="row.type === '批量收费' || row.type === '团体收费' || row.type === '团体退费' || row.type === '团体补费' || row.type === '团体扣费'"></batch-charge-detail>
|
|
136
|
+
<batch-charge-detail :data="row" v-if="row.type === '批量收费'|| row.type === '团体调价补费'|| row.type === '团体调价补费撤销' || row.type === '团体收费' || row.type === '团体退费' || row.type === '团体补费' || row.type === '团体扣费'"></batch-charge-detail>
|
|
137
137
|
</div>
|
|
138
138
|
<div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
|
|
139
139
|
<span>{{row.f_describe}}</span>
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
<div class="col-sm-2 form-group">
|
|
15
15
|
<label class="font_normal_body" for="f_user_name">客户姓名</label>
|
|
16
16
|
<input id="f_user_name" type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
|
|
17
|
-
condition="f_user_name like '{}'" placeholder='请输入要查询的客户姓名'>
|
|
17
|
+
condition="f_user_name like '%{}%'" placeholder='请输入要查询的客户姓名'>
|
|
18
18
|
</div>
|
|
19
19
|
<div class="col-sm-2 form-group">
|
|
20
20
|
<label class="font_normal_body" for="f_insurance_type">险 种</label>
|
|
@@ -61,6 +61,61 @@
|
|
|
61
61
|
close-on-select clear-button>
|
|
62
62
|
</v-select>
|
|
63
63
|
</div>
|
|
64
|
+
<div class="col-sm-2 form-group">
|
|
65
|
+
<label class="font_normal_body" for="f_state">收款方式</label>
|
|
66
|
+
<v-select id="f_state"
|
|
67
|
+
v-model="model.f_payment"
|
|
68
|
+
placeholder='请选择'
|
|
69
|
+
condition="f_payment ='{}'"
|
|
70
|
+
:value.sync="model.f_payment"
|
|
71
|
+
:options='$parent.$parent.payment'
|
|
72
|
+
close-on-select clear-button>
|
|
73
|
+
</v-select>
|
|
74
|
+
</div>
|
|
75
|
+
<div class="col-sm-2 form-group">
|
|
76
|
+
<label class="font_normal_body" for="f_user_name">客户地址</label>
|
|
77
|
+
<input id="f_address" type="text" class="input_search" style="width: 60%" v-model="model.f_address"
|
|
78
|
+
condition="f_address like '%{}%'" placeholder='请输入要查询的客户地址'>
|
|
79
|
+
</div>
|
|
80
|
+
<div class="col-sm-2 form-group">
|
|
81
|
+
<label class="font_normal_body" for="f_user_name">客户电话</label>
|
|
82
|
+
<input id="f_user_phone" type="text" class="input_search" style="width: 60%" v-model="model.f_user_phone"
|
|
83
|
+
condition="f_user_phone like '%{}%'" placeholder='请输入要查询的客户电话'>
|
|
84
|
+
</div>
|
|
85
|
+
<div class="col-sm-2 form-group">
|
|
86
|
+
<label class="font_normal_body" for="f_user_name">身份证号</label>
|
|
87
|
+
<input id="f_idnumber" type="text" class="input_search" style="width: 60%" v-model="model.f_idnumber"
|
|
88
|
+
condition="f_idnumber like '%{}%'" placeholder='请输入要查询的身份证号'>
|
|
89
|
+
</div>
|
|
90
|
+
<div class="col-sm-2 form-group">
|
|
91
|
+
<label class="font_normal_body" for="f_user_name">保险单号</label>
|
|
92
|
+
<input id="f_ins_number" type="text" class="input_search" style="width: 60%" v-model="model.f_ins_number"
|
|
93
|
+
condition="f_ins_number like '%{}%'" placeholder='请输入要查询的保险单号'>
|
|
94
|
+
</div>
|
|
95
|
+
<div class="col-sm-2 form-group">
|
|
96
|
+
<label class="font_normal_body" for="f_user_name">备注信息</label>
|
|
97
|
+
<input id="f_comments" type="text" class="input_search" style="width: 60%" v-model="model.f_comments"
|
|
98
|
+
condition="f_comments like '%{}%'" placeholder='请输入要查询的备注信息'>
|
|
99
|
+
</div>
|
|
100
|
+
<div class="col-sm-2 form-group">
|
|
101
|
+
<label class="font_normal_body">开始时间</label>
|
|
102
|
+
<datepicker :format="'yyyy-MM-dd'"
|
|
103
|
+
:value.sync="model.f_ins_start_date"
|
|
104
|
+
placeholder="缴费开始时间"
|
|
105
|
+
condition="f_operate_date >= '{}'"
|
|
106
|
+
v-model="model.f_ins_start_date" style="width: 55%">
|
|
107
|
+
</datepicker>
|
|
108
|
+
</div>
|
|
109
|
+
<div class="col-sm-2 form-group">
|
|
110
|
+
<label class="font_normal_body">结束时间</label>
|
|
111
|
+
<datepicker :format="'yyyy-MM-dd'"
|
|
112
|
+
:value.sync="model.f_expiration_date"
|
|
113
|
+
placeholder="缴费结束时间"
|
|
114
|
+
condition="f_operate_date <= '{}'"
|
|
115
|
+
v-model="model.f_expiration_date" style="width: 55%">
|
|
116
|
+
</datepicker>
|
|
117
|
+
</div>
|
|
118
|
+
|
|
64
119
|
</div>
|
|
65
120
|
</div>
|
|
66
121
|
|
|
@@ -251,6 +306,7 @@
|
|
|
251
306
|
},
|
|
252
307
|
f_state: '',
|
|
253
308
|
state: this.$appdata.getParam('保险状态') ? this.$appdata.getParam('保险状态') : [],
|
|
309
|
+
payment: this.$appdata.getParam('收费方式') ? this.$appdata.getParam('收费方式') : [],
|
|
254
310
|
f_insurance_type: '',
|
|
255
311
|
insuranceType: this.$appdata.getParam('险种') ? this.$appdata.getParam('险种') : [],
|
|
256
312
|
orgCondtionStr: '',
|
package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue
CHANGED
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
</button>
|
|
120
120
|
</div>
|
|
121
121
|
<!--<upload :blodid="blodid" isremark="true" fusetype="过户"></upload>-->
|
|
122
|
-
<upload :blodid="blodid" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="过户管理"></upload>
|
|
122
|
+
<upload :blodid="blodid" v-if="config.showupload" v-on:confirminfo="confirmIdCard" :businessid="randomBusinessId" isremark="true" fusetype="过户管理"></upload>
|
|
123
123
|
</validator>
|
|
124
124
|
</div>
|
|
125
125
|
<modal v-if="loaduserflag" :show.sync="loaduserflag" width="80%" title="过户资产信息" v-ref:modal large backdrop="false">
|
|
@@ -219,6 +219,8 @@
|
|
|
219
219
|
f_transfer_fees: this.$appdata.getSingleValue('过户费') ? this.$appdata.getSingleValue('过户费') : '',
|
|
220
220
|
// f_transfer_fees: '',
|
|
221
221
|
f_newbank_accopen: '',
|
|
222
|
+
f_newuser_name: '',
|
|
223
|
+
f_newidnumber: '',
|
|
222
224
|
f_newbank_name: ''
|
|
223
225
|
},
|
|
224
226
|
transferdata: {
|
|
@@ -262,6 +264,11 @@
|
|
|
262
264
|
},
|
|
263
265
|
|
|
264
266
|
methods: {
|
|
267
|
+
confirmIdCard (msg) {
|
|
268
|
+
console.log(msg)
|
|
269
|
+
this.model.f_newuser_name = msg.strName
|
|
270
|
+
this.model.f_newidnumber = msg.strID
|
|
271
|
+
},
|
|
265
272
|
getRandomId () {
|
|
266
273
|
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
267
274
|
let res = Math.random() * 16 | 0
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
v-model="model.f_user_phone">
|
|
28
28
|
</div>
|
|
29
29
|
<div class="form-group col-sm-3 button-range" style="padding-right: 10px">
|
|
30
|
+
<import-excel v-if="$parent.$parent.blackImport === '黑名单导入'" template-name="黑名单用户导入模板" logic-name="BlackListImport" import-json="blacklist.json"></import-excel>
|
|
30
31
|
<button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
|
|
31
32
|
<button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
|
|
32
33
|
v-el:cx>新增黑名单
|
|
@@ -170,6 +171,7 @@
|
|
|
170
171
|
user: []
|
|
171
172
|
},
|
|
172
173
|
criteriaShow: false,
|
|
174
|
+
blackImport: '',
|
|
173
175
|
model: new PagedList('rs/sql/sale_getBlackList', 20),
|
|
174
176
|
// 公司下拉
|
|
175
177
|
curorgid: [this.$login.f.orgid],
|
|
@@ -196,9 +198,15 @@
|
|
|
196
198
|
ispartial: false
|
|
197
199
|
},
|
|
198
200
|
ready () {
|
|
201
|
+
this.getAuthority()
|
|
199
202
|
this.search()
|
|
200
203
|
},
|
|
201
204
|
methods: {
|
|
205
|
+
getAuthority () {
|
|
206
|
+
if (this.$login.r.find(value => value == '黑名单导入')) {
|
|
207
|
+
this.blackImport = '黑名单导入'
|
|
208
|
+
}
|
|
209
|
+
},
|
|
202
210
|
async getRes (condition, obj) {
|
|
203
211
|
console.log('condition =', condition)
|
|
204
212
|
console.log('obj =', obj)
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<surplus-record-detail :row.sync="row" :civill.sync="civill"></surplus-record-detail>
|
|
4
|
+
<group-jb-compensation :row.sync="row" :civill="civill"></group-jb-compensation>
|
|
5
|
+
</div>
|
|
6
|
+
</template>
|
|
7
|
+
<script>
|
|
8
|
+
import GroupJbCompensation from './GroupJbCompensation'
|
|
9
|
+
import SurplusRecordDetail from './SurplusRecordDetail'
|
|
10
|
+
|
|
11
|
+
export default {
|
|
12
|
+
components: {GroupJbCompensation,SurplusRecordDetail},
|
|
13
|
+
title: '团缴调价补差',
|
|
14
|
+
data () {
|
|
15
|
+
return {
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
props: ['row', 'civill'],
|
|
19
|
+
ready () {
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
</script>
|
|
@@ -0,0 +1,368 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex-row">
|
|
3
|
+
<div class="span" style="overflow-y: auto;">
|
|
4
|
+
<validator name='v'>
|
|
5
|
+
<form novalidate class="form-horizontal">
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-4">
|
|
8
|
+
<label class=" font_normal_body">团体调价补差</label>
|
|
9
|
+
<v-select v-model="f_compensation_type"
|
|
10
|
+
placeholder='请选择'
|
|
11
|
+
:value-single="true"
|
|
12
|
+
:value.sync="model.f_compensation_type"
|
|
13
|
+
:options='compensationTypes'
|
|
14
|
+
close-on-select clear-button></v-select>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="col-sm-4">
|
|
17
|
+
<label class=" font_normal_body" title="参数名称:付款方式">收款方式</label>
|
|
18
|
+
<v-select v-model="f_payment"
|
|
19
|
+
placeholder='请选择'
|
|
20
|
+
:value.sync="model.f_payment"
|
|
21
|
+
:options='paytype'
|
|
22
|
+
close-on-select clear-button></v-select>
|
|
23
|
+
</div>
|
|
24
|
+
<div class="col-sm-4" :class="[$v.printstyle.required ? 'select-error' : '']">
|
|
25
|
+
<label for="f_print" class="font_normal_body">打印格式</label>
|
|
26
|
+
<input type="text" v-show="false" v-model="$refs.printstyle.selectedItems"
|
|
27
|
+
v-validate:printstyle='{required: true }'>
|
|
28
|
+
<v-select id="print"
|
|
29
|
+
v-model="f_print"
|
|
30
|
+
placeholder='请选择'
|
|
31
|
+
:multiple="mulPrint"
|
|
32
|
+
:value.sync="model.f_print"
|
|
33
|
+
:options='printstyle'
|
|
34
|
+
close-on-select clear-button v-ref:printstyle>
|
|
35
|
+
</v-select>
|
|
36
|
+
</div>
|
|
37
|
+
</div>
|
|
38
|
+
<div class="row" style="margin-top:6px;">
|
|
39
|
+
<div class="col-sm-8">
|
|
40
|
+
<label for="f_comments" class="font_normal_body"> 备注 </label>
|
|
41
|
+
<input class="input_search" style="width:80%" v-model="model.f_comments" rows="1" placeholder="备注">
|
|
42
|
+
</div>
|
|
43
|
+
<div class="col-sm-4"
|
|
44
|
+
:class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
|
|
45
|
+
<label for="f_collection" class="font_normal_body"
|
|
46
|
+
v-if="model.f_compensation_type == '调价补费'">应补金额</label>
|
|
47
|
+
<label for="f_collection" class="font_normal_body" v-else>应退金额</label>
|
|
48
|
+
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
|
|
49
|
+
readonly
|
|
50
|
+
v-scale="[model.f_preamount, 4]"
|
|
51
|
+
v-validate:f_preamount='{required: true, dctest: [(model.f_preamount - 0), ">=" ] }'
|
|
52
|
+
placeholder="补费金额">
|
|
53
|
+
</div>
|
|
54
|
+
|
|
55
|
+
</div>
|
|
56
|
+
<div class="row" style="margin-top:6px;">
|
|
57
|
+
<div class="col-sm-4">
|
|
58
|
+
<label for="f_balance" class="font_normal_body">上期结余</label>
|
|
59
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
|
|
60
|
+
v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
|
|
61
|
+
</div>
|
|
62
|
+
|
|
63
|
+
<div class="col-sm-4">
|
|
64
|
+
<label for="f_curbalance" class="font_normal_body">本期结余</label>
|
|
65
|
+
<input class="input_search" style="width:60%" type="number" v-model="curbalance"
|
|
66
|
+
v-scale="[curbalance, 2]" placeholder="本期结余" disabled>
|
|
67
|
+
</div>
|
|
68
|
+
<div class="col-sm-4"
|
|
69
|
+
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
|
|
70
|
+
<label for="f_collection" class=" font_normal_body">实际收款</label>
|
|
71
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
72
|
+
v-scale="[model.f_collection, 4]"
|
|
73
|
+
v-validate:f_preamount='{required: true, dctest: [(model.f_preamount - 0), ">=" ] }'
|
|
74
|
+
placeholder="实际收款">
|
|
75
|
+
</div>
|
|
76
|
+
<div class="row" style="margin-top:6px;">
|
|
77
|
+
<!--<div class="col-sm-4">-->
|
|
78
|
+
<!--<label for="f_change_price" class="font_normal_body">补差单价</label>-->
|
|
79
|
+
<!--<input class="input_search" style="width:60%" type="number" v-model="model.f_change_price"-->
|
|
80
|
+
<!--v-scale="[model.f_change_price, 4]" placeholder="补差单价" readonly>-->
|
|
81
|
+
<!--</div>-->
|
|
82
|
+
<div class="col-sm-4">
|
|
83
|
+
<label for="f_real_amount" class="font_normal_body">补差气量</label>
|
|
84
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_real_amount"
|
|
85
|
+
v-scale="[model.f_real_amount, 4]" placeholder="补差气量" readonly>
|
|
86
|
+
</div>
|
|
87
|
+
<div class="col-sm-4" :class="[$v.f_surplus_fee.required ? 'has-error' : 'has-success']">
|
|
88
|
+
<label for="f_surplus_fee" class="font_normal_body">补差金额</label>
|
|
89
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_surplus_fee"
|
|
90
|
+
v-scale="[model.f_surplus_fee, 4]" placeholder="补差金额"
|
|
91
|
+
v-validate:f_surplus_fee='{required: true}'>
|
|
92
|
+
</div>
|
|
93
|
+
</div>
|
|
94
|
+
</div>
|
|
95
|
+
</form>
|
|
96
|
+
<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
|
|
97
|
+
<print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close"
|
|
98
|
+
@printok="printok" v-ref:printbill></print-bill>
|
|
99
|
+
<div style="text-align:right; height: 25%">
|
|
100
|
+
<strong style="font-size: large"
|
|
101
|
+
v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
|
|
102
|
+
<payment-code-button :clickable="!$v.valid || clickConfirm"
|
|
103
|
+
:payment.sync="model.f_payment" :payment-data="paytype"
|
|
104
|
+
@confirm-payment="confirm()">
|
|
105
|
+
</payment-code-button>
|
|
106
|
+
<button class="button_search btn-gn" type="submit" @click="confirm()" :disabled='!$v.valid || clickConfirm'>
|
|
107
|
+
确认
|
|
108
|
+
</button>
|
|
109
|
+
<button class="button_clear btn-gn" @click="clean()">取消</button>
|
|
110
|
+
</div>
|
|
111
|
+
</validator>
|
|
112
|
+
</div>
|
|
113
|
+
</div>
|
|
114
|
+
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
|
|
115
|
+
<upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="团体调价补差"></upload>
|
|
116
|
+
</template>
|
|
117
|
+
<script>
|
|
118
|
+
import {HttpResetClass} from 'vue-client'
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
*综合业务
|
|
122
|
+
*团体调价补差收费组件
|
|
123
|
+
*/
|
|
124
|
+
|
|
125
|
+
let compensationChargeGen = async function (self) {
|
|
126
|
+
try {
|
|
127
|
+
if (self.paymentModel.length === 0) {
|
|
128
|
+
self.paymentModel = [{
|
|
129
|
+
f_payment: self.model.f_payment[0],
|
|
130
|
+
f_money: self.model.f_preamount
|
|
131
|
+
}]
|
|
132
|
+
}
|
|
133
|
+
self.model.payments = self.paymentModel
|
|
134
|
+
|
|
135
|
+
let param = Object.assign({}, {}, self.model)
|
|
136
|
+
param.f_payment = self.model.f_payment.toString()
|
|
137
|
+
param.f_print = self.model.f_print.toString()
|
|
138
|
+
// 加入扫码盒付款码支付流水号
|
|
139
|
+
param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
|
|
140
|
+
let res = await self.$resetpost('rs/logic/groupJBCompensation', {data: {model: param, row: self.row}}, {
|
|
141
|
+
warnMsg: `确定对客户${self.row.f_user_name}进行团体调价补差吗?`,
|
|
142
|
+
resolveMsg: '团体调价补差成功!!',
|
|
143
|
+
rejectMsg: '团体调价补差出错!!!'
|
|
144
|
+
})
|
|
145
|
+
// 开始打票
|
|
146
|
+
console.log('开始打票', self.config)
|
|
147
|
+
if (self.config.hasPrint) {
|
|
148
|
+
if (self.config.printType != '电子发票') {
|
|
149
|
+
if (self.config.hasBillManage) {
|
|
150
|
+
// 启用发票管理,获取票据管理中的票号并存储记录
|
|
151
|
+
self.row.id = res.data.id
|
|
152
|
+
self.row.f_bill_type = '团体调价补差'
|
|
153
|
+
self.row.f_bill_style = self.model.f_print[0]
|
|
154
|
+
self.print = true
|
|
155
|
+
} else {
|
|
156
|
+
self.row.id = res.data.id
|
|
157
|
+
self.print = true
|
|
158
|
+
}
|
|
159
|
+
} else if (self.config.printType === '国税发票') {
|
|
160
|
+
// TODO
|
|
161
|
+
} else if (self.config.printType === '电子发票') {
|
|
162
|
+
// TODO
|
|
163
|
+
}
|
|
164
|
+
} else {
|
|
165
|
+
self.$dispatch('success')
|
|
166
|
+
}
|
|
167
|
+
} catch (error) {
|
|
168
|
+
if (error.status === 301) {
|
|
169
|
+
self.$dispatch('refresh')
|
|
170
|
+
} else {
|
|
171
|
+
if (error) {
|
|
172
|
+
self.$showAlert(error, 'danger', 0)
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
self.$dispatch('refresh')
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
let asyncCardMeterCenter = async function (self) {
|
|
180
|
+
await self.$getConfig(self, 'JbCompensation')
|
|
181
|
+
console.log('卡表收费config', self.config)
|
|
182
|
+
self.blodid = self.row.f_userinfo_id
|
|
183
|
+
// 默认打印格式
|
|
184
|
+
self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
|
|
185
|
+
self.model.f_payment = [self.config.payment]
|
|
186
|
+
self.mulPrint = self.config.printType instanceof Array
|
|
187
|
+
let http = new HttpResetClass()
|
|
188
|
+
let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
|
|
189
|
+
{
|
|
190
|
+
data: {
|
|
191
|
+
items: 'sum(f_real_amount) f_real_amount,sum(f_surplus_fee) f_surplus_fee',
|
|
192
|
+
tablename: 't_surplus_detail',
|
|
193
|
+
condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill}') and f_state='有效' and f_whether_pay = '否' `,
|
|
194
|
+
orderitem: 'f_surplus_fee'
|
|
195
|
+
}
|
|
196
|
+
},
|
|
197
|
+
{resolveMsg: null, rejectMsg: null})
|
|
198
|
+
if (getSurplus.data.length > 0) {
|
|
199
|
+
self.model.f_preamount = getSurplus.data[0].f_surplus_fee
|
|
200
|
+
self.model.f_collection = getSurplus.data[0].f_surplus_fee
|
|
201
|
+
self.model.f_surplus_fee = getSurplus.data[0].f_surplus_fee
|
|
202
|
+
self.model.f_real_amount = getSurplus.data[0].f_real_amount
|
|
203
|
+
// self.model.f_change_price=getSurplus.data[0].f_change_price
|
|
204
|
+
}
|
|
205
|
+
//self.model.f_price = getPrice.data[0].f_price
|
|
206
|
+
// 获取当前票号用
|
|
207
|
+
self.model.f_use_type = self.config.billType
|
|
208
|
+
self.model.f_bill_type = self.model.f_print
|
|
209
|
+
self.hasValidateBill = self.config.hasBillManage
|
|
210
|
+
}
|
|
211
|
+
export default {
|
|
212
|
+
title: '机表团体调价补差收费',
|
|
213
|
+
data () {
|
|
214
|
+
return {
|
|
215
|
+
config: {
|
|
216
|
+
notShowFormula: false, // 不显示计算公式,默认显示
|
|
217
|
+
// 控制附件显示
|
|
218
|
+
showupload: false,
|
|
219
|
+
hasPrint: false, // 默认打票
|
|
220
|
+
hasBillManage: false, // 默认不启用发票管理
|
|
221
|
+
billType: '燃气费', // 票据类型(燃气费,其他费用,调用的发票代码不同)
|
|
222
|
+
printType: '普通收据', // 收据/电子票/专用发票/国税发票
|
|
223
|
+
payment: '现金缴费'
|
|
224
|
+
},
|
|
225
|
+
model: {
|
|
226
|
+
f_compensation_type: '调价补费',
|
|
227
|
+
f_print: '',
|
|
228
|
+
f_balance: '',
|
|
229
|
+
f_preamount: '',
|
|
230
|
+
f_payment: '',
|
|
231
|
+
f_collection: '',
|
|
232
|
+
f_surplus_fee: '',
|
|
233
|
+
f_real_amount: ''
|
|
234
|
+
// f_change_price:''
|
|
235
|
+
},
|
|
236
|
+
blodid: '',
|
|
237
|
+
// 启用发票管理需要对票号进行验证
|
|
238
|
+
hasValidateBill: false,
|
|
239
|
+
validateOk: false,
|
|
240
|
+
print: false,
|
|
241
|
+
billData: {
|
|
242
|
+
url: 'rs/report/compensation_bill',
|
|
243
|
+
billnumber: ''
|
|
244
|
+
},
|
|
245
|
+
paymentModel: [],
|
|
246
|
+
mulPrint: false,
|
|
247
|
+
clickConfirm: false, // 控制确认按钮只能点击一次
|
|
248
|
+
// 下拉框值
|
|
249
|
+
paytype: this.$appdata.getParam('付款方式'),
|
|
250
|
+
printstyle: this.$appdata.getParam('打印格式'),
|
|
251
|
+
compensationTypes: [{label: '调价补费', value: '调价补费'}]
|
|
252
|
+
}
|
|
253
|
+
},
|
|
254
|
+
props: ['row', 'civill'],
|
|
255
|
+
ready () {
|
|
256
|
+
if (this.row) {
|
|
257
|
+
this.model.f_balance = this.row.f_balance
|
|
258
|
+
asyncCardMeterCenter(this)
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
},
|
|
262
|
+
watch: {
|
|
263
|
+
'row' (val) {
|
|
264
|
+
if (val) {
|
|
265
|
+
this.model.f_balance = this.row.f_balance
|
|
266
|
+
asyncCardMeterCenter(this)
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
},
|
|
270
|
+
'model.f_payment.length' (val) {
|
|
271
|
+
console.log('付款方式多选。。', val)
|
|
272
|
+
if (val > 1 && !this.model.f_preamount) {
|
|
273
|
+
this.model.f_payment = ['现金缴费']
|
|
274
|
+
this.$showAlert('请先计算付款金额', 'warning', 2000)
|
|
275
|
+
} else {
|
|
276
|
+
this.paymentModel = []
|
|
277
|
+
|
|
278
|
+
this.model.f_payment.forEach((res) => {
|
|
279
|
+
let temp = {
|
|
280
|
+
f_payment: res,
|
|
281
|
+
f_money: 0
|
|
282
|
+
}
|
|
283
|
+
this.paymentModel.push(temp)
|
|
284
|
+
})
|
|
285
|
+
this.$resetValidation()
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
},
|
|
289
|
+
methods: {
|
|
290
|
+
async confirm () {
|
|
291
|
+
this.clickConfirm = true
|
|
292
|
+
this.$dispatch('no-button')
|
|
293
|
+
this.model.f_userinfo_id = this.row.f_userinfo_id
|
|
294
|
+
this.model.f_userfiles_id = this.row.f_userfiles_id
|
|
295
|
+
this.model.version = this.row.version
|
|
296
|
+
this.model.f_surplus_id = this.row.f_surplus_id
|
|
297
|
+
this.model.f_user_id = this.row.f_user_id
|
|
298
|
+
this.model.f_total_fee = ((this.row.f_total_fee - 0) + (this.model.f_collection - 0)).toFixed(2)
|
|
299
|
+
this.model.f_total_usegas_amount = ((this.row.f_total_usegas_amount - 0) + (this.model.f_collection - 0)).toFixed(2)
|
|
300
|
+
this.model.f_total_gas = (this.row.f_total_gas - 0)
|
|
301
|
+
this.model.f_balance = this.row.f_balance - 0
|
|
302
|
+
this.model.f_curbalance = this.row.f_balance - 0
|
|
303
|
+
this.model.f_user_name = this.row.f_user_name
|
|
304
|
+
this.model.f_user_type = this.row.f_user_type
|
|
305
|
+
this.model.f_meter_type = this.row.f_meter_type
|
|
306
|
+
this.model.f_price_id = this.row.f_price_id
|
|
307
|
+
this.model.f_meter_brand = this.row.f_meter_brand
|
|
308
|
+
this.model.f_meter_style = this.row.f_meter_style
|
|
309
|
+
this.model.f_stairprice_id = this.row.f_stairprice_id
|
|
310
|
+
this.model.f_gasproperties = this.row.f_gasproperties
|
|
311
|
+
this.model.f_address = this.row.f_address
|
|
312
|
+
this.model.f_collection2 = (this.model.f_collection - 0) - (this.model.f_preamount - 0)
|
|
313
|
+
this.model.f_curbalance2 = this.curbalance
|
|
314
|
+
this.model.f_collection = (this.model.f_compensation_type == '调价补费' ? this.model.f_preamount : (0 - this.model.f_preamount))
|
|
315
|
+
this.model.f_times = this.row.f_times
|
|
316
|
+
this.model.f_type = this.model.f_compensation_type
|
|
317
|
+
this.model.f_state = '有效'
|
|
318
|
+
this.model.f_operat_type = this.model.f_compensation_type
|
|
319
|
+
this.model.f_describe = `${this.$login.f.name}对${this.row.f_user_name}进行${this.model.f_compensation_type}操作`
|
|
320
|
+
this.model.f_operator = this.$login.f.name
|
|
321
|
+
this.model.f_operatorid = this.$login.f.id
|
|
322
|
+
this.model.f_orgid = this.row.f_orgid
|
|
323
|
+
this.model.f_orgname = this.row.f_orgname
|
|
324
|
+
this.model.f_depid = this.$login.f.depids
|
|
325
|
+
this.model.f_depname = this.$login.f.deps
|
|
326
|
+
// 先调用付款码支付组件流程
|
|
327
|
+
let ss = await this.$refs.paymentcode.flowPath()
|
|
328
|
+
this.$refs.paymentcode.paymentCodeShow = false
|
|
329
|
+
console.log('付款码操作返回', ss)
|
|
330
|
+
if (!ss.result) return
|
|
331
|
+
compensationChargeGen(this)
|
|
332
|
+
},
|
|
333
|
+
clean () {
|
|
334
|
+
this.$info('取消操作')
|
|
335
|
+
this.$dispatch('refresh', this.row)
|
|
336
|
+
},
|
|
337
|
+
validateBill (val) {
|
|
338
|
+
this.validateOk = !val.isOk
|
|
339
|
+
this.billData.bill = val.bill
|
|
340
|
+
},
|
|
341
|
+
printok () {
|
|
342
|
+
// 收据打完,判断是否还有其他票据进行请求
|
|
343
|
+
for (let i = 0; i < this.model.f_print.length; i++) {
|
|
344
|
+
if (this.model.f_print[i] === '电子发票') {
|
|
345
|
+
this.$CommonService.openEticket(this.row.id, '售气收费')
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
this.$dispatch('success')
|
|
349
|
+
},
|
|
350
|
+
close () {
|
|
351
|
+
this.print = false
|
|
352
|
+
this.clean()
|
|
353
|
+
}
|
|
354
|
+
},
|
|
355
|
+
computed: {
|
|
356
|
+
'curbalance' () {
|
|
357
|
+
if (this.model.f_collection) {
|
|
358
|
+
return ((this.row.f_balance - 0) + ((this.model.f_collection - 0) - (this.model.f_preamount - 0))).toFixed(2)
|
|
359
|
+
} else {
|
|
360
|
+
return this.row.f_balance
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
</script>
|
|
366
|
+
|
|
367
|
+
<style>
|
|
368
|
+
</style>
|