manage-client 3.2.117 → 3.2.120
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 +2 -2
- package/package.json +1 -1
- package/src/components/SellReport/ManageBusSummary.vue +75 -59
- package/src/components/sale/businessquery/BusinessManage.vue +3 -0
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +1 -1
- package/src/components/sale/businessquery/ChargeQuery.vue +6 -0
- package/src/components/sale/businessquery/TransferRecordQuery.vue +179 -0
- package/src/components/sale/config/exportConfig.js +11 -2
- package/src/filiale/WEINAN/MeterQuery.vue +34 -7
- package/src/filiale/gaomi/MeterQuery.vue +37 -7
- package/src/filiale/gongyi/sale/filesquery/MeterQuery.vue +30 -7
- package/src/filiale/macheng/MeterQuery.vue +28 -5
- package/src/filiale/meihekou/UserQuery.vue +10 -0
- package/src/filiale/qingtongxia/MeterQuery.vue +30 -7
- package/src/filiale/tongchuan/MeterQuery.vue +31 -8
- package/src/saleManage.js +4 -0
package/build/dev-server.js
CHANGED
|
@@ -13,9 +13,9 @@ var compiler = webpack(config)
|
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
14
|
var shaoguan='http://119.146.1.106:8300/'
|
|
15
15
|
var qtx='http://36.103.222.144:6300/'
|
|
16
|
-
var bendi = 'http://
|
|
16
|
+
var bendi = 'http://127.0.0.1:8090'
|
|
17
17
|
// var bendi = 'http://172.168.1.11:9001'
|
|
18
|
-
var fuwu = 'http://
|
|
18
|
+
var fuwu = 'http://121.36.106.17:8400'
|
|
19
19
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
20
20
|
var system = 'http://192.168.50.4:8400'
|
|
21
21
|
//192.168.
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="basic-main" style="height: 100%">
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
6
|
<div class="row">
|
|
7
7
|
<div class="col-sm-2 form-group" >
|
|
@@ -59,59 +59,67 @@
|
|
|
59
59
|
</div>
|
|
60
60
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
61
61
|
<div class="col-sm-2 form-group">
|
|
62
|
-
<label class="font_normal_body"
|
|
63
|
-
<v-select :value.sync="$parent.$parent.
|
|
64
|
-
v-model="$parent.$parent.
|
|
65
|
-
:options='$parent.$parent.
|
|
66
|
-
condition="
|
|
62
|
+
<label class="font_normal_body">用户类型</label>
|
|
63
|
+
<v-select :value.sync="$parent.$parent.f_user_type"
|
|
64
|
+
v-model="$parent.$parent.f_user_type"
|
|
65
|
+
:options='$parent.$parent.user_type' placeholder='请选择'
|
|
66
|
+
condition="f_user_type = '{}'"
|
|
67
67
|
close-on-select></v-select>
|
|
68
68
|
</div>
|
|
69
|
+
<!--<div class="col-sm-2 form-group">-->
|
|
70
|
+
<!--<label class="font_normal_body">收费状态</label>-->
|
|
71
|
+
<!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
|
|
72
|
+
<!--v-model="$parent.$parent.f_state"-->
|
|
73
|
+
<!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
|
|
74
|
+
<!--condition="f_state in {}"-->
|
|
75
|
+
<!--close-on-select></v-select>-->
|
|
76
|
+
<!--</div>-->
|
|
69
77
|
</div>
|
|
70
78
|
</div>
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
79
|
+
</criteria>
|
|
80
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
81
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
82
|
+
<thead>
|
|
83
|
+
<tr>
|
|
84
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
85
|
+
<h3 style="text-align: center">收费结账报表</h3>
|
|
86
|
+
</th>
|
|
87
|
+
</tr>
|
|
88
|
+
<tr>
|
|
89
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
90
|
+
开始时间：{{model.model.startDate}}
|
|
91
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
92
|
+
<!--打印时间：{{{$parent.printTime}}}-->
|
|
93
|
+
打印时间：{{$parent.printTime}}
|
|
94
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
95
|
+
</th>
|
|
96
|
+
</tr>
|
|
97
|
+
<tr>
|
|
98
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
99
|
+
<div>
|
|
100
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
101
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
102
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
|
|
103
|
+
</div>
|
|
104
|
+
</th>
|
|
105
|
+
</tr>
|
|
106
|
+
</thead>
|
|
107
|
+
<tr>
|
|
108
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
109
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
110
|
+
</td>
|
|
111
|
+
</tr>
|
|
112
|
+
<tfoot>
|
|
113
|
+
<tr style="text-align: left">
|
|
114
|
+
<th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
|
|
115
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
|
|
116
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
|
|
117
|
+
</tr>
|
|
118
|
+
</tfoot>
|
|
119
|
+
</table>
|
|
120
|
+
{{{ $parent.reportStr}}}
|
|
121
|
+
</div>
|
|
122
|
+
</criteria-paged>
|
|
115
123
|
</div>
|
|
116
124
|
</template>
|
|
117
125
|
|
|
@@ -137,6 +145,7 @@
|
|
|
137
145
|
criteriaShow: false,
|
|
138
146
|
operatorname: '',
|
|
139
147
|
orgCondtionStr: '1=1',
|
|
148
|
+
f_user_type: '',
|
|
140
149
|
f_state:['有效'],
|
|
141
150
|
model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
142
151
|
f_orgid: 'this.model.f_orgid'}),
|
|
@@ -164,15 +173,19 @@
|
|
|
164
173
|
let orgcondition = '1=1'
|
|
165
174
|
let orgstr = this.orgCondtionStr
|
|
166
175
|
orgcondition = orgcondition + orgstr
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
if (this.f_depid && this.f_depid[0]) {
|
|
171
|
-
orgcondition += ' and f_depid in (' + this.f_depid + ')'
|
|
176
|
+
console.log('23231312321:',this.f_user_type)
|
|
177
|
+
if(this.f_user_type && this.f_user_type[0]) {
|
|
178
|
+
orgcondition += ` and f_user_type = '${ this.f_user_type} '`
|
|
172
179
|
}
|
|
173
|
-
if(this.
|
|
174
|
-
|
|
175
|
-
|
|
180
|
+
/* if (this.f_orgid && this.f_orgid[0]) {
|
|
181
|
+
orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
|
|
182
|
+
}
|
|
183
|
+
if (this.f_depid && this.f_depid[0]) {
|
|
184
|
+
orgcondition += ' and f_depid in (' + this.f_depid + ')'
|
|
185
|
+
}
|
|
186
|
+
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
187
|
+
orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
|
|
188
|
+
}*/
|
|
176
189
|
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
177
190
|
this.$refs.paged.search(args)
|
|
178
191
|
},
|
|
@@ -210,6 +223,9 @@
|
|
|
210
223
|
computed: {
|
|
211
224
|
charge_state() {
|
|
212
225
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
|
|
226
|
+
},
|
|
227
|
+
user_type () {
|
|
228
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
213
229
|
}
|
|
214
230
|
}
|
|
215
231
|
}
|
|
@@ -16,6 +16,9 @@
|
|
|
16
16
|
<tabs header="过户查询" v-if="permission('过户查询')">
|
|
17
17
|
<transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
|
|
18
18
|
</tabs>
|
|
19
|
+
<tabs header="记录转移查询" v-if="permission('记录转移')">
|
|
20
|
+
<transfer-record-query @deal-msg="dealMsg" :data="data"></transfer-record-query>
|
|
21
|
+
</tabs>
|
|
19
22
|
<tabs header="其他收费查询" v-if="permission('其他收费查询')">
|
|
20
23
|
<other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
|
|
21
24
|
</tabs>
|
|
@@ -396,7 +396,7 @@
|
|
|
396
396
|
</div>
|
|
397
397
|
<modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
|
|
398
398
|
<article slot="modal-body">
|
|
399
|
-
<upload :blodid="selected.
|
|
399
|
+
<upload :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
|
|
400
400
|
</article>
|
|
401
401
|
<footer slot="modal-footer" class="modal-footer">
|
|
402
402
|
</footer>
|
|
@@ -371,6 +371,9 @@
|
|
|
371
371
|
<th>
|
|
372
372
|
<nobr>卡号</nobr>
|
|
373
373
|
</th>
|
|
374
|
+
<th>
|
|
375
|
+
<nobr>气价名称</nobr>
|
|
376
|
+
</th>
|
|
374
377
|
<th>
|
|
375
378
|
<nobr>购气次数</nobr>
|
|
376
379
|
</th>
|
|
@@ -565,6 +568,9 @@
|
|
|
565
568
|
<td style="text-align: center;">
|
|
566
569
|
<nobr>{{row.f_card_id}}</nobr>
|
|
567
570
|
</td>
|
|
571
|
+
<td style="text-align: center;">
|
|
572
|
+
<nobr>{{row.f_price_name}}</nobr>
|
|
573
|
+
</td>
|
|
568
574
|
<td style="text-align: center;">
|
|
569
575
|
<nobr>{{row.f_times}}</nobr>
|
|
570
576
|
</td>
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main" @keyup.enter="search">
|
|
4
|
+
<div class="flex" v-if="!show" >
|
|
5
|
+
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
|
+
<div class="row">
|
|
10
|
+
<div class="col-sm-2 form-group">
|
|
11
|
+
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
12
|
+
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
13
|
+
v-model="model.startDate"
|
|
14
|
+
:value.sync="model.startDate"
|
|
15
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
+
:show-reset-button="true"
|
|
17
|
+
condition="ttr.f_operate_date >= '{}'">
|
|
18
|
+
</datepicker>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="col-sm-2 form-group">
|
|
21
|
+
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
22
|
+
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
23
|
+
v-model="model.endDate"
|
|
24
|
+
:value.sync="model.endDate"
|
|
25
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
+
:show-reset-button="true"
|
|
27
|
+
condition="ttr.f_operate_date <= '{}'">
|
|
28
|
+
</datepicker>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="col-sm-2 form-group">
|
|
31
|
+
<label class="font_normal_body">转出方编号</label>
|
|
32
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.out_userinfo_code"
|
|
33
|
+
condition="out_userinfo_code = '{}'" placeholder="转出方编号">
|
|
34
|
+
</div>
|
|
35
|
+
<div class="col-sm-2 form-group">
|
|
36
|
+
<label class="font_normal_body" title="转入方编号">转入方编号</label>
|
|
37
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.in_userinfo_code"
|
|
38
|
+
condition="in_userinfo_code = '{}' " placeholder="转入方编号">
|
|
39
|
+
</div>
|
|
40
|
+
<div class="span" style="float:right;">
|
|
41
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
42
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
43
|
+
<export-excel :data="$parent.$parent.getCondition"
|
|
44
|
+
:field="$parent.$parent.getfield"
|
|
45
|
+
sqlurl="rs/logic/exportfile" sql-name="transferRecordQuery" template-name='转移记录查询导出'
|
|
46
|
+
:choose-col="true"></export-excel>
|
|
47
|
+
<!-- <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"-->
|
|
48
|
+
<!-- :defaultfield="$parent.$parent.defaultfield"-->
|
|
49
|
+
<!-- titletable="过户记录"-->
|
|
50
|
+
<!-- :sumsmodel="$parent.$parent.sumsmodel"></print-data>-->
|
|
51
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
52
|
+
</div>
|
|
53
|
+
</div>
|
|
54
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
55
|
+
<res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
56
|
+
<div class="col-sm-2 form-group">
|
|
57
|
+
<label class="font_normal_body">转出方姓名</label>
|
|
58
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.out_user_name"
|
|
59
|
+
placeholder="转出方姓名"
|
|
60
|
+
condition="out_user_name like '%{}%'">
|
|
61
|
+
</div>
|
|
62
|
+
<div class="col-sm-2 form-group">
|
|
63
|
+
<label class="font_normal_body">转入方姓名</label>
|
|
64
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.in_user_name"
|
|
65
|
+
condition="in_user_name like '%{}%' " placeholder="转入方姓名">
|
|
66
|
+
</div>
|
|
67
|
+
</div>
|
|
68
|
+
</div>
|
|
69
|
+
</criteria>
|
|
70
|
+
|
|
71
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
|
|
72
|
+
<template partial='head'>
|
|
73
|
+
<tr>
|
|
74
|
+
<th> <nobr>转入方姓名</nobr> </th>
|
|
75
|
+
<th> <nobr>转入方编号</nobr> </th>
|
|
76
|
+
<th> <nobr>转出方姓名</nobr> </th>
|
|
77
|
+
<th> <nobr>转出方编号</nobr> </th>
|
|
78
|
+
<th> <nobr>转移时间</nobr> </th>
|
|
79
|
+
<th> <nobr>备注</nobr> </th>
|
|
80
|
+
<th> <nobr>操作员</nobr> </th>
|
|
81
|
+
<th> <nobr>部门</nobr> </th>
|
|
82
|
+
<th> <nobr>公司</nobr> </th>
|
|
83
|
+
</tr>
|
|
84
|
+
</template>
|
|
85
|
+
<template partial='body'>
|
|
86
|
+
<td style="text-align: center;"> <nobr>{{row.in_user_name}}</nobr> </td>
|
|
87
|
+
<td style="text-align: center;"> <nobr>{{row.in_userinfo_code}}</nobr> </td>
|
|
88
|
+
<td style="text-align: center;"> <nobr>{{row.out_user_name}}</nobr> </td>
|
|
89
|
+
<td style="text-align: center;"> <nobr>{{row.out_userinfo_code}}</nobr> </td>
|
|
90
|
+
<td style="text-align: center;"> <nobr>{{row.f_operate_date}}</nobr> </td>
|
|
91
|
+
<td style="text-align: center;"> <nobr>{{row.f_comments}}</nobr> </td>
|
|
92
|
+
<td style="text-align: center;"> <nobr>{{row.f_operator}}</nobr> </td>
|
|
93
|
+
<td style="text-align: center;"> <nobr>{{row.f_depname}}</nobr> </td>
|
|
94
|
+
<td style="text-align: center;"> <nobr>{{row.f_orgname}}</nobr> </td>
|
|
95
|
+
</template>
|
|
96
|
+
</data-grid>
|
|
97
|
+
</criteria-paged>
|
|
98
|
+
</div>
|
|
99
|
+
</div>
|
|
100
|
+
</div>
|
|
101
|
+
</template>
|
|
102
|
+
|
|
103
|
+
<script>
|
|
104
|
+
import {PagedList} from 'vue-client'
|
|
105
|
+
import exportConfig from '../config/exportConfig'
|
|
106
|
+
|
|
107
|
+
let readySomething = async function (self) {
|
|
108
|
+
self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
109
|
+
self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
110
|
+
}
|
|
111
|
+
export default {
|
|
112
|
+
props:['data'],
|
|
113
|
+
title: '记录转移查询',
|
|
114
|
+
data() {
|
|
115
|
+
return {
|
|
116
|
+
data: {},
|
|
117
|
+
other:[],
|
|
118
|
+
footer:[],
|
|
119
|
+
show:false,
|
|
120
|
+
rowdata:{},
|
|
121
|
+
model: new PagedList('rs/sql/transferRecordQuery', 20, ),
|
|
122
|
+
criteriaShow: false,
|
|
123
|
+
initres: {
|
|
124
|
+
org:[this.$login.f.orgid],
|
|
125
|
+
dep:[],
|
|
126
|
+
user:[],
|
|
127
|
+
},
|
|
128
|
+
orgCondtionStr: '',
|
|
129
|
+
all: false,
|
|
130
|
+
fields: {},
|
|
131
|
+
thead: '',
|
|
132
|
+
tfoot: '',
|
|
133
|
+
showupload:false,
|
|
134
|
+
selected:{},
|
|
135
|
+
sumsmodel: {}
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
ready() {
|
|
139
|
+
readySomething(this).then(() => {
|
|
140
|
+
this.$emit('ready')
|
|
141
|
+
}).catch((error) => {
|
|
142
|
+
this.$emit('error', error)
|
|
143
|
+
})
|
|
144
|
+
},
|
|
145
|
+
methods: {
|
|
146
|
+
search(){
|
|
147
|
+
this.$refs.paged.$refs.cri.search()
|
|
148
|
+
},
|
|
149
|
+
async selfSearch(args) {
|
|
150
|
+
if (this.data) {
|
|
151
|
+
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
152
|
+
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
153
|
+
}
|
|
154
|
+
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
155
|
+
await this.model.search(args.condition, args.model)
|
|
156
|
+
},
|
|
157
|
+
show() {
|
|
158
|
+
this.criteriaShow = true
|
|
159
|
+
},
|
|
160
|
+
hidden() {
|
|
161
|
+
this.criteriaShow = !this.criteriaShow
|
|
162
|
+
},
|
|
163
|
+
getRes(obj) {
|
|
164
|
+
this.orgCondtionStr = obj
|
|
165
|
+
}
|
|
166
|
+
},
|
|
167
|
+
watch: { },
|
|
168
|
+
computed: {
|
|
169
|
+
getCondition() {
|
|
170
|
+
return {
|
|
171
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
|
|
172
|
+
}
|
|
173
|
+
},
|
|
174
|
+
getfield() {
|
|
175
|
+
return exportConfig.transferRecordConfig
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
</script>
|
|
@@ -87,7 +87,7 @@ export default{
|
|
|
87
87
|
},
|
|
88
88
|
chargeConfig: {
|
|
89
89
|
'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
|
|
90
|
-
'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
|
|
90
|
+
'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
|
|
91
91
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
|
|
92
92
|
'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
|
|
93
93
|
'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
@@ -292,7 +292,7 @@ export default{
|
|
|
292
292
|
'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_operate_date': '收费日期'
|
|
293
293
|
},
|
|
294
294
|
cardhandplanConfig: {
|
|
295
|
-
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
|
|
295
|
+
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
|
|
296
296
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_real_amount': '用气量', 'f_total_gas': '总购气量',
|
|
297
297
|
'f_yuliang': '余量', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期',
|
|
298
298
|
'f_meter_state': '抄表状态', 'f_operator': '操作员', 'f_depname': '部门'
|
|
@@ -376,6 +376,11 @@ export default{
|
|
|
376
376
|
'f_pregas': '预购气量', 'f_preamount': '预购金额', 'f_collection': '实交金额', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
|
|
377
377
|
'f_hand_number': '抄表次数', 'f_date': '抄表区间', 'f_input_day': '天数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_usetype': '使用类型'
|
|
378
378
|
},
|
|
379
|
+
notgasConfig: {
|
|
380
|
+
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
|
|
381
|
+
'f_idnumber': '证件号码', 'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_residential_area': '小区',
|
|
382
|
+
'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型','f_oughtamount': '用气量'
|
|
383
|
+
},
|
|
379
384
|
handRateConfig: {
|
|
380
385
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_address': '客户地址',
|
|
381
386
|
'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_classify': '气表类型',
|
|
@@ -393,6 +398,10 @@ export default{
|
|
|
393
398
|
'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
|
|
394
399
|
'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
|
|
395
400
|
},
|
|
401
|
+
transferRecordConfig: {
|
|
402
|
+
'in_userinfo_code': '转入方编号', 'in_user_name': '转入方名称', 'out_userinfo_code': '转出方编号', 'out_user_name': '转出方名称',
|
|
403
|
+
'f_operate_date': '转移日期', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
|
|
404
|
+
},
|
|
396
405
|
transferPrintConfig: {
|
|
397
406
|
'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_address': '客户地址',
|
|
398
407
|
'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -259,7 +259,8 @@
|
|
|
259
259
|
<template partial='head'>
|
|
260
260
|
<tr>
|
|
261
261
|
<th>
|
|
262
|
-
|
|
262
|
+
<!--<nobr>客户编号</nobr>-->
|
|
263
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
263
264
|
</th>
|
|
264
265
|
<th>
|
|
265
266
|
<nobr>客户名称</nobr>
|
|
@@ -271,7 +272,8 @@
|
|
|
271
272
|
<nobr>身份证号</nobr>
|
|
272
273
|
</th>
|
|
273
274
|
<th>
|
|
274
|
-
|
|
275
|
+
<!--<nobr>客户地址</nobr>-->
|
|
276
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
275
277
|
</th>
|
|
276
278
|
<th>
|
|
277
279
|
<nobr>表册片区</nobr>
|
|
@@ -315,10 +317,12 @@
|
|
|
315
317
|
<nobr>通气人</nobr>
|
|
316
318
|
</th>
|
|
317
319
|
<th>
|
|
318
|
-
|
|
320
|
+
<!--<nobr>通气时间</nobr>-->
|
|
321
|
+
<data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
319
322
|
</th>
|
|
320
323
|
<th>
|
|
321
|
-
|
|
324
|
+
<!--<nobr>建表时间</nobr>-->
|
|
325
|
+
<data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
322
326
|
</th>
|
|
323
327
|
<th>
|
|
324
328
|
<nobr>气表状态</nobr>
|
|
@@ -512,7 +516,7 @@
|
|
|
512
516
|
isSingleUser: null,
|
|
513
517
|
other:[],
|
|
514
518
|
footer:[],
|
|
515
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
519
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
516
520
|
criteriaShow: false,
|
|
517
521
|
orgCondtionStr: '',
|
|
518
522
|
|
|
@@ -520,6 +524,11 @@
|
|
|
520
524
|
printshow: false,
|
|
521
525
|
all: false,
|
|
522
526
|
fields: {},
|
|
527
|
+
//排序
|
|
528
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
529
|
+
orderFields: {
|
|
530
|
+
f_userinfo_id: 'no'
|
|
531
|
+
},
|
|
523
532
|
thead: '',
|
|
524
533
|
tfoot: '',
|
|
525
534
|
initres: {
|
|
@@ -766,6 +775,24 @@
|
|
|
766
775
|
})
|
|
767
776
|
}
|
|
768
777
|
},
|
|
778
|
+
sort (field, rule) {
|
|
779
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
780
|
+
for (let key in this.orderFields) {
|
|
781
|
+
if (key === field) {
|
|
782
|
+
this.orderFields[key] = rule
|
|
783
|
+
} else {
|
|
784
|
+
this.orderFields[key] = 'no'
|
|
785
|
+
}
|
|
786
|
+
}
|
|
787
|
+
// 如果新规则不排序，还原为默认排序
|
|
788
|
+
if (rule === 'no') {
|
|
789
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
790
|
+
} else {
|
|
791
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
792
|
+
}
|
|
793
|
+
|
|
794
|
+
this.search()
|
|
795
|
+
}
|
|
769
796
|
},
|
|
770
797
|
watch: {
|
|
771
798
|
'model.rows.length' () {
|
|
@@ -854,7 +881,7 @@
|
|
|
854
881
|
}
|
|
855
882
|
},
|
|
856
883
|
getCondition() {
|
|
857
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
884
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
858
885
|
},
|
|
859
886
|
getfield() {
|
|
860
887
|
let data = {}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -212,7 +212,8 @@
|
|
|
212
212
|
<template partial='head'>
|
|
213
213
|
<tr>
|
|
214
214
|
<th>
|
|
215
|
-
|
|
215
|
+
<!--<nobr>客户编号</nobr>-->
|
|
216
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
216
217
|
</th>
|
|
217
218
|
<th>
|
|
218
219
|
<nobr>客户名称</nobr>
|
|
@@ -224,7 +225,11 @@
|
|
|
224
225
|
<nobr>身份证号</nobr>
|
|
225
226
|
</th>
|
|
226
227
|
<th>
|
|
227
|
-
|
|
228
|
+
<!--<nobr>客户地址</nobr>-->
|
|
229
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
230
|
+
</th>
|
|
231
|
+
<th>
|
|
232
|
+
<nobr>表册片区</nobr>
|
|
228
233
|
</th>
|
|
229
234
|
<th>
|
|
230
235
|
<nobr>表上余额</nobr>
|
|
@@ -265,10 +270,12 @@
|
|
|
265
270
|
<nobr>通气人</nobr>
|
|
266
271
|
</th>
|
|
267
272
|
<th>
|
|
268
|
-
|
|
273
|
+
<!--<nobr>通气时间</nobr>-->
|
|
274
|
+
<data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
269
275
|
</th>
|
|
270
276
|
<th>
|
|
271
|
-
|
|
277
|
+
<!--<nobr>建表时间</nobr>-->
|
|
278
|
+
<data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
272
279
|
</th>
|
|
273
280
|
<th>
|
|
274
281
|
<nobr>气表状态</nobr>
|
|
@@ -447,7 +454,7 @@
|
|
|
447
454
|
isSingleUser: null,
|
|
448
455
|
other:[],
|
|
449
456
|
footer:[],
|
|
450
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
457
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
451
458
|
criteriaShow: false,
|
|
452
459
|
orgCondtionStr: '',
|
|
453
460
|
|
|
@@ -455,6 +462,11 @@
|
|
|
455
462
|
printshow: false,
|
|
456
463
|
all: false,
|
|
457
464
|
fields: {},
|
|
465
|
+
//排序
|
|
466
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
467
|
+
orderFields: {
|
|
468
|
+
f_userinfo_id: 'no'
|
|
469
|
+
},
|
|
458
470
|
thead: '',
|
|
459
471
|
tfoot: '',
|
|
460
472
|
initres: {
|
|
@@ -674,6 +686,24 @@
|
|
|
674
686
|
})
|
|
675
687
|
}
|
|
676
688
|
},
|
|
689
|
+
sort (field, rule) {
|
|
690
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
691
|
+
for (let key in this.orderFields) {
|
|
692
|
+
if (key === field) {
|
|
693
|
+
this.orderFields[key] = rule
|
|
694
|
+
} else {
|
|
695
|
+
this.orderFields[key] = 'no'
|
|
696
|
+
}
|
|
697
|
+
}
|
|
698
|
+
// 如果新规则不排序，还原为默认排序
|
|
699
|
+
if (rule === 'no') {
|
|
700
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
701
|
+
} else {
|
|
702
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
703
|
+
}
|
|
704
|
+
|
|
705
|
+
this.search()
|
|
706
|
+
}
|
|
677
707
|
},
|
|
678
708
|
watch: {
|
|
679
709
|
'model.rows.length' () {
|
|
@@ -759,7 +789,7 @@
|
|
|
759
789
|
}
|
|
760
790
|
},
|
|
761
791
|
getCondition() {
|
|
762
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
792
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
763
793
|
},
|
|
764
794
|
getfield() {
|
|
765
795
|
let data = {}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
<template partial='head'>
|
|
196
196
|
<tr>
|
|
197
197
|
<th>
|
|
198
|
-
<
|
|
198
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
199
199
|
</th>
|
|
200
200
|
<th>
|
|
201
201
|
<nobr>客户名称</nobr>
|
|
@@ -204,7 +204,7 @@
|
|
|
204
204
|
<nobr>客户电话</nobr>
|
|
205
205
|
</th>
|
|
206
206
|
<th>
|
|
207
|
-
<
|
|
207
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
208
208
|
</th>
|
|
209
209
|
<th>
|
|
210
210
|
<nobr>表上余额</nobr>
|
|
@@ -240,10 +240,10 @@
|
|
|
240
240
|
<nobr>通气人</nobr>
|
|
241
241
|
</th>
|
|
242
242
|
<th>
|
|
243
|
-
<
|
|
243
|
+
<data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
244
244
|
</th>
|
|
245
245
|
<th>
|
|
246
|
-
<
|
|
246
|
+
<data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
247
247
|
</th>
|
|
248
248
|
<th>
|
|
249
249
|
<nobr>气表状态</nobr>
|
|
@@ -384,7 +384,7 @@
|
|
|
384
384
|
return {
|
|
385
385
|
other:[],
|
|
386
386
|
footer:[],
|
|
387
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
387
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
388
388
|
criteriaShow: false,
|
|
389
389
|
orgCondtionStr: '',
|
|
390
390
|
|
|
@@ -392,6 +392,11 @@
|
|
|
392
392
|
printshow: false,
|
|
393
393
|
all: false,
|
|
394
394
|
fields: {},
|
|
395
|
+
//排序
|
|
396
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
397
|
+
orderFields: {
|
|
398
|
+
f_userinfo_id: 'no'
|
|
399
|
+
},
|
|
395
400
|
thead: '',
|
|
396
401
|
tfoot: '',
|
|
397
402
|
initres: {
|
|
@@ -549,6 +554,24 @@
|
|
|
549
554
|
await this.$MagLoadParams.loadParam(this.f_filialeid)
|
|
550
555
|
this.initParams()
|
|
551
556
|
},
|
|
557
|
+
sort (field, rule) {
|
|
558
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
559
|
+
for (let key in this.orderFields) {
|
|
560
|
+
if (key === field) {
|
|
561
|
+
this.orderFields[key] = rule
|
|
562
|
+
} else {
|
|
563
|
+
this.orderFields[key] = 'no'
|
|
564
|
+
}
|
|
565
|
+
}
|
|
566
|
+
// 如果新规则不排序，还原为默认排序
|
|
567
|
+
if (rule === 'no') {
|
|
568
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
569
|
+
} else {
|
|
570
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
this.search()
|
|
574
|
+
}
|
|
552
575
|
},
|
|
553
576
|
watch: {
|
|
554
577
|
'all'(val) {
|
|
@@ -629,7 +652,7 @@
|
|
|
629
652
|
}
|
|
630
653
|
},
|
|
631
654
|
getCondition() {
|
|
632
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
655
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
633
656
|
},
|
|
634
657
|
getfield() {
|
|
635
658
|
let data = {}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -255,7 +255,7 @@
|
|
|
255
255
|
<template partial='head'>
|
|
256
256
|
<tr>
|
|
257
257
|
<th>
|
|
258
|
-
<
|
|
258
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
259
259
|
</th>
|
|
260
260
|
<th>
|
|
261
261
|
<nobr>客户名称</nobr>
|
|
@@ -267,7 +267,7 @@
|
|
|
267
267
|
<nobr>身份证号</nobr>
|
|
268
268
|
</th>
|
|
269
269
|
<th>
|
|
270
|
-
<
|
|
270
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
271
271
|
</th>
|
|
272
272
|
<th>
|
|
273
273
|
<nobr>表册片区</nobr>
|
|
@@ -496,7 +496,7 @@
|
|
|
496
496
|
isSingleUser: null,
|
|
497
497
|
other:[],
|
|
498
498
|
footer:[],
|
|
499
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
499
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
500
500
|
criteriaShow: false,
|
|
501
501
|
orgCondtionStr: '',
|
|
502
502
|
|
|
@@ -504,6 +504,11 @@
|
|
|
504
504
|
printshow: false,
|
|
505
505
|
all: false,
|
|
506
506
|
fields: {},
|
|
507
|
+
//排序
|
|
508
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
509
|
+
orderFields: {
|
|
510
|
+
f_userinfo_id: 'no'
|
|
511
|
+
},
|
|
507
512
|
thead: '',
|
|
508
513
|
tfoot: '',
|
|
509
514
|
initres: {
|
|
@@ -750,6 +755,24 @@
|
|
|
750
755
|
})
|
|
751
756
|
}
|
|
752
757
|
},
|
|
758
|
+
sort (field, rule) {
|
|
759
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
760
|
+
for (let key in this.orderFields) {
|
|
761
|
+
if (key === field) {
|
|
762
|
+
this.orderFields[key] = rule
|
|
763
|
+
} else {
|
|
764
|
+
this.orderFields[key] = 'no'
|
|
765
|
+
}
|
|
766
|
+
}
|
|
767
|
+
// 如果新规则不排序，还原为默认排序
|
|
768
|
+
if (rule === 'no') {
|
|
769
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
770
|
+
} else {
|
|
771
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
772
|
+
}
|
|
773
|
+
|
|
774
|
+
this.search()
|
|
775
|
+
}
|
|
753
776
|
},
|
|
754
777
|
watch: {
|
|
755
778
|
'model.rows.length' () {
|
|
@@ -835,7 +858,7 @@
|
|
|
835
858
|
}
|
|
836
859
|
},
|
|
837
860
|
getCondition() {
|
|
838
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
861
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
839
862
|
},
|
|
840
863
|
getfield() {
|
|
841
864
|
let data = {}
|
|
@@ -56,6 +56,13 @@
|
|
|
56
56
|
condition="f_user_state = '{}'"
|
|
57
57
|
close-on-select></v-select>
|
|
58
58
|
</div>
|
|
59
|
+
<div class="col-sm-2 form-group">
|
|
60
|
+
<label class="font_normal_body">用户类型</label>
|
|
61
|
+
<v-select :value.sync="model.f_user_type"
|
|
62
|
+
v-model="model.f_user_type" condition="f_user_type = '{}'"
|
|
63
|
+
:options='$parent.$parent.userTypes' placeholder='请选择'
|
|
64
|
+
close-on-select></v-select>
|
|
65
|
+
</div>
|
|
59
66
|
<div class="col-sm-2 form-group">
|
|
60
67
|
<label class="font_normal_body"> 人数 </label>
|
|
61
68
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
|
|
@@ -756,6 +763,9 @@
|
|
|
756
763
|
}
|
|
757
764
|
return [{label: '全部', value: ''}, ...rs]
|
|
758
765
|
},
|
|
766
|
+
userTypes () {
|
|
767
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
768
|
+
},
|
|
759
769
|
userstates() {
|
|
760
770
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
|
|
761
771
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
<template partial='head'>
|
|
220
220
|
<tr>
|
|
221
221
|
<th>
|
|
222
|
-
<
|
|
222
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
223
223
|
</th>
|
|
224
224
|
<th>
|
|
225
225
|
<nobr>客户名称</nobr>
|
|
@@ -231,7 +231,7 @@
|
|
|
231
231
|
<nobr>身份证号</nobr>
|
|
232
232
|
</th>
|
|
233
233
|
<th>
|
|
234
|
-
<
|
|
234
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
235
235
|
</th>
|
|
236
236
|
<th>
|
|
237
237
|
<nobr>表上余额</nobr>
|
|
@@ -269,10 +269,10 @@
|
|
|
269
269
|
<nobr>通气人</nobr>
|
|
270
270
|
</th>
|
|
271
271
|
<th>
|
|
272
|
-
<
|
|
272
|
+
<data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
273
273
|
</th>
|
|
274
274
|
<th>
|
|
275
|
-
<
|
|
275
|
+
<data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
276
276
|
</th>
|
|
277
277
|
<th>
|
|
278
278
|
<nobr>气表状态</nobr>
|
|
@@ -447,7 +447,7 @@
|
|
|
447
447
|
isSingleUser: null,
|
|
448
448
|
other:[],
|
|
449
449
|
footer:[],
|
|
450
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
450
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
451
451
|
criteriaShow: false,
|
|
452
452
|
orgCondtionStr: '',
|
|
453
453
|
|
|
@@ -455,6 +455,11 @@
|
|
|
455
455
|
printshow: false,
|
|
456
456
|
all: false,
|
|
457
457
|
fields: {},
|
|
458
|
+
//排序
|
|
459
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
460
|
+
orderFields: {
|
|
461
|
+
f_userinfo_id: 'no'
|
|
462
|
+
},
|
|
458
463
|
thead: '',
|
|
459
464
|
tfoot: '',
|
|
460
465
|
initres: {
|
|
@@ -674,6 +679,24 @@
|
|
|
674
679
|
})
|
|
675
680
|
}
|
|
676
681
|
},
|
|
682
|
+
sort (field, rule) {
|
|
683
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
684
|
+
for (let key in this.orderFields) {
|
|
685
|
+
if (key === field) {
|
|
686
|
+
this.orderFields[key] = rule
|
|
687
|
+
} else {
|
|
688
|
+
this.orderFields[key] = 'no'
|
|
689
|
+
}
|
|
690
|
+
}
|
|
691
|
+
// 如果新规则不排序，还原为默认排序
|
|
692
|
+
if (rule === 'no') {
|
|
693
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
694
|
+
} else {
|
|
695
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
696
|
+
}
|
|
697
|
+
|
|
698
|
+
this.search()
|
|
699
|
+
}
|
|
677
700
|
},
|
|
678
701
|
watch: {
|
|
679
702
|
'model.rows.length' () {
|
|
@@ -759,7 +782,7 @@
|
|
|
759
782
|
}
|
|
760
783
|
},
|
|
761
784
|
getCondition() {
|
|
762
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
785
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
763
786
|
},
|
|
764
787
|
getfield() {
|
|
765
788
|
let data = {}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" v-if="!show">
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
<template partial='head'>
|
|
267
267
|
<tr>
|
|
268
268
|
<th>
|
|
269
|
-
<
|
|
269
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
270
270
|
</th>
|
|
271
271
|
<th>
|
|
272
272
|
<nobr>客户名称</nobr>
|
|
@@ -281,7 +281,7 @@
|
|
|
281
281
|
<nobr>身份证号</nobr>
|
|
282
282
|
</th>
|
|
283
283
|
<th>
|
|
284
|
-
<
|
|
284
|
+
<data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
285
285
|
</th>
|
|
286
286
|
<th>
|
|
287
287
|
<nobr>表册片区</nobr>
|
|
@@ -325,10 +325,10 @@
|
|
|
325
325
|
<nobr>通气人</nobr>
|
|
326
326
|
</th>
|
|
327
327
|
<th>
|
|
328
|
-
<
|
|
328
|
+
<data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
329
329
|
</th>
|
|
330
330
|
<th>
|
|
331
|
-
<
|
|
331
|
+
<data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
332
332
|
</th>
|
|
333
333
|
<th>
|
|
334
334
|
<nobr>气表状态</nobr>
|
|
@@ -512,7 +512,7 @@
|
|
|
512
512
|
isSingleUser: null,
|
|
513
513
|
other:[],
|
|
514
514
|
footer:[],
|
|
515
|
-
model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
|
|
515
|
+
model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
|
|
516
516
|
criteriaShow: false,
|
|
517
517
|
orgCondtionStr: '',
|
|
518
518
|
|
|
@@ -520,6 +520,11 @@
|
|
|
520
520
|
printshow: false,
|
|
521
521
|
all: false,
|
|
522
522
|
fields: {},
|
|
523
|
+
//排序
|
|
524
|
+
orderitem:'f_user_id,f_table_state desc',
|
|
525
|
+
orderFields: {
|
|
526
|
+
f_userinfo_id: 'no'
|
|
527
|
+
},
|
|
523
528
|
thead: '',
|
|
524
529
|
tfoot: '',
|
|
525
530
|
initres: {
|
|
@@ -767,6 +772,24 @@
|
|
|
767
772
|
})
|
|
768
773
|
}
|
|
769
774
|
},
|
|
775
|
+
sort (field, rule) {
|
|
776
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
777
|
+
for (let key in this.orderFields) {
|
|
778
|
+
if (key === field) {
|
|
779
|
+
this.orderFields[key] = rule
|
|
780
|
+
} else {
|
|
781
|
+
this.orderFields[key] = 'no'
|
|
782
|
+
}
|
|
783
|
+
}
|
|
784
|
+
// 如果新规则不排序，还原为默认排序
|
|
785
|
+
if (rule === 'no') {
|
|
786
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
787
|
+
} else {
|
|
788
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
789
|
+
}
|
|
790
|
+
|
|
791
|
+
this.search()
|
|
792
|
+
},
|
|
770
793
|
async getpcd(){
|
|
771
794
|
let HttpReset = new HttpResetClass()
|
|
772
795
|
console.log('开始获取区域')
|
|
@@ -840,7 +863,7 @@
|
|
|
840
863
|
}
|
|
841
864
|
this.updateParams()
|
|
842
865
|
}
|
|
843
|
-
}
|
|
866
|
+
}
|
|
844
867
|
},
|
|
845
868
|
computed: {
|
|
846
869
|
authArr () {
|
|
@@ -876,7 +899,7 @@
|
|
|
876
899
|
}
|
|
877
900
|
},
|
|
878
901
|
getCondition() {
|
|
879
|
-
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
902
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
|
|
880
903
|
},
|
|
881
904
|
getfield() {
|
|
882
905
|
let data = {}
|
package/src/saleManage.js
CHANGED
|
@@ -168,6 +168,10 @@ export default function (filiale) {
|
|
|
168
168
|
Vue.component('transfer-query', (resolve) => {
|
|
169
169
|
require(['./components/sale/businessquery/TransferQuery'], resolve)
|
|
170
170
|
})
|
|
171
|
+
// 记录转移查询
|
|
172
|
+
Vue.component('transfer-record-query', (resolve) => {
|
|
173
|
+
require(['./components/sale/businessquery/TransferRecordQuery'], resolve)
|
|
174
|
+
})
|
|
171
175
|
// 小区汇总（机表）
|
|
172
176
|
Vue.component('residential-query', (resolve) => {
|
|
173
177
|
require(['./components/sale/businessquery/ResidentialQuery'], resolve)
|