sale-client 4.2.78 → 4.2.79

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.78",
3
+ "version": "4.2.79",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -78,7 +78,7 @@
78
78
  import ChargeQueryUser from '../../../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
79
79
  import ChargeRecordQueryUser from '../../../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
80
80
  import FillCardQueryUser from '../../../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
81
- import HandQueryUser from '../../../../components/common/userinfo_detail/ic_detail/HandQueryUser'
81
+ import HandQueryUser from './ic_detail/HandQueryUser'
82
82
  import OtherChargeQueryUser from '../../../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
83
83
  import RecordQueryUser from './ic_detail/RecordQueryUser'
84
84
  import TransferQueryUser from '../../../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
@@ -0,0 +1,400 @@
1
+ <template >
2
+ <div class="flex" style="justify-content: space-between;">
3
+ <div @keyup.enter="search" style="">
4
+ <criteria-paged :model="model" v-ref:paged>
5
+ <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
6
+ <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
7
+ <div class="row">
8
+ <div class="col-sm-2 form-group">
9
+ <label class="font_normal_body" title="归属日期" >开始时间</label>
10
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
11
+ class="datepicker"
12
+ condition="f_hand_date >= '{} 00:00:00' "
13
+ placeholder="起始时间"
14
+ style="width:60%"
15
+ v-model="model.f_start_date"
16
+ ></datepicker>
17
+ </div>
18
+ <div class="col-sm-2 form-group" >
19
+ <label class="font_normal_body" title="归属日期">结束时间</label>
20
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
21
+ class="datepicker"
22
+ condition="f_hand_date <= '{} 23:59:59' "
23
+ placeholder="结束时间"
24
+ style="width:60%"
25
+ v-model="model.f_end_date"
26
+ ></datepicker>
27
+ </div>
28
+ <div class="col-sm-2 form-group">
29
+ <label class="font_normal_body">是否缴费</label>
30
+ <v-select :value.sync="model.f_whether_pay" v-model='model.f_whether_pay'
31
+ style="width:60%"
32
+ :options='$parent.$parent.whetherpaies' placeholder='是否缴费'
33
+ close-on-select
34
+ condition="f_whether_pay = '{}'"></v-select>
35
+ </div>
36
+ <div class="col-sm-2 form-group">
37
+ <label class="font_normal_body" title="抄表状态">抄表状态</label>
38
+ <v-select :value.sync="model.f_meter_state" v-model='model.f_meter_state'
39
+ style="width:60%"
40
+ :options='$parent.$parent.meterstates' placeholder='抄表状态'
41
+ close-on-select
42
+ condition="f_meter_state = '{}'"></v-select>
43
+ </div>
44
+ <div class="col-sm-2 form-group">
45
+ <label class="font_normal_body" title="表单状态">表单状态</label>
46
+ <v-select :value.sync="model.f_hand_state" v-model='model.f_hand_state'
47
+ style="width:60%"
48
+ :options='$parent.$parent.handstates' placeholder='表单状态'
49
+ close-on-select
50
+ condition="f_hand_state = '{}'"></v-select>
51
+ </div>
52
+
53
+ <div style="float: right">
54
+ <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
55
+ <button @click="$parent.$parent.batchCancel()" class="button_search" style="margin-right: 10px" v-el:cba>批量撤销</button>
56
+ <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
57
+ @print-data="$parent.$parent.print()"
58
+ :starthead="$parent.$parent.starthead"
59
+ titletable="预存气费打印明细"
60
+ ></print-data>
61
+ <export-excel :data="$parent.$parent.getCondition"
62
+ :field="$parent.$parent.fields"
63
+ sqlurl="api/af-revenue/logic/saleExport" sql-name="sale_HandplanQuery" template-name='抄表查询'
64
+ v-ref:exports
65
+ :choose-col="true">
66
+
67
+ </export-excel>
68
+ </div>
69
+ </div>
70
+
71
+
72
+ </div>
73
+
74
+ </criteria>
75
+ <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" partial='list' v-ref:grid>
76
+ <template partial='head'>
77
+ <tr>
78
+ <th>
79
+ <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)" :checked="$parent.$parent.$parent.selectAll" >
80
+ </th>
81
+ <th v-show="false"><nobr>抄表月份</nobr></th>
82
+ <th v-show="false"><nobr>用气周期</nobr></th>
83
+ <th><nobr>抄表日期</nobr></th>
84
+ <th><nobr>录入日期</nobr></th>
85
+ <th><nobr>上期底数</nobr></th>
86
+ <th><nobr>本期底数</nobr></th>
87
+ <th><nobr>上期余额</nobr></th>
88
+ <th><nobr>用气量</nobr></th>
89
+ <th><nobr>用气金额 </nobr></th>
90
+ <th><nobr>本期余额</nobr></th>
91
+ <th><nobr>是否缴费 </nobr></th>
92
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶单价 </nobr></th>
93
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶气量 </nobr></th>
94
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>二阶单价 </nobr></th>
95
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>二阶气量 </nobr></th>
96
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>三阶单价 </nobr></th>
97
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>三阶气量 </nobr></th>
98
+ <th><nobr>抄表状态 </nobr></th>
99
+ <th><nobr>抄表结果状态 </nobr></th>
100
+ <th><nobr>表单状态 </nobr></th>
101
+ <th><nobr>抄表员</nobr></th>
102
+ <th><nobr>录入员</nobr></th>
103
+ </tr>
104
+ </template>
105
+ <template partial='body' partial='list' v-ref:grid>
106
+ <tr>
107
+ <td style="text-align:center">
108
+ <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" @click="$parent.$parent.$parent.checkbox($index, $event)" :value="row" >
109
+ </td>
110
+ <td style="text-align:center" v-show="false">{{row.f_hand_date.substring(0,7)}}</td>
111
+ <th v-show="false"><nobr >{{row.datas}}</nobr></th>
112
+ <td style="text-align:center">{{row.f_hand_date}}</td>
113
+ <td style="text-align:center">{{row.f_input_date}}</td>
114
+ <td style="text-align:center">{{row.f_last_tablebase}}</td>
115
+ <td style="text-align:center">{{row.f_tablebase}}</td>
116
+ <td style="text-align:center">{{row.f_balance}}</td>
117
+ <td style="text-align:center">{{row.f_oughtamount}}</td>
118
+ <td style="text-align:center">{{row.f_oughtfee}}</td>
119
+ <td style="text-align:center">{{row.f_curbalance}}</td>
120
+ <td style="text-align:center">{{row.f_whether_pay}}</td>
121
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
122
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
123
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair2price}}</td>
124
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair2amount}}</td>
125
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair3price}}</td>
126
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair3amount}}</td>
127
+ <td style="text-align:center">{{row.f_meter_state}}</td>
128
+ <td style="text-align:center">{{row.f_result_state?row.f_result_state:''}}</td>
129
+ <td style="text-align:center">{{row.f_hand_state}}</td>
130
+ <td style="text-align:center">{{row.f_inputtor}}</td>
131
+ <td style="text-align:center">{{row.f_input_person}}</td>
132
+ </tr>
133
+ </template>
134
+ <template partial='foot'></template>
135
+ </data-grid>
136
+ </criteria-paged>
137
+
138
+ </div>
139
+ <table class="table-hover">
140
+ <tr class="table-bordered" style="position: relative">
141
+ <td
142
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
143
+ 汇总信息
144
+ </td>
145
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
146
+ 用气量合计:&emsp;{{model.sums.f_oughtamount}}
147
+ </td>
148
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
149
+ 用气金额合计:&emsp;{{model.sums.f_oughtfee}}
150
+ </td>
151
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
152
+ 一阶用气量合计:&emsp;{{model.sums.f_stairamount1}}
153
+ </td>
154
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
155
+ 一阶用气金额合计:&emsp;{{model.sums.f_stair1fee}}
156
+ </td>
157
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
158
+ 二阶用气量合计:&emsp;{{model.sums.f_stair2amount}}
159
+ </td>
160
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
161
+ 二阶用气金额合计:&emsp;{{model.sums.f_stair2fee}}
162
+ </td>
163
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
164
+ 三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
165
+ </td>
166
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
167
+ 三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}
168
+ </td>
169
+ <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
170
+ <!--欠费气量合计:&emsp;{{model.sums.f_totalowe_gas}}-->
171
+ <!--</td>-->
172
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
173
+ <!-- 欠费金额合计:&emsp;{{model.sums.f_qianfei_fee}}-->
174
+ <!-- </td>-->
175
+ </tr>
176
+ </table>
177
+ </div>
178
+
179
+ </template>
180
+
181
+ <script>
182
+ import {HttpResetClass, PagedList} from 'vue-client'
183
+ import co from 'co'
184
+
185
+ export default {
186
+ title: '抄表',
187
+ data () {
188
+ return {
189
+ condition: '1=1',
190
+ model: new PagedList('api/af-revenue/sql/sale_HandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
191
+ f_oughtfee: 0,
192
+ f_oughtamount: 0,
193
+ f_qianfei_fee: 0,
194
+ f_stairamount1: 0,
195
+ f_stair1fee: 0,
196
+ f_stair2amount: 0,
197
+ f_stair2fee: 0,
198
+ f_stair3amount: 0,
199
+ f_stair3fee: 0
200
+ }),
201
+ show: false,
202
+ lists: [],
203
+ splitInfo: false,
204
+ handInfo: [],
205
+ selecteds: [],
206
+ maxIndex: -1,
207
+ pages: [],
208
+ selectAll: false,
209
+ isDetail: false,
210
+ selectedRows: 0,
211
+ meterstates: this.$appdata.getParam('抄表状态') ? [{
212
+ label: '全部',
213
+ value: ''
214
+ }, ...this.$appdata.getParam('抄表状态')] : [],
215
+ handstates: this.$appdata.getParam('表单状态') ? [{
216
+ label: '全部',
217
+ value: ''
218
+ }, ...this.$appdata.getParam('表单状态')] : [],
219
+ // 控制单选
220
+ radio: [],
221
+ // 选中的页
222
+ all: [],
223
+ // row数据
224
+ rowsdata: [],
225
+ f_calculation: '',
226
+ searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
227
+ starthead: '',
228
+ fields: {'f_userinfo_code': '用户编号',
229
+ 'f_user_name': '姓名',
230
+ 'f_last_tablebase': '上期底数',
231
+ 'f_tablebase': '本期底数',
232
+ 'f_balance': '上期余额',
233
+ 'f_curbalance': '本期余额',
234
+ 'f_oughtamount': '用气量',
235
+ 'f_oughtfee': '用气金额',
236
+ 'f_qianfei_fee': '欠费金额合计',
237
+ 'f_detailprice': '结算明细',
238
+ 'datas': '用气周期',
239
+ 'money1': '违约金',
240
+ 'f_stair1price': '一阶单价',
241
+ 'f_stairamount1': '一阶用量',
242
+ 'f_stair2price': '二阶单价',
243
+ 'f_stair2amount': '二阶用量',
244
+ 'f_stair3price': '三阶单价',
245
+ 'f_stair3amount': '三阶用量',
246
+ 'f_oughtfee1': '应交金额',
247
+ 'f_inputtor': '抄表员',
248
+ 'f_input_date': '抄表日期',
249
+ 'f_whether_pay': '是否缴费',
250
+ 'f_hand_date': '录入时间'},
251
+ defaultfield: [
252
+ 'datas', 'f_last_tablebase', 'f_last_tablebase', 'f_oughtamount', 'f_oughtfee', 'f_oughtfee1', 'money1', 'price1'
253
+ ],
254
+ fooinfo: [
255
+ '单位',
256
+ '收款人'
257
+ ],
258
+ printModel: {
259
+ rows: []
260
+ }
261
+ }
262
+ },
263
+ props: ['row'],
264
+ ready () {
265
+ this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
266
+ this.f_calculation = this.row.f_calculation ? this.row.f_calculation : ''
267
+ console.log('123' + this.f_calculation)
268
+ this.$refs.paged.$refs.criteria.search()
269
+ // this.selecteds = this.model.rows
270
+ // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
271
+ for (let i in this.all) {
272
+ this.money += i.f_oughtamount
273
+ this.gas += i.f_oughtfee
274
+ }
275
+ },
276
+ methods: {
277
+ batchCancel(){
278
+ if(this.selecteds.length > 0){
279
+ let state = true
280
+ this.selecteds.forEach((row, index) => {
281
+ if(row.f_meter_state!=='已抄表'){
282
+ state = false
283
+ }
284
+ })
285
+ if(!state){
286
+ return this.$showMessage('请选择抄表状态为【已抄表】的记录进行冲正操作')
287
+ }
288
+ this.$showMessage(`您确定要冲正所选择的抄表记录吗?共${this.selecteds.length}条`, ['cancel', 'confirm']).then((res) => {
289
+ if (res === 'confirm') {
290
+ let param = {
291
+ f_hand_id: this.selecteds,
292
+ operInfo: {
293
+ f_operator: this.$login.f.name,
294
+ f_operatorid: this.$login.f.id,
295
+ f_orgid: this.$login.f.orgid,
296
+ f_orgname: this.$login.f.orgs,
297
+ f_depid: this.$login.f.depids,
298
+ f_depname: this.$login.f.deps
299
+ }
300
+ }
301
+ this.$resetpost('api/af-revenue/logic/batchCancelHand',{data:param}).then((res)=>{
302
+ this.search()
303
+ })
304
+ }
305
+ })
306
+ }else{
307
+ this.$showMessage('请选择需要冲正的记录')
308
+ }
309
+
310
+ },
311
+ checkbox (val, event) {
312
+ this.selecteds = []
313
+ if (event.target.checked === true) {
314
+ for (let i = 0; i <= val; i++) {
315
+ this.selecteds.push(this.model.rows[i])
316
+
317
+ }
318
+ } else if (event.target.checked === false) {
319
+ for (let i = 0; i <= val - 1; i++) {
320
+ this.selecteds.push(this.model.rows[i])
321
+
322
+ }
323
+ }
324
+ this.selectAll = (this.selecteds.length === this.model.rows.length)
325
+ },
326
+ addOrRemove (is) {
327
+ this.selecteds = []
328
+ if (!is) { // 添加本页所有数据到ids中
329
+ this.model.rows.forEach((row) => {
330
+ this.selecteds.push(row)
331
+ })
332
+ this.selectAll = true
333
+ } else { // 从ids中取消所有的数据
334
+ this.model.rows.forEach((row, index) => {
335
+ if (index <= this.maxIndex) {
336
+ this.selecteds.push(row)
337
+ }
338
+ })
339
+ this.selectAll = false
340
+ }
341
+ },
342
+ async search () {
343
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
344
+ this.model.search(this.condition, this.model)
345
+ let http = new HttpResetClass()
346
+ let res = await http.load('POST', 'api/af-revenue/sql/sale_HandplanQuery', {
347
+ data: {
348
+ condition: this.condition,
349
+ f_user_id: this.row.f_user_id
350
+ }
351
+ }, {resolveMsg: null, rejectMsg: null})
352
+ this.printModel.rows = res.data
353
+
354
+ this.starthead = '用户编号:' + this.row.f_userinfo_code + '&emsp;&emsp;用户姓名:' + this.row.f_user_name + '&emsp;&emsp;用户地址:' + this.row.f_address
355
+ },
356
+ // 多选框初始化
357
+ selectInit () {
358
+ this.rowsdata = []
359
+ this.all = []
360
+ this.radio = []
361
+ },
362
+ print () {
363
+ console.log('====================================')
364
+ console.log('print')
365
+ console.log(this.printModel)
366
+ this.selectInit()
367
+ }
368
+ },
369
+ watch: {
370
+ 'selecteds' () {
371
+ // 获取选中的行数
372
+ this.selectedRows = this.selecteds.length
373
+ }
374
+ },
375
+ computed: {
376
+ getCondition () {
377
+ return {
378
+ condition: this.condition,
379
+ f_user_id: this.row.f_user_id
380
+ }
381
+ },
382
+ whetherpaies () {
383
+ return [
384
+ {label: '全部', value: ''},
385
+ {label: '已缴费', value: '是'},
386
+ {label: '未缴费', value: '否'}
387
+ ]
388
+ },
389
+ ischecked () {
390
+ return function (index, i) {
391
+ if (!this.radio[index]) {
392
+ return false
393
+ }
394
+ return this.radio[index][i]
395
+ }
396
+ }
397
+ }
398
+ }
399
+ </script>
400
+
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- import FilialeSale from './filiale/jinhong/sale'
5
+ import FilialeSale from './filiale/meihekou/sale'
6
6
  import sale from './sale'
7
7
  import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'