sale-client 3.5.12 → 3.5.15
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 +2 -2
- package/src/components/charge/business/FilesComplete.vue +254 -253
- package/src/components/charge/business/NoCardMeterCenter.vue +1 -1
- package/src/components/chargeNew/thirdSurplus.vue +1 -1
- package/src/components/common/userinfo_detail/TableUsageChart.vue +81 -0
- package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +3 -0
- package/src/components/revenue/Common/PrintBill.vue +5 -2
- package/src/components/revenue/HandManager/openEticket/HasOpenReceipt.vue +1 -0
- package/src/components/revenue/base/leftview/MixPriceInfo.vue +1 -1
- package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeDeduction.vue +11 -13
- package/src/components/revenue/comprehen/Maintenance/hand/handOperate.vue +22 -22
- package/src/components/revenue/concentrator/ncArchivesList.vue +4 -4
- package/src/components/revenue/invoiceuse/InvoiceUse.vue +12 -0
- package/src/components/revenue/machineHandManage/machineHand.vue +142 -1
- package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue +8 -1
- package/src/filiale/liaoyuan/PriceAdjustment.vue +801 -801
- package/src/filiale/macheng/FilesManageNew/MeterinfoTest.vue +35 -18
- package/src/filiale/macheng/MeterinfoTest.vue +33 -17
- package/src/filiale/qianneng/FilesManage/FileUserFiles.vue +9 -9
- package/src/filiale/qianneng/HighMeterIdCard.vue +25 -17
- package/src/filiale/qianneng/js/WsUtil.js +191 -180
- package/src/filiale/qianneng/js/hignmeter.js +11 -1
- package/src/filiale/qingtongxia/HandManager/HandManager.vue +2 -2
- package/src/filiale/rongchuang/handListMaintain.vue +639 -0
- package/src/filiale/rongchuang/handOperate.vue +454 -0
- package/src/filiale/rongchuang/sale.js +10 -9
- package/src/filiale/shaoguan/sale.js +2 -1
- package/src/filiale/tongchuan/base/otherinfo.vue +7 -1
- package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue +3 -0
- package/src/sale.js +5 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sale-client",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.15",
|
|
4
4
|
"description": "收费模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"sinon-chai": "^2.8.0",
|
|
87
87
|
"style": "0.0.3",
|
|
88
88
|
"style-loader": "^0.20.3",
|
|
89
|
-
"system-clients": "3.2.
|
|
89
|
+
"system-clients": "3.2.6-1",
|
|
90
90
|
"url-loader": "^0.5.7",
|
|
91
91
|
"vue-client": "1.24.55",
|
|
92
92
|
"vue-clipboard2": "0.3.1",
|
|
@@ -1,253 +1,254 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div class="auto">
|
|
3
|
-
<validator name='m'>
|
|
4
|
-
<form novalidate class="form-horizontal select-overspread">
|
|
5
|
-
<div class="row" style="margin-top:10px;">
|
|
6
|
-
<div class="col-sm-4">
|
|
7
|
-
<label for="f_user_name" class="font_normal_body ">客户姓名</label>
|
|
8
|
-
<input class="input_search " style="width:60%" v-model="model.f_user_name" placeholder='客户姓名' :value="row.f_user_name">
|
|
9
|
-
</div>
|
|
10
|
-
<div class="col-sm-4">
|
|
11
|
-
<label for="f_user_phone" class="font_normal_body ">客户电话</label>
|
|
12
|
-
<input class="input_search " style="width:60%" v-model="model.f_user_phone" placeholder='电话' :value="row.f_user_phone">
|
|
13
|
-
</div>
|
|
14
|
-
<div class="col-sm-4">
|
|
15
|
-
<label for="f_idnumber" class="font_normal_body ">证件号码</label>
|
|
16
|
-
<input class="input_search " style="width:60%" v-model="model.f_idnumber" placeholder='证件号码' :value="row.f_idnumber">
|
|
17
|
-
</div>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="row" style="margin-top:10px;">
|
|
20
|
-
<div class="col-sm-8">
|
|
21
|
-
<label for="f_address" class="font_normal_body ">客户地址</label>
|
|
22
|
-
<input class="input_search " style="width:80%" v-model="model.f_address" placeholder='客户地址' :value="row.f_address" readonly>
|
|
23
|
-
</div>
|
|
24
|
-
<div class="col-sm-4">
|
|
25
|
-
<label for="f_idnumber" class="font_normal_body ">表  号</label>
|
|
26
|
-
<input class="input_search " style="width:60%" v-model="model.f_meternumber" placeholder='表号' :value="row.f_meternumber">
|
|
27
|
-
</div>
|
|
28
|
-
|
|
29
|
-
</div>
|
|
30
|
-
<div class="row" style="margin-top:10px;">
|
|
31
|
-
|
|
32
|
-
<div class="col-sm-4">
|
|
33
|
-
<label for="f_user_name" class="font_normal_body ">左 右 表</label>
|
|
34
|
-
<input class="input_search " style="width:60%" v-model="model.f_aroundmeter" placeholder='左右表' :value="row.f_aroundmeter" readonly>
|
|
35
|
-
</div>
|
|
36
|
-
<div class="col-sm-8">
|
|
37
|
-
<label for="f_user_phone" class="font_normal_body ">备  注</label>
|
|
38
|
-
<input class="input_search " style="width:80%" v-model="model.f_comments" placeholder='备注' :value="row.f_comments" readonly>
|
|
39
|
-
</div>
|
|
40
|
-
|
|
41
|
-
</div>
|
|
42
|
-
<div class="row" style="margin-top:10px;">
|
|
43
|
-
|
|
44
|
-
<div :class="[$m.f_gasbrand_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
|
|
45
|
-
<input type="text" v-show="false" v-model="model.f_gasbrand"
|
|
46
|
-
v-validate:f_gasbrand_id='{required: true }' >
|
|
47
|
-
|
|
48
|
-
<label for="f_gasbrand_id" class=" font_normal_body">气表品牌</label>
|
|
49
|
-
<v-select :value.sync="model.f_gasbrand" @change="verifigasbrand()"
|
|
50
|
-
:options='meterbrands'
|
|
51
|
-
:placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_brand:'请选择'"
|
|
52
|
-
v-model='model.f_gasbrand'
|
|
53
|
-
v-ref:brand
|
|
54
|
-
close-on-select>
|
|
55
|
-
</v-select>
|
|
56
|
-
</div>
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
<div :class="[$m.f_gasmodel_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
|
|
60
|
-
<input type="text" v-show="false" v-model="model.f_gasmodel"
|
|
61
|
-
v-validate:f_gasmodel_id='{required: true }'>
|
|
62
|
-
<label for="f_gasmodel_id" class=" font_normal_body">气表型号</label>
|
|
63
|
-
<v-select :value.sync="model.f_gasmodel"
|
|
64
|
-
:options='model.f_gasbrand[0].gasmodel'
|
|
65
|
-
:placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_style:'请选择'"
|
|
66
|
-
close-on-select
|
|
67
|
-
v-model='model.f_gasmodel'
|
|
68
|
-
v-ref:model></v-select>
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
</div>
|
|
72
|
-
<div class="col-sm-4" :class="[$m.pricename.required ? 'has-error' : '']">
|
|
73
|
-
<input type="text" v-show="false" v-model="model.f_price_name" v-validate:pricename='{required: true }'>
|
|
74
|
-
<label class="font_normal_body">气价名称</label>
|
|
75
|
-
<v-select :value.sync="model.f_price_name"
|
|
76
|
-
v-model="model.f_price_name"
|
|
77
|
-
placeholder='气价名称'
|
|
78
|
-
:options="getPricenames"
|
|
79
|
-
@change="priceChange"
|
|
80
|
-
close-on-select v-ref:pricename></v-select>
|
|
81
|
-
</div>
|
|
82
|
-
<div class="col-sm-4 form-group">
|
|
83
|
-
<label class="font_normal_body"> 气价备注</label>
|
|
84
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.f_price_comments" placeholder='气价备注' disabled>
|
|
85
|
-
</div>
|
|
86
|
-
|
|
87
|
-
</div>
|
|
88
|
-
|
|
89
|
-
<!--<div class="row" style="margin-top:10px;">-->
|
|
90
|
-
<!--<div class="col-sm-4"-->
|
|
91
|
-
<!--:class="[$m.gas.required ? 'select-error' : '']">-->
|
|
92
|
-
<!--<label for="f_username" class="font_normal_body">用气性质</label>-->
|
|
93
|
-
<!--<input type="text" v-show="false" v-model="model.f_gasproperties" v-validate:gas='{required: true }'>-->
|
|
94
|
-
<!--<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"-->
|
|
95
|
-
<!--:options='gasproperties' placeholder='用气性质'-->
|
|
96
|
-
<!--close-on-select v-ref:gas></v-select>-->
|
|
97
|
-
<!--</div>-->
|
|
98
|
-
<!--<div class="col-sm-4" :class="[$m.type.required ? 'select-error' : '']">-->
|
|
99
|
-
<!--<label for="pricetype" class="font_normal_body">气价类型</label>-->
|
|
100
|
-
<!--<v-select :value.sync="model.f_price_type" v-model="model.f_price_type"-->
|
|
101
|
-
<!--placeholder='气价类型' :options="pricetypes"-->
|
|
102
|
-
<!--close-on-select v-ref:type>-->
|
|
103
|
-
<!--</v-select>-->
|
|
104
|
-
<!--<input type="text" v-show="false" v-model="model.f_price_type" v-validate:type='{required: true }'>-->
|
|
105
|
-
<!--</div>-->
|
|
106
|
-
<!---->
|
|
107
|
-
<!--</div>-->
|
|
108
|
-
</form>
|
|
109
|
-
<div style="text-align:right;">
|
|
110
|
-
<button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid || validateOk'>确认</button>
|
|
111
|
-
<button class="button_clear btn-gn" @click="clean()">取消</button>
|
|
112
|
-
</div>
|
|
113
|
-
</validator>
|
|
114
|
-
</div>
|
|
115
|
-
<upload :blodid="blodid" v-if="false" isremark="true" fusetype="档案完善"></upload>
|
|
116
|
-
</template>
|
|
117
|
-
<script>
|
|
118
|
-
export default {
|
|
119
|
-
title: '档案完善',
|
|
120
|
-
data () {
|
|
121
|
-
return {
|
|
122
|
-
model: {
|
|
123
|
-
f_userfiles_id: '',
|
|
124
|
-
f_user_name: '',
|
|
125
|
-
f_user_phone: '',
|
|
126
|
-
f_idnumber: '',
|
|
127
|
-
f_gasproperties: [],
|
|
128
|
-
f_gasbrand: [],
|
|
129
|
-
f_gasmodel: [],
|
|
130
|
-
f_address: '',
|
|
131
|
-
f_price_id: '',
|
|
132
|
-
f_gasbrand_id: '',
|
|
133
|
-
f_gasmodel_id: '',
|
|
134
|
-
// f_meter_brand:'',
|
|
135
|
-
// f_meter_style:'',
|
|
136
|
-
f_price_type: [],
|
|
137
|
-
f_price_name: '',
|
|
138
|
-
f_price_comments: '',
|
|
139
|
-
f_filialeid: '',
|
|
140
|
-
f_userinfo_id: ''
|
|
141
|
-
},
|
|
142
|
-
blodid: '',
|
|
143
|
-
showupload: true,
|
|
144
|
-
gasproperties: [],
|
|
145
|
-
validateOk: false,
|
|
146
|
-
pricetypes: this.$appdata.getParam('气价类型')
|
|
147
|
-
}
|
|
148
|
-
},
|
|
149
|
-
props: ['row'],
|
|
150
|
-
ready () {
|
|
151
|
-
this.
|
|
152
|
-
this.
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
this.model.f_gasbrand[0].gasmodel
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
this.model.
|
|
179
|
-
this.model.
|
|
180
|
-
this.model.
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
this.model.
|
|
192
|
-
this.model.
|
|
193
|
-
this.model.
|
|
194
|
-
this.model.
|
|
195
|
-
this.model.
|
|
196
|
-
this.model.
|
|
197
|
-
this.model.
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
this.model.
|
|
201
|
-
this.model.
|
|
202
|
-
this.model.
|
|
203
|
-
this.model.
|
|
204
|
-
this.model.
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
this.
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
this.$
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
let
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<validator name='m'>
|
|
4
|
+
<form novalidate class="form-horizontal select-overspread">
|
|
5
|
+
<div class="row" style="margin-top:10px;">
|
|
6
|
+
<div class="col-sm-4">
|
|
7
|
+
<label for="f_user_name" class="font_normal_body ">客户姓名</label>
|
|
8
|
+
<input class="input_search " style="width:60%" v-model="model.f_user_name" placeholder='客户姓名' :value="row.f_user_name">
|
|
9
|
+
</div>
|
|
10
|
+
<div class="col-sm-4">
|
|
11
|
+
<label for="f_user_phone" class="font_normal_body ">客户电话</label>
|
|
12
|
+
<input class="input_search " style="width:60%" v-model="model.f_user_phone" placeholder='电话' :value="row.f_user_phone">
|
|
13
|
+
</div>
|
|
14
|
+
<div class="col-sm-4">
|
|
15
|
+
<label for="f_idnumber" class="font_normal_body ">证件号码</label>
|
|
16
|
+
<input class="input_search " style="width:60%" v-model="model.f_idnumber" placeholder='证件号码' :value="row.f_idnumber">
|
|
17
|
+
</div>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="row" style="margin-top:10px;">
|
|
20
|
+
<div class="col-sm-8">
|
|
21
|
+
<label for="f_address" class="font_normal_body ">客户地址</label>
|
|
22
|
+
<input class="input_search " style="width:80%" v-model="model.f_address" placeholder='客户地址' :value="row.f_address" readonly>
|
|
23
|
+
</div>
|
|
24
|
+
<div class="col-sm-4">
|
|
25
|
+
<label for="f_idnumber" class="font_normal_body ">表  号</label>
|
|
26
|
+
<input class="input_search " style="width:60%" v-model="model.f_meternumber" placeholder='表号' :value="row.f_meternumber">
|
|
27
|
+
</div>
|
|
28
|
+
|
|
29
|
+
</div>
|
|
30
|
+
<div class="row" style="margin-top:10px;">
|
|
31
|
+
|
|
32
|
+
<div class="col-sm-4">
|
|
33
|
+
<label for="f_user_name" class="font_normal_body ">左 右 表</label>
|
|
34
|
+
<input class="input_search " style="width:60%" v-model="model.f_aroundmeter" placeholder='左右表' :value="row.f_aroundmeter" readonly>
|
|
35
|
+
</div>
|
|
36
|
+
<div class="col-sm-8">
|
|
37
|
+
<label for="f_user_phone" class="font_normal_body ">备  注</label>
|
|
38
|
+
<input class="input_search " style="width:80%" v-model="model.f_comments" placeholder='备注' :value="row.f_comments" readonly>
|
|
39
|
+
</div>
|
|
40
|
+
|
|
41
|
+
</div>
|
|
42
|
+
<div class="row" style="margin-top:10px;">
|
|
43
|
+
|
|
44
|
+
<div :class="[$m.f_gasbrand_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
|
|
45
|
+
<input type="text" v-show="false" v-model="model.f_gasbrand"
|
|
46
|
+
v-validate:f_gasbrand_id='{required: true }' >
|
|
47
|
+
|
|
48
|
+
<label for="f_gasbrand_id" class=" font_normal_body">气表品牌</label>
|
|
49
|
+
<v-select :value.sync="model.f_gasbrand" @change="verifigasbrand()"
|
|
50
|
+
:options='meterbrands'
|
|
51
|
+
:placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_brand:'请选择'"
|
|
52
|
+
v-model='model.f_gasbrand'
|
|
53
|
+
v-ref:brand
|
|
54
|
+
close-on-select>
|
|
55
|
+
</v-select>
|
|
56
|
+
</div>
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
<div :class="[$m.f_gasmodel_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
|
|
60
|
+
<input type="text" v-show="false" v-model="model.f_gasmodel"
|
|
61
|
+
v-validate:f_gasmodel_id='{required: true }'>
|
|
62
|
+
<label for="f_gasmodel_id" class=" font_normal_body">气表型号</label>
|
|
63
|
+
<v-select :value.sync="model.f_gasmodel"
|
|
64
|
+
:options='model.f_gasbrand[0].gasmodel'
|
|
65
|
+
:placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_style:'请选择'"
|
|
66
|
+
close-on-select
|
|
67
|
+
v-model='model.f_gasmodel'
|
|
68
|
+
v-ref:model></v-select>
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
</div>
|
|
72
|
+
<div class="col-sm-4" :class="[$m.pricename.required ? 'has-error' : '']">
|
|
73
|
+
<input type="text" v-show="false" v-model="model.f_price_name" v-validate:pricename='{required: true }'>
|
|
74
|
+
<label class="font_normal_body">气价名称</label>
|
|
75
|
+
<v-select :value.sync="model.f_price_name"
|
|
76
|
+
v-model="model.f_price_name"
|
|
77
|
+
placeholder='气价名称'
|
|
78
|
+
:options="getPricenames"
|
|
79
|
+
@change="priceChange"
|
|
80
|
+
close-on-select v-ref:pricename></v-select>
|
|
81
|
+
</div>
|
|
82
|
+
<div class="col-sm-4 form-group">
|
|
83
|
+
<label class="font_normal_body"> 气价备注</label>
|
|
84
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_price_comments" placeholder='气价备注' disabled>
|
|
85
|
+
</div>
|
|
86
|
+
|
|
87
|
+
</div>
|
|
88
|
+
|
|
89
|
+
<!--<div class="row" style="margin-top:10px;">-->
|
|
90
|
+
<!--<div class="col-sm-4"-->
|
|
91
|
+
<!--:class="[$m.gas.required ? 'select-error' : '']">-->
|
|
92
|
+
<!--<label for="f_username" class="font_normal_body">用气性质</label>-->
|
|
93
|
+
<!--<input type="text" v-show="false" v-model="model.f_gasproperties" v-validate:gas='{required: true }'>-->
|
|
94
|
+
<!--<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"-->
|
|
95
|
+
<!--:options='gasproperties' placeholder='用气性质'-->
|
|
96
|
+
<!--close-on-select v-ref:gas></v-select>-->
|
|
97
|
+
<!--</div>-->
|
|
98
|
+
<!--<div class="col-sm-4" :class="[$m.type.required ? 'select-error' : '']">-->
|
|
99
|
+
<!--<label for="pricetype" class="font_normal_body">气价类型</label>-->
|
|
100
|
+
<!--<v-select :value.sync="model.f_price_type" v-model="model.f_price_type"-->
|
|
101
|
+
<!--placeholder='气价类型' :options="pricetypes"-->
|
|
102
|
+
<!--close-on-select v-ref:type>-->
|
|
103
|
+
<!--</v-select>-->
|
|
104
|
+
<!--<input type="text" v-show="false" v-model="model.f_price_type" v-validate:type='{required: true }'>-->
|
|
105
|
+
<!--</div>-->
|
|
106
|
+
<!---->
|
|
107
|
+
<!--</div>-->
|
|
108
|
+
</form>
|
|
109
|
+
<div style="text-align:right;">
|
|
110
|
+
<button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid || validateOk'>确认</button>
|
|
111
|
+
<button class="button_clear btn-gn" @click="clean()">取消</button>
|
|
112
|
+
</div>
|
|
113
|
+
</validator>
|
|
114
|
+
</div>
|
|
115
|
+
<upload :blodid="blodid" v-if="false" isremark="true" fusetype="档案完善"></upload>
|
|
116
|
+
</template>
|
|
117
|
+
<script>
|
|
118
|
+
export default {
|
|
119
|
+
title: '档案完善',
|
|
120
|
+
data () {
|
|
121
|
+
return {
|
|
122
|
+
model: {
|
|
123
|
+
f_userfiles_id: '',
|
|
124
|
+
f_user_name: '',
|
|
125
|
+
f_user_phone: '',
|
|
126
|
+
f_idnumber: '',
|
|
127
|
+
f_gasproperties: [],
|
|
128
|
+
f_gasbrand: [],
|
|
129
|
+
f_gasmodel: [],
|
|
130
|
+
f_address: '',
|
|
131
|
+
f_price_id: '',
|
|
132
|
+
f_gasbrand_id: '',
|
|
133
|
+
f_gasmodel_id: '',
|
|
134
|
+
// f_meter_brand:'',
|
|
135
|
+
// f_meter_style:'',
|
|
136
|
+
f_price_type: [],
|
|
137
|
+
f_price_name: '',
|
|
138
|
+
f_price_comments: '',
|
|
139
|
+
f_filialeid: '',
|
|
140
|
+
f_userinfo_id: ''
|
|
141
|
+
},
|
|
142
|
+
blodid: '',
|
|
143
|
+
showupload: true,
|
|
144
|
+
gasproperties: [],
|
|
145
|
+
validateOk: false,
|
|
146
|
+
pricetypes: this.$appdata.getParam('气价类型')
|
|
147
|
+
}
|
|
148
|
+
},
|
|
149
|
+
props: ['row'],
|
|
150
|
+
ready () {
|
|
151
|
+
this.row = this.data
|
|
152
|
+
this.blodid = this.row.f_userinfo_id
|
|
153
|
+
this.gasproperties = this.$appdata.getParam(this.row.f_user_type)
|
|
154
|
+
if (this.row.f_gasproperties) {
|
|
155
|
+
this.model.f_gasproperties.push(this.row.f_gasproperties)
|
|
156
|
+
}
|
|
157
|
+
if (this.row.f_price_type) {
|
|
158
|
+
this.model.f_price_type.push(this.row.f_price_type)
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
if (this.row.f_gasbrand_id) {
|
|
162
|
+
this.meterbrands.forEach((val) => {
|
|
163
|
+
if (this.row.f_gasbrand_id == val.value.id) {
|
|
164
|
+
this.model.f_gasbrand.push(val.value)
|
|
165
|
+
}
|
|
166
|
+
})
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
if (this.row.f_gasmodel_id) {
|
|
170
|
+
console.log('气表下的型号。。。', this.model.f_gasbrand[0].gasmodel)
|
|
171
|
+
this.model.f_gasbrand[0].gasmodel.forEach((res) => {
|
|
172
|
+
if (this.row.f_gasmodel_id == res.value.id) {
|
|
173
|
+
this.model.f_gasmodel.push(res.value)
|
|
174
|
+
}
|
|
175
|
+
})
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
this.model.f_userfiles_id = this.row.f_userfiles_id
|
|
179
|
+
this.model.f_user_type = this.row.f_user_type
|
|
180
|
+
this.model.f_filialeid = this.$login.f.orgid
|
|
181
|
+
this.model.f_userinfo_id = this.row.f_userinfo_id
|
|
182
|
+
},
|
|
183
|
+
methods: {
|
|
184
|
+
priceChange (val) {
|
|
185
|
+
if (val.length > 0) {
|
|
186
|
+
// 展示气价备注
|
|
187
|
+
this.model.f_price_comments = val[0].f_comments ? val[0].f_comments : '无'
|
|
188
|
+
}
|
|
189
|
+
},
|
|
190
|
+
async confirm () {
|
|
191
|
+
this.model.f_gasbrand_id = this.model.f_gasmodel[0].f_gasbrand_id
|
|
192
|
+
this.model.f_gasmodel_id = this.model.f_gasmodel[0].id
|
|
193
|
+
this.model.f_price_id = this.model.f_price_name[0].f_price_id
|
|
194
|
+
this.model.f_gasproperties = this.model.f_price_name[0].f_gasproperties
|
|
195
|
+
this.model.f_user_type = this.model.f_price_name[0].f_user_type
|
|
196
|
+
this.model.f_user_name = this.row.f_user_name
|
|
197
|
+
this.model.f_user_phone = this.row.f_user_phone
|
|
198
|
+
this.model.f_meter_classify = this.model.f_gasbrand[0].f_meter_type
|
|
199
|
+
|
|
200
|
+
this.model.f_operator = this.$login.f.name
|
|
201
|
+
this.model.f_operatorid = this.$login.f.id
|
|
202
|
+
this.model.f_orgid = this.$login.f.orgid
|
|
203
|
+
this.model.f_orgname = this.$login.f.orgs
|
|
204
|
+
this.model.f_depid = this.$login.f.depids
|
|
205
|
+
this.model.f_depname = this.$login.f.deps
|
|
206
|
+
|
|
207
|
+
await this.$resetpost('rs/logic/file_complete', this.model, {resolveMsg: '档案信息已完善成功', rejectMsg: '档案信息完善失败'})
|
|
208
|
+
this.clean()
|
|
209
|
+
},
|
|
210
|
+
clean () {
|
|
211
|
+
this.$info('取消操作')
|
|
212
|
+
this.$dispatch('close', this.row)
|
|
213
|
+
},
|
|
214
|
+
|
|
215
|
+
printok () {
|
|
216
|
+
this.$dispatch('success')
|
|
217
|
+
},
|
|
218
|
+
validateBill (val) {
|
|
219
|
+
this.validateOk = !val.isOk
|
|
220
|
+
},
|
|
221
|
+
|
|
222
|
+
verifigasbrand () {
|
|
223
|
+
this.verifi()
|
|
224
|
+
},
|
|
225
|
+
verifi () {
|
|
226
|
+
if ((this.row == null) && (this.model.f_meternumber) && (this.model.f_gasbrand)) {
|
|
227
|
+
veri(this)
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
},
|
|
231
|
+
computed: {
|
|
232
|
+
meterbrands () {
|
|
233
|
+
return this.$GetSaleParam.getGasbrand()
|
|
234
|
+
},
|
|
235
|
+
getPricenames () {
|
|
236
|
+
let f_filialeid = this.$login.f.orgid
|
|
237
|
+
let result = []
|
|
238
|
+
this.$GetSaleParam.prices.forEach((item) => {
|
|
239
|
+
if (item.f_state === '有效' && f_filialeid == item.f_filialeid) {
|
|
240
|
+
let value = {
|
|
241
|
+
label: item.f_price_name,
|
|
242
|
+
value: item
|
|
243
|
+
}
|
|
244
|
+
result.push(value)
|
|
245
|
+
}
|
|
246
|
+
})
|
|
247
|
+
return Array.from(new Set(result))
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
</script>
|
|
252
|
+
|
|
253
|
+
<style>
|
|
254
|
+
</style>
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
<label for="f_collection" class=" font_normal_body"> 收款 </label>
|
|
90
90
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
91
91
|
v-validate:f_collection='{required: true, dctest: [model.f_totalcost, ">=" ] }'
|
|
92
|
-
v-el:sk v-scale="[model.f_totalcost,
|
|
92
|
+
v-el:sk v-scale="[model.f_totalcost, 2]">
|
|
93
93
|
</div>
|
|
94
94
|
<div class="col-sm-4" v-if="row.f_collection_type === '按金额'">
|
|
95
95
|
<label for="f_collection" class=" font_normal_body"> 收款 </label>
|
|
@@ -202,7 +202,7 @@
|
|
|
202
202
|
},
|
|
203
203
|
deleteAdjustImport (condition) {
|
|
204
204
|
console.log(condition)
|
|
205
|
-
return
|
|
205
|
+
return this.$resetpost('rs/logic/deleteAdjustImport', {condition: condition}, {resolveMsg: '删除成功', rejectMsg: '删除失败'})
|
|
206
206
|
},
|
|
207
207
|
isAll (page) {
|
|
208
208
|
// console.log(this.model.ids)
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
<template lang="html">
|
|
2
|
+
<div id="TableUsageChart">
|
|
3
|
+
<div id="TableUsageChart_chart" :style="{width:'100%',height:'98%'}"></div>
|
|
4
|
+
</div>
|
|
5
|
+
</template>
|
|
6
|
+
|
|
7
|
+
<script>
|
|
8
|
+
import echarts from 'echarts'
|
|
9
|
+
|
|
10
|
+
export default {
|
|
11
|
+
props: {
|
|
12
|
+
row: {}
|
|
13
|
+
},
|
|
14
|
+
data () {
|
|
15
|
+
return {}
|
|
16
|
+
},
|
|
17
|
+
methods: {
|
|
18
|
+
async searchdata () {
|
|
19
|
+
let param = {
|
|
20
|
+
f_userinfo_id: this.row.f_userinfo_id
|
|
21
|
+
}
|
|
22
|
+
let usage = await this.$resetpost('rs/logic/tableUsageChart', {data: param}, {resolveMsg: null, rejectMsg: '获取用气信息出错!'})
|
|
23
|
+
let xData = []
|
|
24
|
+
let YData = []
|
|
25
|
+
if (usage.data.length === 0) {
|
|
26
|
+
this.$showMessage('未查询到任何数据')
|
|
27
|
+
} else if (usage.data.length === 1) {
|
|
28
|
+
xData[0] = usage.data[0].min_date
|
|
29
|
+
xData[1] = usage.data[0].max_date
|
|
30
|
+
YData[0] = 0
|
|
31
|
+
YData[1] = usage.data[0].f_pregas
|
|
32
|
+
} else {
|
|
33
|
+
for (let row of usage.data) {
|
|
34
|
+
xData.push(row.min_date)
|
|
35
|
+
YData.push(row.f_pregas)
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
this.set(xData, YData)
|
|
39
|
+
},
|
|
40
|
+
set (xData, YData) {
|
|
41
|
+
this.xc = echarts.init(document.getElementById('TableUsageChart_chart'))
|
|
42
|
+
this.xc.setOption({
|
|
43
|
+
tooltip: {
|
|
44
|
+
trigger: 'axis'
|
|
45
|
+
},
|
|
46
|
+
toolbox: {
|
|
47
|
+
show: true,
|
|
48
|
+
feature: {
|
|
49
|
+
dataView: {show: true, readOnly: false},
|
|
50
|
+
magicType: {show: true, type: ['line', 'bar']},
|
|
51
|
+
restore: {show: true},
|
|
52
|
+
saveAsImage: {show: true}
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
xAxis: {
|
|
56
|
+
type: 'category',
|
|
57
|
+
data: xData
|
|
58
|
+
},
|
|
59
|
+
yAxis: {
|
|
60
|
+
type: 'value'
|
|
61
|
+
},
|
|
62
|
+
series: [{
|
|
63
|
+
data: YData,
|
|
64
|
+
type: 'line'
|
|
65
|
+
}]
|
|
66
|
+
})
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
ready () {
|
|
70
|
+
this.searchdata()
|
|
71
|
+
},
|
|
72
|
+
watch: {}
|
|
73
|
+
}
|
|
74
|
+
</script>
|
|
75
|
+
<style lang="less">
|
|
76
|
+
#TableUsageChart {
|
|
77
|
+
div{
|
|
78
|
+
height: auto;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
</style>
|
|
@@ -66,6 +66,9 @@
|
|
|
66
66
|
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
|
|
67
67
|
<meter-param :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
|
|
68
68
|
</saletab>
|
|
69
|
+
<saletab header="表使用量图表">
|
|
70
|
+
<table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
|
|
71
|
+
</saletab>
|
|
69
72
|
</saletabbut>
|
|
70
73
|
</div>
|
|
71
74
|
</div>
|