sale-client 4.2.116 → 4.2.118
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
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
if (self.config.hasPrint) {
|
|
65
65
|
if (self.model.f_cancel_type === 'newBill') {
|
|
66
66
|
// 显示发票信息,
|
|
67
|
-
self.printModel.id = res.data.
|
|
67
|
+
self.printModel.id = res.data.id
|
|
68
68
|
self.printModel.f_type = res.data.type
|
|
69
69
|
self.printModel.f_use_type = self.model.f_use_type
|
|
70
70
|
self.billData.url = self.getBillUrl(self.data.type)
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
await self.$CommonService.correctPaperBill(res.data.record, res.data.type, null, null, 'abort')
|
|
74
74
|
self.$dispatch('cancel-success')
|
|
75
75
|
} else {
|
|
76
|
-
self.printModel.id = res.data.
|
|
76
|
+
self.printModel.id = res.data.id
|
|
77
77
|
self.printModel.f_type = res.data.type
|
|
78
78
|
self.printModel.f_use_type = self.model.f_use_type
|
|
79
79
|
self.billData.url = self.getBillUrl(self.data.type)
|
|
@@ -636,49 +636,10 @@
|
|
|
636
636
|
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
637
637
|
汇总信息
|
|
638
638
|
</td>
|
|
639
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
640
|
-
<!-- 用气量合计: {{sumsmodel.f_oughtamount}}-->
|
|
641
|
-
<!-- </td>-->
|
|
642
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
643
|
-
<!-- 气费合计: {{sumsmodel.f_oughtfee}}-->
|
|
644
|
-
<!-- </td>-->
|
|
645
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
646
|
-
<!-- 已交金额合计: {{sumsmodel.f_debt_money}}-->
|
|
647
|
-
<!-- </td>-->
|
|
648
639
|
<td
|
|
649
640
|
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
650
641
|
欠费金额合计: {{ sumsmodel.f_actual_arrears }}
|
|
651
642
|
</td>
|
|
652
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
653
|
-
<!-- 一阶气量合计: {{sumsmodel.f_stair1amount}}-->
|
|
654
|
-
<!-- </td>-->
|
|
655
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
656
|
-
<!-- 一阶气费合计: {{sumsmodel.f_stair1fee}}-->
|
|
657
|
-
<!-- </td>-->
|
|
658
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
659
|
-
<!-- 二阶气量合计: {{sumsmodel.f_stair2amount}}-->
|
|
660
|
-
<!-- </td>-->
|
|
661
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
662
|
-
<!-- 二阶气费合计: {{sumsmodel.f_stair2fee}}-->
|
|
663
|
-
<!-- </td>-->
|
|
664
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
665
|
-
<!-- 三阶气量合计: {{sumsmodel.f_stair3amount}}-->
|
|
666
|
-
<!-- </td>-->
|
|
667
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
668
|
-
<!-- 三阶气费合计: {{sumsmodel.f_stair3fee}}-->
|
|
669
|
-
<!-- </td>-->
|
|
670
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
671
|
-
<!-- 剩余气量合计: {{sumsmodel.f_surplus_gas}}-->
|
|
672
|
-
<!-- </td>-->
|
|
673
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
674
|
-
<!-- 扣减气量合计: {{sumsmodel.f_haircut_gas}}-->
|
|
675
|
-
<!-- </td>-->
|
|
676
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
677
|
-
<!-- 应交气量合计: {{sumsmodel.f_oughtamount}}-->
|
|
678
|
-
<!-- </td>-->
|
|
679
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
680
|
-
<!-- 已交气费金额合计: {{sumsmodel.alloughtfee}}-->
|
|
681
|
-
<!-- </td>-->
|
|
682
643
|
</tr>
|
|
683
644
|
</table>
|
|
684
645
|
</div>
|
|
@@ -742,13 +703,8 @@ let readySomething = async function (self) {
|
|
|
742
703
|
|
|
743
704
|
await self.$LoadParams.loadMeterBook(self.f_filialeid)
|
|
744
705
|
self.loadMeterBooks()
|
|
745
|
-
// await self.$LoadParams.loadMeterBook(self.f_filialeid)
|
|
746
|
-
// self.loadMeterBooks()
|
|
747
706
|
self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
748
707
|
self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
749
|
-
// self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
750
|
-
// self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
751
|
-
// await self.$refs.paged.$refs.cri.search()
|
|
752
708
|
await self.$getConfig(self, 'HandplanQuery')
|
|
753
709
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
754
710
|
await self.$LoadParams.loadParam()
|
|
@@ -768,19 +724,7 @@ export default {
|
|
|
768
724
|
footer: [],
|
|
769
725
|
data: {},
|
|
770
726
|
model: new PagedList('api/af-revenue/sql/salehandplanQuery', 20, {}, {
|
|
771
|
-
// f_oughtamount: 0,
|
|
772
|
-
// f_oughtfee: 0,
|
|
773
|
-
// f_debt_money: 0,
|
|
774
727
|
f_actual_arrears: 0
|
|
775
|
-
// f_stair1amount: 0,
|
|
776
|
-
// f_stair1fee: 0,
|
|
777
|
-
// f_stair2amount: 0,
|
|
778
|
-
// f_stair2fee: 0,
|
|
779
|
-
// f_stair3amount: 0,
|
|
780
|
-
// f_stair3fee: 0,
|
|
781
|
-
// f_surplus_gas: 0,
|
|
782
|
-
// f_haircut_gas: 0
|
|
783
|
-
// , alloughtfee:0
|
|
784
728
|
}),
|
|
785
729
|
initres: {
|
|
786
730
|
org: [this.$login.f.orgid],
|
|
@@ -847,8 +791,6 @@ export default {
|
|
|
847
791
|
'f_operator': '操作员',
|
|
848
792
|
'f_depname': '部门',
|
|
849
793
|
'f_orgname': '公司',
|
|
850
|
-
// 'f_surplus_gas': '剩余气量',
|
|
851
|
-
// 'f_haircut_gas': '扣减气量',
|
|
852
794
|
'f_stair1amount': '一阶气量',
|
|
853
795
|
'f_stair1price': '一阶单价',
|
|
854
796
|
'f_stair1fee': '一阶气费',
|
|
@@ -290,6 +290,9 @@
|
|
|
290
290
|
<th >
|
|
291
291
|
<nobr>气价名称</nobr>
|
|
292
292
|
</th>
|
|
293
|
+
<th >
|
|
294
|
+
<nobr>气价信息</nobr>
|
|
295
|
+
</th>
|
|
293
296
|
<th title="本次抄表用气量-上次抄表用气量/1">
|
|
294
297
|
<nobr>增减百分比</nobr>
|
|
295
298
|
</th>
|
|
@@ -371,6 +374,7 @@
|
|
|
371
374
|
<td><nobr>{{row.f_last_input_date}}</nobr></td>
|
|
372
375
|
<td style="text-align: center;">{{row.f_last_oughtamount}}</td>
|
|
373
376
|
<td style="text-align: center;">{{row.f_price_name}}</td>
|
|
377
|
+
<td style="text-align: center;">{{row.f_price_value}}</td>
|
|
374
378
|
<td style="text-align: center;">{{row.f_oughtamount_bv}}</td>
|
|
375
379
|
<td><nobr>{{row.f_hand_date}}</nobr></td>
|
|
376
380
|
<td><nobr>{{row.f_input_date}}</nobr></td>
|
|
@@ -476,6 +480,7 @@
|
|
|
476
480
|
'f_last_input_date': '上次抄表录入日期',
|
|
477
481
|
'f_last_oughtamount': '上次抄表量',
|
|
478
482
|
'f_price_name': '气价名称',
|
|
483
|
+
'f_price_value': '气价信息',
|
|
479
484
|
'f_oughtamount_bv': '增减百分比',
|
|
480
485
|
'f_hand_date': '下发日期',
|
|
481
486
|
'f_input_date': '抄表录入日期',
|
|
@@ -110,4 +110,6 @@ export default function () {
|
|
|
110
110
|
Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
|
|
111
111
|
// 阶梯气价
|
|
112
112
|
Vue.component('stair-price', (resolve) => { require(['./StairPrice'], resolve) })
|
|
113
|
+
// 其他记录具体信息 OperationRecord.vue
|
|
114
|
+
Vue.component('specific-information', (resolve) => { require(['./specificInformation'], resolve) })
|
|
113
115
|
}
|
|
@@ -0,0 +1,420 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto"> <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)" >
|
|
3
|
+
<form class="form-horizontal">
|
|
4
|
+
<div class="row">
|
|
5
|
+
<div class="col-sm-4">
|
|
6
|
+
<label class="font_normal_body">用户姓名</label>
|
|
7
|
+
<input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
|
|
8
|
+
</div>
|
|
9
|
+
<div class="col-sm-4">
|
|
10
|
+
<label class="font_normal_body">付款方式</label>
|
|
11
|
+
<v-select :value.sync="model.f_payment" :value-single="true"
|
|
12
|
+
v-model="model.f_payment"
|
|
13
|
+
class="select_list select"
|
|
14
|
+
:options='payments'
|
|
15
|
+
close-on-select>
|
|
16
|
+
</v-select>
|
|
17
|
+
</div>
|
|
18
|
+
<!-- <div class="col-sm-4">-->
|
|
19
|
+
<!-- <label class="font_normal_body">缴费类型</label>-->
|
|
20
|
+
<!-- <input type="text" v-model="model.payment" style="width: 60%" class="input_search">-->
|
|
21
|
+
<!-- </div>-->
|
|
22
|
+
<div class="col-sm-4">
|
|
23
|
+
<label class="font_normal_body">收据类型</label>
|
|
24
|
+
<v-select :value.sync="model.f_bill_style" :value-single="true"
|
|
25
|
+
v-model="model.f_bill_style"
|
|
26
|
+
class="select_list select"
|
|
27
|
+
:options='bill_styles'
|
|
28
|
+
close-on-select>
|
|
29
|
+
</v-select>
|
|
30
|
+
</div>
|
|
31
|
+
<!-- <div class="col-sm-4">-->
|
|
32
|
+
<!-- <label class="font_normal_body">收据类型</label>-->
|
|
33
|
+
<!-- <input type="text" v-model="model.bill_style" style="width: 60%" class="input_search">-->
|
|
34
|
+
<!-- </div>-->
|
|
35
|
+
<div class="col-sm-4" title="参数:操作时间, 权限:【其他收费金额修改】">
|
|
36
|
+
<label class="font_normal_body">缴费金额</label>
|
|
37
|
+
<input type="text" v-model="model.f_collection" :disabled="!editcollection" style="width: 60%" class="input_search">
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-4">
|
|
40
|
+
<label class="font_normal_body">收费时间</label>
|
|
41
|
+
<datepicker id="operate_date"
|
|
42
|
+
placeholder="收费时间"
|
|
43
|
+
style="width:60%"
|
|
44
|
+
v-model="model.f_operate_date"
|
|
45
|
+
:value.sync="model.f_operate_date"
|
|
46
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
47
|
+
>
|
|
48
|
+
</datepicker>
|
|
49
|
+
</div>
|
|
50
|
+
<div class="col-sm-4 form-group">
|
|
51
|
+
<label class="font_normal_body" title="参数:操作人员">操作人员</label>
|
|
52
|
+
<v-select :value.sync="model.f_operator"
|
|
53
|
+
v-model="model.f_operator"
|
|
54
|
+
:value-single="true" @change="selectoperator()"
|
|
55
|
+
:options='foperator'
|
|
56
|
+
close-on-select></v-select>
|
|
57
|
+
<!-- @click="selectoperator"-->
|
|
58
|
+
</div>
|
|
59
|
+
<div class="col-sm-4 form-group">
|
|
60
|
+
<label class="font_normal_body" >支付流水号</label>
|
|
61
|
+
<input type="text" v-model="model.f_serial_id" style="width: 60%" class="input_search">
|
|
62
|
+
</div>
|
|
63
|
+
<div class="col-sm-12 form-group">
|
|
64
|
+
<label class="font_normal_body">备  注</label>
|
|
65
|
+
<input type="text" v-model="model.f_comments" style="width: 60%" class="input_search">
|
|
66
|
+
|
|
67
|
+
</div>
|
|
68
|
+
</div>
|
|
69
|
+
</form>
|
|
70
|
+
<div style="float: right">
|
|
71
|
+
<button class="button_search" @click="save">保存</button>
|
|
72
|
+
<button class="button_clear" @click="cancel">取消</button>
|
|
73
|
+
</div>
|
|
74
|
+
<form novalidate class="form-horizontal">
|
|
75
|
+
<p></p>
|
|
76
|
+
<p class="bg-info text-center" style="padding: 8px;font-size: 20px">其他维护明细</p>
|
|
77
|
+
<!-- <data-grid :model="inData" v-ref:grid partial='list'>
|
|
78
|
+
<template partial='head'>-->
|
|
79
|
+
<table style="width: 600px">
|
|
80
|
+
<tr>
|
|
81
|
+
<th style="text-align: center">序号</th>
|
|
82
|
+
<th style="text-align: center">品牌及类别</th>
|
|
83
|
+
<th style="text-align: center">数量</th>
|
|
84
|
+
<th style="text-align: center">单价</th>
|
|
85
|
+
<th style="text-align: center">规格</th>
|
|
86
|
+
<th style="text-align: center"> 型号</th>
|
|
87
|
+
<th style="text-align: center"> 操作</th>
|
|
88
|
+
</tr>
|
|
89
|
+
<tr v-for="row in recordlist ">
|
|
90
|
+
<td style="text-align: center;">{{$index + 1}}</td>
|
|
91
|
+
<td style="text-align: center;" >{{row.brand_spec}}</td>
|
|
92
|
+
<td style="text-align: center;">{{row.number}}</td>
|
|
93
|
+
<td style="text-align: center;" >{{row.unitprice}}</td>
|
|
94
|
+
<td style="text-align: center;" >{{row.typename}}</td>
|
|
95
|
+
<td style="text-align: center;">{{row.typenumber}}</td>
|
|
96
|
+
<td style="text-align: center;">
|
|
97
|
+
|
|
98
|
+
<button class="button_new" type="button" @click="editBeizhu(row)">编辑</button>
|
|
99
|
+
</td>
|
|
100
|
+
</tr>
|
|
101
|
+
</table>
|
|
102
|
+
</form>
|
|
103
|
+
<modal :show.sync="editshow" v-ref:modal backdrop='false'>
|
|
104
|
+
<article slot="modal-body" class="modal-body">
|
|
105
|
+
<div class="row auto">
|
|
106
|
+
<div class="form-group form-input-group" title="参数名称:电脑端其他收费查询">
|
|
107
|
+
<label for="" class="control-label">品牌:</label>
|
|
108
|
+
<v-select :value.sync="mingxi.brand_spec" :value-single="true"
|
|
109
|
+
v-model="mingxi.brand_spec"
|
|
110
|
+
class="select_list select"
|
|
111
|
+
:options='brand_specs'
|
|
112
|
+
close-on-select>
|
|
113
|
+
</v-select>
|
|
114
|
+
</div>
|
|
115
|
+
</div>
|
|
116
|
+
<div class="row auto">
|
|
117
|
+
<div class="form-group form-input-group" title="权限:【其他收费金额修改】">
|
|
118
|
+
<label for="" class="control-label">数量:</label>
|
|
119
|
+
<input type="text" width="300px" class="form-control" v-model="mingxi.number" :disabled="!editcollection">
|
|
120
|
+
</div>
|
|
121
|
+
</div>
|
|
122
|
+
<div class="row auto">
|
|
123
|
+
<div class="form-group form-input-group" title="权限:【其他收费金额修改】">
|
|
124
|
+
<label for="" class="control-label">单价:</label>
|
|
125
|
+
<input type="text" width="300px" class="form-control" v-model="mingxi.unitprice" :disabled="!editcollection" >
|
|
126
|
+
</div>
|
|
127
|
+
</div>
|
|
128
|
+
<div class="row auto">
|
|
129
|
+
<div class="form-group form-input-group">
|
|
130
|
+
<label for="" class="control-label">规格:</label>
|
|
131
|
+
<v-select :value.sync="mingxi.typename" :value-single="true"
|
|
132
|
+
v-model="mingxi.typename"
|
|
133
|
+
class="select_list select"
|
|
134
|
+
:options='typeNameList'
|
|
135
|
+
close-on-select>
|
|
136
|
+
</v-select>
|
|
137
|
+
</div>
|
|
138
|
+
</div>
|
|
139
|
+
<div class="row auto">
|
|
140
|
+
<div class="form-group form-input-group">
|
|
141
|
+
<label for="" class="control-label">型号:</label>
|
|
142
|
+
<input type="text" width="300px" class="form-control" v-model="mingxi.typenumber" >
|
|
143
|
+
</div>
|
|
144
|
+
</div>
|
|
145
|
+
</article>
|
|
146
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
147
|
+
<button type="button" class="btn btn-default" @click='editclose' id="vc-messagebox-close">取消</button>
|
|
148
|
+
<button type="button" class="btn btn-success" @click='updatedefail' id="vc-messagebox-confirm">确认</button>
|
|
149
|
+
</footer>
|
|
150
|
+
</modal>
|
|
151
|
+
<!--<split-price :showdata="model" :pricesplit="priceSplit" v-if="priceSplit" ></split-price>-->
|
|
152
|
+
</validator>
|
|
153
|
+
</div>
|
|
154
|
+
</template>
|
|
155
|
+
<script>
|
|
156
|
+
import Vue from 'vue'
|
|
157
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
158
|
+
import * as Util from "../../Util";
|
|
159
|
+
// var data
|
|
160
|
+
export default {
|
|
161
|
+
title: '基本信息',
|
|
162
|
+
|
|
163
|
+
data () {
|
|
164
|
+
return {
|
|
165
|
+
brand_specs: this.$appdata.getParam('电脑端其他收费查询') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('电脑端其他收费查询')] : [],
|
|
166
|
+
bill_styles: this.$appdata.getParam('打印格式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
|
|
167
|
+
payments: this.$appdata.getParam('付款方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')] : [],
|
|
168
|
+
editshow: false,
|
|
169
|
+
editcollection: false,
|
|
170
|
+
mingxi: '',
|
|
171
|
+
oldmingxi: '',
|
|
172
|
+
brand_spec: '',
|
|
173
|
+
unitprice: '',
|
|
174
|
+
typeNameList: [],
|
|
175
|
+
typenumberList: [],
|
|
176
|
+
// 操作记录表
|
|
177
|
+
recordList3: [],
|
|
178
|
+
total: '',
|
|
179
|
+
// 明细操作记录
|
|
180
|
+
recordList2: [],
|
|
181
|
+
// 其他记录
|
|
182
|
+
fileNameSet: {
|
|
183
|
+
f_payment: '缴费类型',
|
|
184
|
+
f_bill_style: '收据类型',
|
|
185
|
+
f_collection: '缴费金额',
|
|
186
|
+
f_serial_id: '支付流水号',
|
|
187
|
+
f_operate_date: '缴费时间',
|
|
188
|
+
f_comments: '备注',
|
|
189
|
+
name: '用户姓名',
|
|
190
|
+
f_operator: '操作人'
|
|
191
|
+
},
|
|
192
|
+
// 其他记录明细
|
|
193
|
+
fileNameSet2: {
|
|
194
|
+
brand_spec: '品牌类别',
|
|
195
|
+
number: '数量',
|
|
196
|
+
unitprice: '单价',
|
|
197
|
+
typename: '规格',
|
|
198
|
+
typenumber: '型号',
|
|
199
|
+
operator: '操作人'
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
},
|
|
203
|
+
props: {
|
|
204
|
+
model: Object,
|
|
205
|
+
oldmodel: Object,
|
|
206
|
+
// recordList:Array
|
|
207
|
+
recordlist: Array
|
|
208
|
+
},
|
|
209
|
+
ready () {
|
|
210
|
+
if (this.$login.r.includes('其他收费金额修改')) {
|
|
211
|
+
this.editcollection = true
|
|
212
|
+
}
|
|
213
|
+
this.cou()
|
|
214
|
+
this.oldmodel = JSON.parse(JSON.stringify(this.model))
|
|
215
|
+
console.log(this.model)
|
|
216
|
+
},
|
|
217
|
+
created () {
|
|
218
|
+
},
|
|
219
|
+
methods: {
|
|
220
|
+
async setTypename (val) {
|
|
221
|
+
this.typeNameList = this.$appdata.getParam(val)
|
|
222
|
+
},
|
|
223
|
+
// setTypenumber (val) {
|
|
224
|
+
// this.typenumberList = this.$appdata.getParam(val)
|
|
225
|
+
// },
|
|
226
|
+
selectoperator () {
|
|
227
|
+
let f_operator = this.model.f_operator
|
|
228
|
+
console.log('处理签的this.model.f_operatorid', this.model.f_operator)
|
|
229
|
+
let http = new HttpResetClass()
|
|
230
|
+
http.load('POST', 'api/af-revenue/logic/findOperator',
|
|
231
|
+
{f_operator: f_operator},
|
|
232
|
+
{resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
233
|
+
console.log('kanak,res', res)
|
|
234
|
+
if(res.data.length>0){
|
|
235
|
+
this.model.f_operatorid = res.data[0].id
|
|
236
|
+
}else{
|
|
237
|
+
this.model.f_operator=''
|
|
238
|
+
this.$showAlert('操作员信息未找到,请在参数管理进行添加','warning',2000)
|
|
239
|
+
}
|
|
240
|
+
console.log('this.model.f_operatorid', this.model.f_operatorid)
|
|
241
|
+
})
|
|
242
|
+
},
|
|
243
|
+
editclose () {
|
|
244
|
+
this.mingxi = ''
|
|
245
|
+
this.editshow = false
|
|
246
|
+
},
|
|
247
|
+
editBeizhu (val) {
|
|
248
|
+
this.editshow = true
|
|
249
|
+
this.mingxi = val
|
|
250
|
+
this.oldmingxi = val
|
|
251
|
+
this.mingxi = JSON.parse(JSON.stringify(val))
|
|
252
|
+
this.oldmingxi = JSON.parse(JSON.stringify(val))
|
|
253
|
+
},
|
|
254
|
+
async saveOtherdetail () {
|
|
255
|
+
for (var item in this.mingxi) {
|
|
256
|
+
if (this.mingxi[item] instanceof Array) {
|
|
257
|
+
this.mingxi[item] = this.mingxi[item].length > 0 ? this.mingxi[item][0] : ''
|
|
258
|
+
}
|
|
259
|
+
if (this.mingxi[item] != this.oldmingxi[item]) {
|
|
260
|
+
var car3 = {
|
|
261
|
+
tablename: 't_othercharge_detail',
|
|
262
|
+
chinesename: this.fileNameSet2[item] != '' ? this.fileNameSet2[item] : '',
|
|
263
|
+
// chinesename: this.fileNameSet2[item],
|
|
264
|
+
oldvalue: this.oldmingxi[item],
|
|
265
|
+
newvalue: this.mingxi[item],
|
|
266
|
+
modifitime: Util.toStandardTimeString(),
|
|
267
|
+
fieldname: item,
|
|
268
|
+
state: '有效',
|
|
269
|
+
charge_detail_id:this.mingxi.did,
|
|
270
|
+
operator: this.$login.f.name != '' ? this.$login.f.name : ''
|
|
271
|
+
}
|
|
272
|
+
this.recordList2.push(car3)
|
|
273
|
+
// 该方法并未对chinesename fieldname operator等进行判断赋值,此暂写为定值
|
|
274
|
+
console.log(car3)
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
await this.$resetpost('api/af-revenue/logic/savedetailoperting', {
|
|
278
|
+
data: {
|
|
279
|
+
recordlist2: this.recordList2
|
|
280
|
+
}
|
|
281
|
+
}, {
|
|
282
|
+
resolveMsg: '修改成功',
|
|
283
|
+
rejectMsg: '未通过,修改出错!!!'
|
|
284
|
+
})
|
|
285
|
+
},
|
|
286
|
+
// 修改其他记录明细
|
|
287
|
+
async updatedefail () {
|
|
288
|
+
this.editshow = false
|
|
289
|
+
let param={
|
|
290
|
+
f_number:this.mingxi.number,
|
|
291
|
+
f_unitprice:this.mingxi.unitprice,
|
|
292
|
+
f_brand_spec: this.mingxi.brand_spec,
|
|
293
|
+
f_typenumber:this.mingxi.typenumber,
|
|
294
|
+
f_typename:this.mingxi.typename,
|
|
295
|
+
id: this.mingxi.did
|
|
296
|
+
}
|
|
297
|
+
await this.$resetpost('api/af-revenue/logic/updatedetail', {data: param}, {
|
|
298
|
+
resolveMsg: '修改成功',
|
|
299
|
+
rejectMsg: '未通过,修改出错!!!'
|
|
300
|
+
})
|
|
301
|
+
this.saveOtherdetail()
|
|
302
|
+
this.$dispatch('close')
|
|
303
|
+
this.$dispatch('refresh')
|
|
304
|
+
},
|
|
305
|
+
// 计算总金额
|
|
306
|
+
cou () {
|
|
307
|
+
let sum = []
|
|
308
|
+
this.recordlist.forEach((item, index) => {
|
|
309
|
+
var sub = item.number * item.unitprice
|
|
310
|
+
console.log(sub)
|
|
311
|
+
sum.push(sub)
|
|
312
|
+
})
|
|
313
|
+
console.log(sum)
|
|
314
|
+
let res = 0
|
|
315
|
+
for (let i = 0; i < sum.length; i++) {
|
|
316
|
+
res += sum[i]
|
|
317
|
+
}
|
|
318
|
+
console.log(res)
|
|
319
|
+
this.total = res
|
|
320
|
+
},
|
|
321
|
+
cancel () {
|
|
322
|
+
this.$dispatch('close')
|
|
323
|
+
this.$dispatch('refresh')
|
|
324
|
+
},
|
|
325
|
+
// 保存操作记录
|
|
326
|
+
async save2 () {
|
|
327
|
+
for (var item in this.model) {
|
|
328
|
+
if (this.model[item] instanceof Array) {
|
|
329
|
+
this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
|
|
330
|
+
}
|
|
331
|
+
if (this.model[item] != this.oldmodel[item]) {
|
|
332
|
+
var car2 = {
|
|
333
|
+
tablename: 't_othercharge',
|
|
334
|
+
chinesename: this.fileNameSet[item],
|
|
335
|
+
oldvalue: this.oldmodel[item],
|
|
336
|
+
newvalue: this.model[item],
|
|
337
|
+
modifitime: Util.toStandardTimeString(),
|
|
338
|
+
fieldname: item,
|
|
339
|
+
state: '有效',
|
|
340
|
+
othercharge_id:this.model.id,
|
|
341
|
+
operator: this.$login.f.name != '' ? this.$login.f.name : '',
|
|
342
|
+
f_operator : this.$login.f.name,
|
|
343
|
+
f_operatorid : this.$login.f.id,
|
|
344
|
+
f_orgid : this.$login.f.orgid,
|
|
345
|
+
f_orgname : this.$login.f.orgs,
|
|
346
|
+
f_depid : this.$login.f.depids,
|
|
347
|
+
f_depname : this.$login.f.deps
|
|
348
|
+
}
|
|
349
|
+
this.recordList3.push(car2)
|
|
350
|
+
// 该方法并未对chinesename fieldname operator等进行判断赋值,此暂写为定值
|
|
351
|
+
console.log(car2)
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
let condition = this.model.id
|
|
355
|
+
await this.$resetpost('api/af-revenue/logic/operationRecord', {data: {recordlist3: this.recordList3, condition: condition}}, {
|
|
356
|
+
resolveMsg: '修改成功',
|
|
357
|
+
rejectMsg: '未通过,修改出错!!!'
|
|
358
|
+
})
|
|
359
|
+
console.log('this.model', this.model)
|
|
360
|
+
this.$dispatch('close')
|
|
361
|
+
this.$dispatch('refresh')
|
|
362
|
+
},
|
|
363
|
+
// 修改其他记录
|
|
364
|
+
async save () {
|
|
365
|
+
// let condition = " f_collection='" + this.model.collection + "' , f_unitprice='"+ this.model.collection+"' where f_othercharge_id= '"+this.model.id+"'"
|
|
366
|
+
this.model.f_collection = this.total
|
|
367
|
+
let param={
|
|
368
|
+
f_user_name:this.model.f_user_name,
|
|
369
|
+
f_comments:this.model.f_comments,
|
|
370
|
+
f_payment:this.model.f_payment,
|
|
371
|
+
f_collection:this.model.f_collection,
|
|
372
|
+
f_bill_style:this.model.f_bill_style,
|
|
373
|
+
f_serial_id:this.model.f_serial_id?this.model.f_serial_id:'',
|
|
374
|
+
f_operate_date:this.model.f_operate_date,
|
|
375
|
+
f_operator:this.model.f_operator,
|
|
376
|
+
f_operatorid:this.model.f_operatorid?this.model.f_operatorid:'',
|
|
377
|
+
id:this.model.id
|
|
378
|
+
}
|
|
379
|
+
await this.$resetpost('api/af-revenue/logic/saveotherrecord',{data:param}, {
|
|
380
|
+
resolveMsg: '修改成功',
|
|
381
|
+
rejectMsg: '未通过,修改出错!!!'
|
|
382
|
+
})
|
|
383
|
+
this.save2()
|
|
384
|
+
this.$dispatch('close')
|
|
385
|
+
this.$dispatch('refresh')
|
|
386
|
+
}
|
|
387
|
+
},
|
|
388
|
+
computed: {
|
|
389
|
+
foperator () {
|
|
390
|
+
return [...this.$appdata.getParam('操作人员')]
|
|
391
|
+
}
|
|
392
|
+
},
|
|
393
|
+
watch: {
|
|
394
|
+
'model.f_user_name' () {
|
|
395
|
+
if (this.model.f_operator) {
|
|
396
|
+
this.selectoperator()
|
|
397
|
+
}
|
|
398
|
+
},
|
|
399
|
+
'mingxi.brand_spec'(){
|
|
400
|
+
this.setTypename(this.mingxi.brand_spec)
|
|
401
|
+
if(this.typeNameList){
|
|
402
|
+
}else{
|
|
403
|
+
this.mingxi.typename = ''
|
|
404
|
+
}
|
|
405
|
+
},
|
|
406
|
+
'model.operator' () {
|
|
407
|
+
if (this.model.f_operator) {
|
|
408
|
+
this.selectoperator()
|
|
409
|
+
}
|
|
410
|
+
},
|
|
411
|
+
recordlist: {
|
|
412
|
+
handler (val) {
|
|
413
|
+
console.log('数组值有了'),
|
|
414
|
+
this.cou()
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
}
|
|
420
|
+
</script>
|