manage-client 3.2.234 → 3.2.236

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.
@@ -1,10 +1,10 @@
1
- // 分公司特殊组件页面注册
2
- let specialComp = {
3
- // 收费查询
4
- 'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
5
- 'change-meter-query': (resolve) => { require(['./ChangeMeterQuery'], resolve) },
6
- // 综合档案信息查询
7
- 'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve)}
8
- }
9
- exports.specialComp = specialComp
10
-
1
+ // 分公司特殊组件页面注册
2
+ let specialComp = {
3
+ // 收费查询
4
+ 'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
5
+ 'change-meter-query': (resolve) => { require(['./ChangeMeterQuery'], resolve) },
6
+ // 综合档案信息查询
7
+ 'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve)}
8
+ }
9
+ exports.specialComp = specialComp
10
+
@@ -853,7 +853,7 @@
853
853
  dep:[],
854
854
  user:[]
855
855
  },
856
- model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
856
+ model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'id asc'`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
857
857
  f_pregas: 0,
858
858
  f_delaypay: 0,
859
859
  fee:0,
@@ -11,13 +11,20 @@
11
11
 
12
12
 
13
13
  <div class="col-sm-2 form-group">
14
- <label class="font_normal_body">交费月份</label>
14
+ <label class="font_normal_body">月份</label>
15
15
  <v-select :value.sync="model.a_jfyf"
16
16
  :options='$parent.$parent.jfyfArray' placeholder='请选择' v-model="model.a_jfyf"
17
17
  condition="a_jfyf in {}"
18
18
  close-on-select></v-select>
19
19
  </div>
20
20
 
21
+ <div class="col-sm-2 form-group">
22
+ <label class="font_normal_body">客户类型</label>
23
+ <v-select :value.sync="model.j_khlx"
24
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.j_khlx"
25
+ condition="j_khlx in {}"
26
+ close-on-select></v-select>
27
+ </div>
21
28
 
22
29
  <div class="span" style="float:right;">
23
30
  <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
@@ -28,7 +35,7 @@
28
35
  :field="$parent.$parent.getExportField"
29
36
  :footer="$parent.$parent.footer"
30
37
  :header="$parent.$parent.other"
31
- sqlurl="rs/logic/exportfile" sql-name="qnChaobiaoyhhz" template-name='抄表按用户汇总导出'
38
+ sqlurl="rs/logic/exportfile" sql-name="qnJgqGshzbb" template-name='用气汇总报表导出'
32
39
  :choose-col="true"></export-excel>
33
40
 
34
41
  <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>
@@ -42,7 +49,7 @@
42
49
  <template partial='head'>
43
50
  <tr>
44
51
  <th>
45
- <nobr>交费月份</nobr>
52
+ <nobr>月份</nobr>
46
53
  </th>
47
54
  <th>
48
55
  <nobr>用气性质</nobr>
@@ -60,7 +67,7 @@
60
67
  <nobr>违约金</nobr>
61
68
  </th>
62
69
  <th>
63
- <nobr>实交金额</nobr>
70
+ <nobr>金额合计</nobr>
64
71
  </th>
65
72
  </tr>
66
73
  </template>
@@ -98,7 +105,7 @@
98
105
  汇总信息
99
106
  </td>
100
107
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
101
- 气量合计:&emsp;{{sumsmodel.e_ysql}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.f_je}}&emsp;&emsp;违约金合计:&emsp;{{sumsmodel.g_znj}}&emsp;&emsp;实交金额合计:&emsp;{{sumsmodel.i_sjje}}
108
+ 气量合计:&emsp;{{sumsmodel.e_ysql}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.f_je}}&emsp;&emsp;违约金合计:&emsp;{{sumsmodel.g_znj}}&emsp;&emsp;金额合计合计:&emsp;{{sumsmodel.i_sjje}}
102
109
  </td>
103
110
  </tr>
104
111
  </table>
@@ -507,7 +514,7 @@
507
514
  return data
508
515
  },
509
516
  getExportField() {
510
- return exportConfig.qnChaobiaoyhhz
517
+ return exportConfig.qnJgqGshzbb
511
518
  },
512
519
  inputtor () {
513
520
  // 获取抄表员
@@ -9,7 +9,7 @@
9
9
  <div class="row">
10
10
  <res-select-group :show-component="['company']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
11
11
  <div class="col-sm-2 form-group">
12
- <label class="font_normal_body">交费月份</label>
12
+ <label class="font_normal_body">月份</label>
13
13
  <v-select :value.sync="model.t_jfyf"
14
14
  :options='$parent.$parent.jfyfArray' placeholder='请选择' v-model="model.t_jfyf"
15
15
  condition="t_jfyf in {}"
@@ -38,7 +38,7 @@
38
38
  :field="$parent.$parent.getExportField"
39
39
  :footer="$parent.$parent.footer"
40
40
  :header="$parent.$parent.other"
41
- sqlurl="rs/logic/exportfile" sql-name="qnChaobiaoyhhz" template-name='抄表按用户汇总导出'
41
+ sqlurl="rs/logic/exportfile" sql-name="qnJgqGsxsmx" template-name='工商销售明细导出'
42
42
  :choose-col="true"></export-excel>
43
43
 
44
44
  <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>
@@ -74,10 +74,10 @@
74
74
  <nobr>止方</nobr>
75
75
  </th>
76
76
  <th>
77
- <nobr>单价</nobr>
77
+ <nobr>气量</nobr>
78
78
  </th>
79
79
  <th>
80
- <nobr>气量</nobr>
80
+ <nobr>单价</nobr>
81
81
  </th>
82
82
  <th>
83
83
  <nobr>金额</nobr>
@@ -86,16 +86,19 @@
86
86
  <nobr>违约金</nobr>
87
87
  </th>
88
88
  <th>
89
- <nobr>实交金额</nobr>
89
+ <nobr>金额合计</nobr>
90
90
  </th>
91
91
  <th>
92
92
  <nobr>用气性质</nobr>
93
93
  </th>
94
94
  <th>
95
- <nobr>交费日期</nobr>
95
+ <nobr>日期</nobr>
96
+ </th>
97
+ <th>
98
+ <nobr>月份</nobr>
96
99
  </th>
97
100
  <th>
98
- <nobr>交费月份</nobr>
101
+ <nobr>表具类型</nobr>
99
102
  </th>
100
103
  <th>
101
104
  <nobr>收费员</nobr>
@@ -128,10 +131,10 @@
128
131
  <nobr>{{row.i_cszf}}</nobr>
129
132
  </td>
130
133
  <td style="text-align: center;">
131
- <nobr>{{row.k_dj}}</nobr>
134
+ <nobr>{{row.j_ysql}}</nobr>
132
135
  </td>
133
136
  <td style="text-align: center;">
134
- <nobr>{{row.j_ysql}}</nobr>
137
+ <nobr>{{row.k_dj}}</nobr>
135
138
  </td>
136
139
  <td style="text-align: center;">
137
140
  <nobr>{{row.l_je}}</nobr>
@@ -151,6 +154,9 @@
151
154
  <td style="text-align: center;">
152
155
  <nobr>{{row.t_jfyf}}</nobr>
153
156
  </td>
157
+ <td style="text-align: center;">
158
+ <nobr>{{row.bjlx}}</nobr>
159
+ </td>
154
160
  <td style="text-align: center;">
155
161
  <nobr>{{row.sfyg}}</nobr>
156
162
  </td>
@@ -169,7 +175,7 @@
169
175
  汇总信息
170
176
  </td>
171
177
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
172
- 气量合计:&emsp;{{sumsmodel.j_ysql}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.l_je}}&emsp;&emsp;违约金合计:&emsp;{{sumsmodel.m_znj}}&emsp;&emsp;实交金额合计:&emsp;{{sumsmodel.o_sjje}}
178
+ 气量合计:&emsp;{{sumsmodel.j_ysql}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.l_je}}&emsp;&emsp;违约金合计:&emsp;{{sumsmodel.m_znj}}&emsp;&emsp;金额合计合计:&emsp;{{sumsmodel.o_sjje}}
173
179
  </td>
174
180
  </tr>
175
181
  </table>
@@ -577,7 +583,7 @@
577
583
  return data
578
584
  },
579
585
  getExportField() {
580
- return exportConfig.qnChaobiaoyhhz
586
+ return exportConfig.qnJgqGsxsmx
581
587
  },
582
588
  inputtor () {
583
589
  // 获取抄表员