sale-client 3.6.212 → 3.6.214
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 +1 -2
- package/package.json +1 -1
- package/src/components/revenue/HandManager/CardHand.vue +20 -2
- package/src/components/revenue/cardHandManage/cardsHand.vue +21 -2
- package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenCard.vue +33 -12
- package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenPage.vue +31 -10
- package/src/filiale/qianneng/ChangeMeter.vue +5 -1
- package/src/filiale/tongchuan/CardMeterCenter.vue +5 -4
- package/src/filiale/tongchuan/EticketOpenJBPage.vue +23 -15
- package/src/filiale/tongchuan/IOTMeterCenter.vue +14 -12
- package/src/filiale/tongchuan/bill/CustQueryEticket.vue +41 -13
- package/src/filiale/tongchuan/bill/EticketModal.vue +9 -4
- package/src/filiale/tongchuan/bill/EticketPrint.vue +15 -5
- package/src/filiale/tongchuan/bill/EticketRecordList.vue +7 -3
- package/src/filiale/yuncheng/machineHandAudit.vue +3 -1
package/build/dev-server.js
CHANGED
package/package.json
CHANGED
|
@@ -334,7 +334,21 @@
|
|
|
334
334
|
|
|
335
335
|
|
|
336
336
|
<td style="text-align: center;">{{row.f_actualtablebase}}</td>
|
|
337
|
-
<td style="text-align: center;">
|
|
337
|
+
<td style="text-align: center;">
|
|
338
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
339
|
+
v-if="row.f_meter_state === '未抄表' && $parent.$parent.$parent.shengyu == 'false'">
|
|
340
|
+
<input type="text" class="form-control" v-model="row.f_shengyu_gas"
|
|
341
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
342
|
+
:disabled="row.state === '开始'"
|
|
343
|
+
>
|
|
344
|
+
</div>
|
|
345
|
+
<div v-if="row.f_meter_state !== '未抄表' && $parent.$parent.$parent.shengyu == 'false'">
|
|
346
|
+
<span >{{row.f_shengyu_gas}}</span>
|
|
347
|
+
</div>
|
|
348
|
+
<div v-if="row.f_meter_state !== '未抄表' && $parent.$parent.$parent.shengyu == 'true'">
|
|
349
|
+
<span >{{row.f_total_gas-(row.f_tablebase-row.f_initial_base)}}</span>
|
|
350
|
+
</div>
|
|
351
|
+
</td>
|
|
338
352
|
<td style="text-align: center;">{{row.f_meter_state}}</td>
|
|
339
353
|
<td style="text-align: center;">
|
|
340
354
|
|
|
@@ -465,6 +479,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
465
479
|
dep: [],
|
|
466
480
|
user: []
|
|
467
481
|
},
|
|
482
|
+
shengyu: this.$appdata.getSingleValue('在线抄表计算剩余气量') ? this.$appdata.getSingleValue('在线抄表计算剩余气量') : 'true',
|
|
468
483
|
orgCondtionStr: ''
|
|
469
484
|
}
|
|
470
485
|
},
|
|
@@ -614,7 +629,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
614
629
|
console.log('================================判断前:', row.f_hand_date)
|
|
615
630
|
row.f_user_id = row.f_user_id + ''
|
|
616
631
|
// 余气量=累购-(本期指数-表初始指数)
|
|
617
|
-
|
|
632
|
+
if (this.shengyu == 'true') {
|
|
633
|
+
console.log('走的这里。。。。。。')
|
|
634
|
+
row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
|
|
635
|
+
}
|
|
618
636
|
console.log('录入完毕。。', row)
|
|
619
637
|
this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
|
|
620
638
|
console.log('返回数据', res)
|
|
@@ -263,6 +263,9 @@
|
|
|
263
263
|
<th>
|
|
264
264
|
<nobr>附件查看</nobr>
|
|
265
265
|
</th>
|
|
266
|
+
<th>
|
|
267
|
+
<nobr>签章图片</nobr>
|
|
268
|
+
</th>
|
|
266
269
|
<th>
|
|
267
270
|
<nobr>实际用量</nobr>
|
|
268
271
|
</th>
|
|
@@ -351,9 +354,24 @@
|
|
|
351
354
|
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
352
355
|
<img-self :src="`rs/image/file/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
|
|
353
356
|
</td>
|
|
357
|
+
<td style="text-align:center">
|
|
358
|
+
<img-self :src="row.f_sign_path" v-if="row.f_sign_path.indexOf('http:') > -1" :width="100" :height="100"></img-self>
|
|
359
|
+
<img-self :src="`rs/image/file/${row.f_sign_path}`" v-else :width="100" :height="100"></img-self>
|
|
360
|
+
</td>
|
|
354
361
|
|
|
355
362
|
<td style="text-align: center;">{{ row.f_actualtablebase }}</td>
|
|
356
|
-
<td style="text-align: center;">
|
|
363
|
+
<td style="text-align: center;">
|
|
364
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
365
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
366
|
+
<input type="text" class="form-control" v-model="row.f_shengyu_gas"
|
|
367
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
368
|
+
:disabled="row.state === '开始'"
|
|
369
|
+
>
|
|
370
|
+
</div>
|
|
371
|
+
<div v-else>
|
|
372
|
+
<span >{{ row.f_shengyu_gas }}</span>
|
|
373
|
+
</div>
|
|
374
|
+
</td>
|
|
357
375
|
<td style="text-align: center;">{{ row.f_meter_state }}</td>
|
|
358
376
|
<td style="text-align: center;">
|
|
359
377
|
|
|
@@ -483,6 +501,8 @@ export default {
|
|
|
483
501
|
'f_last_tablebase': '上期底数',
|
|
484
502
|
'f_tablebase': '本期底数',
|
|
485
503
|
'f_actualtablebase': '实际用量',
|
|
504
|
+
'f_img_path': '附件查看',
|
|
505
|
+
'f_sign_img': '签章图片',
|
|
486
506
|
'f_meter_state': '状态'
|
|
487
507
|
},
|
|
488
508
|
meterbrands: [{label: '全部', value: ''}],
|
|
@@ -642,7 +662,6 @@ export default {
|
|
|
642
662
|
row.f_total_gas = row.total_gas
|
|
643
663
|
row.f_total_fee = row.total_fee
|
|
644
664
|
// 余气量=累购-(本期指数-表初始指数)
|
|
645
|
-
row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(3)
|
|
646
665
|
console.log('录入完毕。。', row)
|
|
647
666
|
this.$resetpost('rs/logic/cardCommonEnter', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
|
|
648
667
|
console.log('返回数据', res)
|
|
@@ -121,6 +121,18 @@
|
|
|
121
121
|
:options='is_pax' clear-button>
|
|
122
122
|
</v-select>
|
|
123
123
|
</div>
|
|
124
|
+
<div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
|
|
125
|
+
<nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
|
|
126
|
+
<v-select v-model="invoice_type"
|
|
127
|
+
placeholder='请选择'
|
|
128
|
+
:value.sync="invoice_type"
|
|
129
|
+
close-on-select
|
|
130
|
+
:width="60"
|
|
131
|
+
:value-single="true"
|
|
132
|
+
:search="false"
|
|
133
|
+
:options='invoice_types' clear-button>
|
|
134
|
+
</v-select>
|
|
135
|
+
</div>
|
|
124
136
|
<div class="col-sm-12 form-group form-input-group">
|
|
125
137
|
<label class="control-label">开户行及账号:</label>
|
|
126
138
|
<input class="form-control col-sm-2"
|
|
@@ -129,12 +141,17 @@
|
|
|
129
141
|
<div class="col-sm-12 form-group form-input-group" >
|
|
130
142
|
<label class="control-label">纳税人识别号:</label>
|
|
131
143
|
<input class="form-control col-sm-2"
|
|
132
|
-
|
|
144
|
+
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
145
|
+
</div>
|
|
146
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
147
|
+
<label class="control-label">开票地址:</label>
|
|
148
|
+
<input class="form-control col-sm-2"
|
|
149
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
133
150
|
</div>
|
|
134
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.
|
|
135
|
-
<label class="control-label"
|
|
151
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
152
|
+
<label class="control-label">开票电话:</label>
|
|
136
153
|
<input class="form-control col-sm-2"
|
|
137
|
-
v-model="row.
|
|
154
|
+
v-model="row.f_buy_phone" placeholder="开票电话">
|
|
138
155
|
</div>
|
|
139
156
|
<div class="col-sm-12 form-group form-input-group">
|
|
140
157
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -146,7 +163,7 @@
|
|
|
146
163
|
</article>
|
|
147
164
|
<footer slot="modal-footer" class="modal-footer">
|
|
148
165
|
<button type="button" class="btn button_search"
|
|
149
|
-
:disabled="!(row.f_paper_name&&row.
|
|
166
|
+
:disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address &&invoice_type)"
|
|
150
167
|
@click='confirm'>确认收费
|
|
151
168
|
</button>
|
|
152
169
|
</footer>
|
|
@@ -174,6 +191,8 @@ export default {
|
|
|
174
191
|
f_orgid: '',
|
|
175
192
|
other: [],
|
|
176
193
|
footer: [],
|
|
194
|
+
invoice_types: this.$appdata.getParam('发票种类'),
|
|
195
|
+
invoice_type: '',
|
|
177
196
|
invoice_is_pax: '征税',
|
|
178
197
|
is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
|
|
179
198
|
initres: {
|
|
@@ -196,7 +215,10 @@ export default {
|
|
|
196
215
|
eticket_msg: false,
|
|
197
216
|
invoice_show_gas: '否',
|
|
198
217
|
show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
199
|
-
row: {
|
|
218
|
+
row: {
|
|
219
|
+
f_buy_address: '',
|
|
220
|
+
f_buy_phone: ''
|
|
221
|
+
},
|
|
200
222
|
mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
|
|
201
223
|
}
|
|
202
224
|
},
|
|
@@ -228,7 +250,7 @@ export default {
|
|
|
228
250
|
condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
|
|
229
251
|
}
|
|
230
252
|
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
231
|
-
this.row = row.data[0]
|
|
253
|
+
this.row = Object.assign(row.data[0], this.row)
|
|
232
254
|
this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
|
|
233
255
|
if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
|
|
234
256
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
@@ -236,10 +258,9 @@ export default {
|
|
|
236
258
|
if (!this.row.f_paper_name) {
|
|
237
259
|
this.row.f_paper_name = this.row.f_user_name
|
|
238
260
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
if(!this.row.f_email){
|
|
261
|
+
this.row.f_buy_address = this.row.f_address
|
|
262
|
+
this.row.f_buy_phone = this.row.f_user_phone
|
|
263
|
+
if (!this.row.f_email) {
|
|
243
264
|
this.row.f_email = this.row.f_email
|
|
244
265
|
}
|
|
245
266
|
this.eticket_msg = true
|
|
@@ -247,7 +268,7 @@ export default {
|
|
|
247
268
|
confirm () {
|
|
248
269
|
this.eticket_msg = false
|
|
249
270
|
this.eticket_show = true
|
|
250
|
-
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是',this.invoice_is_pax, '结算收费')
|
|
271
|
+
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是',this.invoice_is_pax, '结算收费', this.invoice_type)
|
|
251
272
|
},
|
|
252
273
|
selfSearch (args) {
|
|
253
274
|
this.selecteds = []
|
|
@@ -121,6 +121,18 @@
|
|
|
121
121
|
:options='is_pax' clear-button>
|
|
122
122
|
</v-select>
|
|
123
123
|
</div>
|
|
124
|
+
<div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
|
|
125
|
+
<nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
|
|
126
|
+
<v-select v-model="invoice_type"
|
|
127
|
+
placeholder='请选择'
|
|
128
|
+
:value.sync="invoice_type"
|
|
129
|
+
close-on-select
|
|
130
|
+
:width="60"
|
|
131
|
+
:value-single="true"
|
|
132
|
+
:search="false"
|
|
133
|
+
:options='invoice_types' clear-button>
|
|
134
|
+
</v-select>
|
|
135
|
+
</div>
|
|
124
136
|
<div class="col-sm-12 form-group form-input-group">
|
|
125
137
|
<label class="control-label">开户行及账号:</label>
|
|
126
138
|
<input class="form-control col-sm-2"
|
|
@@ -131,10 +143,15 @@
|
|
|
131
143
|
<input class="form-control col-sm-2"
|
|
132
144
|
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
133
145
|
</div>
|
|
134
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.
|
|
135
|
-
<label class="control-label"
|
|
146
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
147
|
+
<label class="control-label">开票地址:</label>
|
|
148
|
+
<input class="form-control col-sm-2"
|
|
149
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
150
|
+
</div>
|
|
151
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
152
|
+
<label class="control-label">开票电话:</label>
|
|
136
153
|
<input class="form-control col-sm-2"
|
|
137
|
-
v-model="row.
|
|
154
|
+
v-model="row.f_buy_phone" placeholder="开票地址">
|
|
138
155
|
</div>
|
|
139
156
|
<div class="col-sm-12 form-group form-input-group">
|
|
140
157
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -146,7 +163,7 @@
|
|
|
146
163
|
</article>
|
|
147
164
|
<footer slot="modal-footer" class="modal-footer">
|
|
148
165
|
<button type="button" class="btn button_search"
|
|
149
|
-
:disabled="!(row.f_paper_name&&row.
|
|
166
|
+
:disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address&&invoice_type)"
|
|
150
167
|
@click='confirm'>确认收费
|
|
151
168
|
</button>
|
|
152
169
|
</footer>
|
|
@@ -173,6 +190,8 @@ export default {
|
|
|
173
190
|
f_orgid: '',
|
|
174
191
|
other: [],
|
|
175
192
|
footer: [],
|
|
193
|
+
invoice_types: this.$appdata.getParam('发票种类'),
|
|
194
|
+
invoice_type: '',
|
|
176
195
|
invoice_is_pax: '征税',
|
|
177
196
|
is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
|
|
178
197
|
config: {
|
|
@@ -195,7 +214,10 @@ export default {
|
|
|
195
214
|
eticket_msg: false,
|
|
196
215
|
invoice_show_gas: '否',
|
|
197
216
|
show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
198
|
-
row: {
|
|
217
|
+
row: {
|
|
218
|
+
f_buy_address: '',
|
|
219
|
+
f_buy_phone: ''
|
|
220
|
+
},
|
|
199
221
|
mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
|
|
200
222
|
}
|
|
201
223
|
},
|
|
@@ -227,7 +249,7 @@ export default {
|
|
|
227
249
|
condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
|
|
228
250
|
}
|
|
229
251
|
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
230
|
-
this.row = row.data[0]
|
|
252
|
+
this.row = Object.assign(row.data[0], this.row)
|
|
231
253
|
this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
|
|
232
254
|
if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
|
|
233
255
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
@@ -235,9 +257,8 @@ export default {
|
|
|
235
257
|
if (!this.row.f_paper_name) {
|
|
236
258
|
this.row.f_paper_name = this.row.f_user_name
|
|
237
259
|
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
}
|
|
260
|
+
this.row.f_buy_address = this.row.f_address
|
|
261
|
+
this.row.f_buy_phone = this.row.f_user_phone
|
|
241
262
|
if (!this.row.f_email) {
|
|
242
263
|
this.row.f_email = this.row.f_email
|
|
243
264
|
}
|
|
@@ -246,7 +267,7 @@ export default {
|
|
|
246
267
|
confirm () {
|
|
247
268
|
this.eticket_msg = false
|
|
248
269
|
this.eticket_show = true
|
|
249
|
-
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, '结算收费')
|
|
270
|
+
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, '结算收费', this.invoice_type)
|
|
250
271
|
},
|
|
251
272
|
selfSearch (args) {
|
|
252
273
|
this.selecteds = []
|
|
@@ -240,10 +240,11 @@
|
|
|
240
240
|
</div>
|
|
241
241
|
<div class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
|
|
242
242
|
<label class="font_normal_body">新表表向</label>
|
|
243
|
+
<input type="text" v-show="false" v-model="$refs.f_newaroundmeter.selectedItems" v-validate:f_newaroundmeter='{required: true }'>
|
|
243
244
|
<v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
|
|
244
245
|
:value-single="true"
|
|
245
246
|
close-on-select
|
|
246
|
-
v-model='model.f_newaroundmeter'></v-select>
|
|
247
|
+
v-model='model.f_newaroundmeter' v-ref:f_newaroundmeter></v-select>
|
|
247
248
|
</div>
|
|
248
249
|
</div>
|
|
249
250
|
<div class="row auto" >
|
|
@@ -439,6 +440,9 @@ export default {
|
|
|
439
440
|
}
|
|
440
441
|
},
|
|
441
442
|
computed: {
|
|
443
|
+
aroundmeters () {
|
|
444
|
+
return this.$appdata.getParam('左右表')
|
|
445
|
+
},
|
|
442
446
|
flowmeterbrands () {
|
|
443
447
|
let gasbrand = this.$GetSaleParam.getGasbrand()
|
|
444
448
|
let flowmeterbrands = []
|
|
@@ -358,7 +358,7 @@ let sellgasGen = async function (self) {
|
|
|
358
358
|
console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
|
|
359
359
|
// 开始打票
|
|
360
360
|
if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
|
|
361
|
-
if (self.model.f_print
|
|
361
|
+
if (self.printInvoiceType.indexOf(self.model.f_print[0]) == -1) {
|
|
362
362
|
if (self.$login.r.includes('非民用纸质票据拆分')) {
|
|
363
363
|
if (self.row.f_user_type === '非民用') {
|
|
364
364
|
self.billData.url = 'rs/report/fmy_card_bill'
|
|
@@ -671,9 +671,10 @@ export default {
|
|
|
671
671
|
if (!this.row.f_paper_name) {
|
|
672
672
|
this.row.f_paper_name = this.row.f_user_name
|
|
673
673
|
}
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
674
|
+
this.row = Object.assign({}, this.row, {
|
|
675
|
+
f_buy_phone: this.row.f_user_phone,
|
|
676
|
+
f_buy_address: this.row.f_address
|
|
677
|
+
})
|
|
677
678
|
if (!this.row.f_email) {
|
|
678
679
|
this.row.f_email = this.row.f_email
|
|
679
680
|
}
|
|
@@ -132,16 +132,16 @@
|
|
|
132
132
|
<input class="form-control col-sm-2"
|
|
133
133
|
v-model="row.f_paper_name" placeholder="开票名称">
|
|
134
134
|
</div>
|
|
135
|
-
<div class="col-sm-6 form-group form-input-group">
|
|
136
|
-
<nobr class="col-sm-4"><label class="control-label"
|
|
137
|
-
<v-select v-model="
|
|
135
|
+
<div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
|
|
136
|
+
<nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
|
|
137
|
+
<v-select v-model="invoice_type"
|
|
138
138
|
placeholder='请选择'
|
|
139
|
-
:value.sync="
|
|
139
|
+
:value.sync="invoice_type"
|
|
140
140
|
close-on-select
|
|
141
141
|
:width="60"
|
|
142
142
|
:value-single="true"
|
|
143
143
|
:search="false"
|
|
144
|
-
:options='
|
|
144
|
+
:options='invoice_types' clear-button>
|
|
145
145
|
</v-select>
|
|
146
146
|
</div>
|
|
147
147
|
<div class="col-sm-12 form-group form-input-group">
|
|
@@ -154,10 +154,15 @@
|
|
|
154
154
|
<input class="form-control col-sm-2"
|
|
155
155
|
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
156
156
|
</div>
|
|
157
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.
|
|
158
|
-
<label class="control-label"
|
|
157
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
158
|
+
<label class="control-label">开票地址:</label>
|
|
159
159
|
<input class="form-control col-sm-2"
|
|
160
|
-
v-model="row.
|
|
160
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
161
|
+
</div>
|
|
162
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
163
|
+
<label class="control-label">开票电话:</label>
|
|
164
|
+
<input class="form-control col-sm-2"
|
|
165
|
+
v-model="row.f_buy_phone" placeholder="开票地址">
|
|
161
166
|
</div>
|
|
162
167
|
<div class="col-sm-12 form-group form-input-group">
|
|
163
168
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -169,7 +174,7 @@
|
|
|
169
174
|
</article>
|
|
170
175
|
<footer slot="modal-footer" class="modal-footer">
|
|
171
176
|
<button type="button" class="btn button_search"
|
|
172
|
-
:disabled="!(row.f_paper_name&&row.
|
|
177
|
+
:disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address&&invoice_type)"
|
|
173
178
|
@click='confirm'>确认收费
|
|
174
179
|
</button>
|
|
175
180
|
</footer>
|
|
@@ -220,7 +225,8 @@ export default {
|
|
|
220
225
|
f_orgid: '',
|
|
221
226
|
other: [],
|
|
222
227
|
footer: [],
|
|
223
|
-
|
|
228
|
+
invoice_types: this.$appdata.getParam('发票种类'),
|
|
229
|
+
invoice_type: '',
|
|
224
230
|
is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
|
|
225
231
|
initres: {
|
|
226
232
|
org: [this.$login.f.orgid],
|
|
@@ -240,7 +246,10 @@ export default {
|
|
|
240
246
|
eticket_msg: false,
|
|
241
247
|
invoice_show_gas: '否',
|
|
242
248
|
show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
243
|
-
row: {
|
|
249
|
+
row: {
|
|
250
|
+
f_buy_address: '',
|
|
251
|
+
f_buy_phone: ''
|
|
252
|
+
},
|
|
244
253
|
mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
|
|
245
254
|
reissue_data: null,
|
|
246
255
|
reissue_show: false
|
|
@@ -290,7 +299,7 @@ export default {
|
|
|
290
299
|
condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
|
|
291
300
|
}
|
|
292
301
|
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
293
|
-
this.row = row.data[0]
|
|
302
|
+
this.row = Object.assign(row.data[0], this.row)
|
|
294
303
|
this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
|
|
295
304
|
if (!this.row.f_taxpayer_id) {
|
|
296
305
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
@@ -298,9 +307,8 @@ export default {
|
|
|
298
307
|
if (!this.row.f_paper_name) {
|
|
299
308
|
this.row.f_paper_name = this.row.f_user_name
|
|
300
309
|
}
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
}
|
|
310
|
+
this.row.f_buy_address = this.row.f_address
|
|
311
|
+
this.row.f_buy_phone = this.row.f_user_phone
|
|
304
312
|
this.eticket_msg = true
|
|
305
313
|
},
|
|
306
314
|
async open_report () {
|
|
@@ -225,10 +225,15 @@
|
|
|
225
225
|
<input class="form-control col-sm-2"
|
|
226
226
|
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
227
227
|
</div>
|
|
228
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.
|
|
229
|
-
<label class="control-label"
|
|
228
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
229
|
+
<label class="control-label">开票地址:</label>
|
|
230
230
|
<input class="form-control col-sm-2"
|
|
231
|
-
v-model="row.
|
|
231
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
232
|
+
</div>
|
|
233
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
234
|
+
<label class="control-label">开票电话:</label>
|
|
235
|
+
<input class="form-control col-sm-2"
|
|
236
|
+
v-model="row.f_buy_phone" placeholder="开票地址">
|
|
232
237
|
</div>
|
|
233
238
|
<div class="col-sm-12 form-group form-input-group">
|
|
234
239
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -240,7 +245,7 @@
|
|
|
240
245
|
</article>
|
|
241
246
|
<footer slot="modal-footer" class="modal-footer">
|
|
242
247
|
<button type="button" class="btn button_search"
|
|
243
|
-
:disabled="!(row.f_paper_name&&row.
|
|
248
|
+
:disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address)"
|
|
244
249
|
@click='confirm'>确认收费
|
|
245
250
|
</button>
|
|
246
251
|
</footer>
|
|
@@ -372,7 +377,7 @@
|
|
|
372
377
|
// 开始打票
|
|
373
378
|
console.log('开始打票', self.config)
|
|
374
379
|
if (true) {
|
|
375
|
-
if (self.model.f_print
|
|
380
|
+
if (self.printInvoiceType.indexOf(self.model.f_print[0]) == -1) {
|
|
376
381
|
console.log('self.config.hasBillManage', self.config.hasBillManage)
|
|
377
382
|
if (self.config.hasBillManage) {
|
|
378
383
|
// 启用发票管理，获取票据管理中的票号并存储记录
|
|
@@ -626,7 +631,6 @@
|
|
|
626
631
|
}
|
|
627
632
|
this.model.f_sys_balance = curSysBalance
|
|
628
633
|
}
|
|
629
|
-
|
|
630
634
|
if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
|
|
631
635
|
if (!this.row.f_taxpayer_id) {
|
|
632
636
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
@@ -634,12 +638,10 @@
|
|
|
634
638
|
if (!this.row.f_paper_name) {
|
|
635
639
|
this.row.f_paper_name = this.row.f_user_name
|
|
636
640
|
}
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
this.row.f_email = this.row.f_email
|
|
642
|
-
}
|
|
641
|
+
this.row = Object.assign({}, this.row, {
|
|
642
|
+
f_buy_phone: this.row.f_user_phone,
|
|
643
|
+
f_buy_address: this.row.f_address
|
|
644
|
+
})
|
|
643
645
|
this.eticket_msg = true
|
|
644
646
|
} else {
|
|
645
647
|
this.confirm()
|
|
@@ -170,6 +170,18 @@
|
|
|
170
170
|
:options='is_pax' clear-button>
|
|
171
171
|
</v-select>
|
|
172
172
|
</div>
|
|
173
|
+
<div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
|
|
174
|
+
<nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
|
|
175
|
+
<v-select v-model="invoice_type"
|
|
176
|
+
placeholder='请选择'
|
|
177
|
+
:value.sync="invoice_type"
|
|
178
|
+
close-on-select
|
|
179
|
+
:width="60"
|
|
180
|
+
:value-single="true"
|
|
181
|
+
:search="false"
|
|
182
|
+
:options='invoice_types' clear-button>
|
|
183
|
+
</v-select>
|
|
184
|
+
</div>
|
|
173
185
|
<div class="col-sm-12 form-group form-input-group">
|
|
174
186
|
<label class="control-label">开户行及账号:</label>
|
|
175
187
|
<input class="form-control col-sm-2" :disabled="diytick"
|
|
@@ -180,10 +192,22 @@
|
|
|
180
192
|
<input class="form-control col-sm-2" :disabled="diytick"
|
|
181
193
|
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
182
194
|
</div>
|
|
183
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']"
|
|
184
|
-
<label class="control-label">开票地址电话:</label
|
|
185
|
-
<input class="form-control col-sm-2" :disabled="diytick"
|
|
186
|
-
v-model="row.f_address_phone" placeholder="开票地址"
|
|
195
|
+
<!-- <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">-->
|
|
196
|
+
<!-- <label class="control-label">开票地址电话:</label>-->
|
|
197
|
+
<!-- <input class="form-control col-sm-2" :disabled="diytick"-->
|
|
198
|
+
<!-- v-model="row.f_address_phone" placeholder="开票地址">-->
|
|
199
|
+
<!-- </div>-->
|
|
200
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
201
|
+
<label class="control-label">开票地址:</label>
|
|
202
|
+
<input class="form-control col-sm-2"
|
|
203
|
+
:disabled="diytick"
|
|
204
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
205
|
+
</div>
|
|
206
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
207
|
+
<label class="control-label">开票电话:</label>
|
|
208
|
+
<input class="form-control col-sm-2"
|
|
209
|
+
:disabled="diytick"
|
|
210
|
+
v-model="row.f_buy_phone" placeholder="开票地址">
|
|
187
211
|
</div>
|
|
188
212
|
<div class="col-sm-12 form-group form-input-group">
|
|
189
213
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -201,7 +225,7 @@
|
|
|
201
225
|
</button>
|
|
202
226
|
<button type="button" class="btn button_search"
|
|
203
227
|
v-if="diytick"
|
|
204
|
-
:disabled="diytick && !(row.f_paper_name&&row.name&&row.money&&row.f_address_phone)"
|
|
228
|
+
:disabled="diytick && !(row.f_paper_name&&row.name&&row.money&&row.f_address_phone&&invoice_type)"
|
|
205
229
|
@click='openCustETicket'>确认收费
|
|
206
230
|
</button>
|
|
207
231
|
</footer>
|
|
@@ -223,6 +247,8 @@
|
|
|
223
247
|
disabled: false,
|
|
224
248
|
diytick: false,
|
|
225
249
|
last_money: 0,
|
|
250
|
+
invoice_types: this.$appdata.getParam('发票种类'),
|
|
251
|
+
invoice_type: '',
|
|
226
252
|
model: new PagedList('rs/sql/openSellelent', 50, {}),
|
|
227
253
|
f_outlets: Vue.$login.f.f_parentname,
|
|
228
254
|
f_filiale: Vue.$login.f.f_fengongsi,
|
|
@@ -237,7 +263,10 @@
|
|
|
237
263
|
invoice_show_gas: '否',
|
|
238
264
|
billNull: [{label: '否', value: '否'}, {label: '是', value: '是'}],
|
|
239
265
|
show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
240
|
-
row: {
|
|
266
|
+
row: {
|
|
267
|
+
f_buy_address: '',
|
|
268
|
+
f_buy_phone: ''
|
|
269
|
+
},
|
|
241
270
|
mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
|
|
242
271
|
custModel: {
|
|
243
272
|
|
|
@@ -267,16 +296,15 @@
|
|
|
267
296
|
condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
|
|
268
297
|
}
|
|
269
298
|
}, {resolveMsg: null, rejectMsg: '获取地址失败!'})
|
|
270
|
-
this.row = row.data[0]
|
|
299
|
+
this.row = Object.assign(row.data[0], this.row)
|
|
271
300
|
this.invoice_show_gas = this.row.f_collection_type = '按气量' ? '是' : '否'
|
|
272
301
|
if (!this.row.f_taxpayer_id) {
|
|
273
302
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
274
303
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
|
|
304
|
+
this.row.f_paper_name = this.row.f_user_name
|
|
305
|
+
this.row.f_buy_address = this.row.f_address
|
|
306
|
+
if (!this.row.f_buy_phone) {
|
|
307
|
+
this.row.f_buy_phone = this.row.f_phone
|
|
280
308
|
}
|
|
281
309
|
if (!this.row.f_email) {
|
|
282
310
|
this.row.f_email = this.row.f_email
|
|
@@ -342,7 +370,7 @@
|
|
|
342
370
|
if (this.selecteds.map(item => item.f_type).toString() == '其他收费' || this.selecteds.map(item => item.f_type).toString() == '卡表收费' || this.selecteds.map(item => item.f_type).toString() == '发卡售气') {
|
|
343
371
|
this.invoice_show_gas = '是'
|
|
344
372
|
}
|
|
345
|
-
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, this.selecteds.map(item => item.f_type).
|
|
373
|
+
this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, this.selecteds.map(item => item.f_type)[0], this.invoice_type)
|
|
346
374
|
},
|
|
347
375
|
eticket_toggle () {
|
|
348
376
|
this.eticket_show = false
|
|
@@ -35,10 +35,15 @@
|
|
|
35
35
|
<input class="form-control col-sm-2"
|
|
36
36
|
v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
|
|
37
37
|
</div>
|
|
38
|
-
<div class="col-sm-12 form-group form-input-group" :class="[!row.
|
|
39
|
-
<label class="control-label"
|
|
38
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
|
|
39
|
+
<label class="control-label">开票地址:</label>
|
|
40
40
|
<input class="form-control col-sm-2"
|
|
41
|
-
v-model="row.
|
|
41
|
+
v-model="row.f_buy_address" placeholder="开票地址">
|
|
42
|
+
</div>
|
|
43
|
+
<div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
|
|
44
|
+
<label class="control-label">开票电话:</label>
|
|
45
|
+
<input class="form-control col-sm-2"
|
|
46
|
+
v-model="row.f_buy_phone" placeholder="开票地址">
|
|
42
47
|
</div>
|
|
43
48
|
<div class="col-sm-12 form-group form-input-group">
|
|
44
49
|
<label class="control-label">邮箱推送:</label>
|
|
@@ -50,7 +55,7 @@
|
|
|
50
55
|
</article>
|
|
51
56
|
<footer slot="modal-footer" class="modal-footer">
|
|
52
57
|
<button type="button" class="btn button_search"
|
|
53
|
-
:disabled="!(row.f_paper_name&&row.
|
|
58
|
+
:disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address)"
|
|
54
59
|
@click='confirm'>确认收费
|
|
55
60
|
</button>
|
|
56
61
|
</footer>
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
</template>
|
|
20
20
|
<script>
|
|
21
21
|
import {HttpResetClass} from 'vue-client'
|
|
22
|
+
import Vue from "vue";
|
|
22
23
|
|
|
23
24
|
export default {
|
|
24
25
|
title: '电子发票',
|
|
@@ -54,13 +55,14 @@ export default {
|
|
|
54
55
|
}
|
|
55
56
|
await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
|
|
56
57
|
},
|
|
57
|
-
async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票') {
|
|
58
|
+
async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票', retry = false) {
|
|
58
59
|
try {
|
|
59
60
|
let model = {
|
|
60
61
|
id: sellId[0],
|
|
61
62
|
charge_item: type,
|
|
62
63
|
invoice_type: 0,
|
|
63
64
|
invoice_kind,
|
|
65
|
+
retry,
|
|
64
66
|
f_dept_id: this.$login.f.depids,
|
|
65
67
|
f_operator: this.$login.f.name,
|
|
66
68
|
f_orgid: this.$login.f.orgid,
|
|
@@ -71,16 +73,25 @@ export default {
|
|
|
71
73
|
f_filialeids: this.$login.f.f_orgids,
|
|
72
74
|
f_buy_name: row.f_paper_name,
|
|
73
75
|
f_pay_id: row.f_taxpayer_id,
|
|
74
|
-
f_buy_address: row.
|
|
76
|
+
f_buy_address: row.f_buy_address,
|
|
77
|
+
f_buy_phone: row.f_buy_phone,
|
|
75
78
|
f_mail_push: row.f_email,
|
|
76
79
|
f_buy_openbank: row.f_paper_account,
|
|
77
80
|
invoice_show_gas: show_gas === '是',
|
|
78
81
|
is_pax: is_pax === '征税',
|
|
79
|
-
isTax: is_pax === '征税' ? 1 : 0
|
|
82
|
+
isTax: is_pax === '征税' ? 1 : 0,
|
|
83
|
+
loginInfo: {
|
|
84
|
+
operator: this.$login.f.name,
|
|
85
|
+
operator_id: this.$login.f.id,
|
|
86
|
+
org_id: this.$login.f.orgid,
|
|
87
|
+
orgname: this.$login.f.orgs,
|
|
88
|
+
dep_id: this.$login.f.depids,
|
|
89
|
+
depname: this.$login.f.deps
|
|
90
|
+
}
|
|
80
91
|
}
|
|
81
92
|
// TODO 组织开票数据并保存
|
|
82
93
|
const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
|
|
83
|
-
if (res.data.code == '0000') {
|
|
94
|
+
if (res.data.code === 200 && res.data.data.code == '0000') {
|
|
84
95
|
this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
|
|
85
96
|
} else {
|
|
86
97
|
this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
|
|
@@ -92,7 +103,6 @@ export default {
|
|
|
92
103
|
async rushRedInvoice (sellId, eticket_id, row, type, invoice_kind = '电子发票') {
|
|
93
104
|
try {
|
|
94
105
|
let model = {
|
|
95
|
-
id: sellId[0],
|
|
96
106
|
eticket_id,
|
|
97
107
|
charge_item: type,
|
|
98
108
|
invoice_type: 1,
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
<th style="text-align:center">{{ row.f_buy_address_phone }}</th>
|
|
121
121
|
<th style="text-align:center">{{ row.f_total_money }}</th>
|
|
122
122
|
<th style="text-align:center">{{ row.f_tax_money }}</th>
|
|
123
|
-
<th style="text-align:center">{{ row.
|
|
123
|
+
<th style="text-align:center">{{ row.f_invoice_category }}</th>
|
|
124
124
|
<th style="text-align:center">{{ row.f_bill_code }}</th>
|
|
125
125
|
<th style="text-align:center">{{ row.f_fpqqlsh }}</th>
|
|
126
126
|
<th style="text-align:center">{{ row.f_bill_number }}</th>
|
|
@@ -128,8 +128,12 @@
|
|
|
128
128
|
<th style="text-align:center">{{ row.f_charge_type }}</th>
|
|
129
129
|
<th style="text-align:center">{{ row.f_operate_date }}</th>
|
|
130
130
|
<th style="text-align:center">
|
|
131
|
-
<button class="btn btn-link" v-if="row.f_local_bill_url || row.f_bill_url"
|
|
132
|
-
@click="$parent.$parent.$parent.watch_ch(row.f_local_bill_url || row.f_bill_url)"
|
|
131
|
+
<!-- <button class="btn btn-link" v-if="row.f_local_bill_url || row.f_bill_url"-->
|
|
132
|
+
<!-- @click="$parent.$parent.$parent.watch_ch(row.f_local_bill_url || row.f_bill_url)">-->
|
|
133
|
+
<!-- 查看发票-->
|
|
134
|
+
<!-- </button>-->
|
|
135
|
+
<button class="btn btn-link" v-if="row.f_bill_url"
|
|
136
|
+
@click="$parent.$parent.$parent.watch_ch( row.f_bill_url)">
|
|
133
137
|
查看发票
|
|
134
138
|
</button>
|
|
135
139
|
</th>
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
<button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
|
|
41
41
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
42
42
|
<export-excel
|
|
43
|
-
:data="{condition: $parent.$parent.excelCondition}"
|
|
43
|
+
:data="{condition: $parent.$parent.excelCondition,orderitem: $parent.$parent.orderDefault}"
|
|
44
44
|
:field="$parent.$parent.fields"
|
|
45
45
|
sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="getAuditMachineHand"
|
|
46
46
|
template-name='抄表审核导出'
|
|
@@ -463,6 +463,7 @@
|
|
|
463
463
|
'f_hand_date': '下发日期',
|
|
464
464
|
'f_input_date': '抄表录入日期',
|
|
465
465
|
'f_book_name': '抄表册',
|
|
466
|
+
'f_meter_book_sort': '表册顺序',
|
|
466
467
|
'f_adjustable_name': '调压箱名称',
|
|
467
468
|
'f_inputtor': '抄表员'
|
|
468
469
|
},
|
|
@@ -650,6 +651,7 @@
|
|
|
650
651
|
this.model.paramSource.orderitem = `'${this.orderDefault}'`
|
|
651
652
|
} else {
|
|
652
653
|
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
654
|
+
this.orderDefault = `${field} ${rule}`
|
|
653
655
|
}
|
|
654
656
|
this.search()
|
|
655
657
|
},
|