manage-client 3.2.233 → 3.2.235

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.
@@ -8,40 +8,20 @@
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
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
- <div class="col-sm-2 form-group">
12
- <label for="startDate" class="font_normal_body">审核日期起</label>
13
- <datepicker id="startDate" placeholder="审核日期起" style="width:60%"
14
- v-model="model.startDate"
15
- :value.sync="model.startDate"
16
- :format="'yyyy-MM-dd'"
17
- :show-reset-button="true"
18
- condition="f_audit_date >= '{} 00:00:00'">
19
- </datepicker>
20
- </div>
21
- <div class="col-sm-2 form-group">
22
- <label for="endDate" class="font_normal_body">审核日期止</label>
23
- <datepicker id="endDate" placeholder="审核日期止" style="width:60%"
24
- v-model="model.endDate"
25
- :value.sync="model.endDate"
26
- :format="'yyyy-MM-dd'"
27
- :show-reset-button="true"
28
- condition="f_audit_date <= '{} 23:59:59'">
29
- </datepicker>
30
- </div>
31
11
 
32
12
  <div class="col-sm-2 form-group">
33
- <label class="font_normal_body">气表类型</label>
34
- <v-select :value.sync="model.f_meter_classify"
35
- :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
36
- condition="f_meter_classify in {}"
13
+ <label class="font_normal_body">交费年份</label>
14
+ <v-select :value.sync="model.jfnf"
15
+ :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.jfnf"
16
+ condition="jfnf in {}"
37
17
  close-on-select></v-select>
38
18
  </div>
39
19
 
40
20
  <div class="col-sm-2 form-group">
41
- <label class="font_normal_body">结算方式</label>
42
- <v-select :value.sync="model.f_calculation"
43
- :options='$parent.$parent.fcalculation' placeholder='请选择' v-model="model.f_calculation"
44
- condition="f_calculation in {}"
21
+ <label class="font_normal_body">用气性质</label>
22
+ <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
23
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
24
+ condition="f_gasproperties = '{}'"
45
25
  close-on-select></v-select>
46
26
  </div>
47
27
 
@@ -54,53 +34,12 @@
54
34
  :field="$parent.$parent.getExportField"
55
35
  :footer="$parent.$parent.footer"
56
36
  :header="$parent.$parent.other"
57
- sqlurl="rs/logic/exportfile" sql-name="qnChaobiaoyhhz" template-name='抄表按用户汇总导出'
37
+ sqlurl="rs/logic/exportfile" sql-name="qnJgqMyhzbb" template-name=' 民用汇总报表导出'
58
38
  :choose-col="true"></export-excel>
59
39
 
60
40
  <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>
61
41
  </div>
62
42
  </div>
63
- <div class="row" v-show="$parent.$parent.criteriaShow">
64
- <div class="col-sm-2 form-group">
65
- <label class="font_normal_body">客户编号</label>
66
- <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
67
- condition="f_userinfo_code = '{}' " placeholder="客户编号">
68
- </div>
69
- <div class="col-sm-2 form-group">
70
- <label class="font_normal_body">客户名称</label>
71
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
72
- condition="f_user_name like '%{}%'" placeholder="客户名称">
73
- </div>
74
- <div class="col-sm-2 form-group">
75
- <label class="font_normal_body">下账状态</label>
76
- <v-select :value.sync="model.f_accounts_state"
77
- :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
78
- condition="f_accounts_state = '{}'"
79
- close-on-select></v-select>
80
- </div>
81
- <div class="col-sm-2 form-group">
82
- <label class="font_normal_body">客户类型</label>
83
- <v-select :value.sync="model.f_user_type"
84
- @change="$parent.$parent.userTypeChange()"
85
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
86
- condition="f_user_type = '{}'"
87
- close-on-select></v-select>
88
- </div>
89
- <div class="col-sm-2 form-group">
90
- <label class="font_normal_body">用气性质</label>
91
- <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
92
- :options='$parent.$parent.gasproperties' placeholder='请选择'
93
- condition="f_gasproperties = '{}'"
94
- close-on-select></v-select>
95
- </div>
96
- </div>
97
- <div class="row" v-show="$parent.$parent.criteriaShow">
98
- <div class="col-sm-2 form-group">
99
- <label class="font_normal_body">气量大于</label>
100
- <input type="text" style="width:60%" class="input_search" v-model="model.f_gas"
101
- condition="f_gas > {} " placeholder="气量大于">
102
- </div>
103
- </div>
104
43
  </div>
105
44
  </criteria>
106
45
 
@@ -114,7 +53,7 @@
114
53
  <nobr>用户名</nobr>
115
54
  </th>
116
55
  <th>
117
- <nobr>表号</nobr>
56
+ <nobr>地址</nobr>
118
57
  </th>
119
58
  <th>
120
59
  <nobr>客户类型</nobr>
@@ -123,52 +62,34 @@
123
62
  <nobr>用气性质</nobr>
124
63
  </th>
125
64
  <th>
126
- <nobr>起方</nobr>
127
- </th>
128
- <th>
129
- <nobr>止方</nobr>
130
- </th>
131
- <th>
132
- <nobr>单价</nobr>
133
- </th>
134
- <th>
135
- <nobr>气量</nobr>
65
+ <nobr>年用气量</nobr>
136
66
  </th>
137
67
  <th>
138
- <nobr>金额</nobr>
68
+ <nobr>年用气金额</nobr>
139
69
  </th>
140
70
  </tr>
141
71
  </template>
142
72
  <template partial='body'>
143
73
  <td style="text-align: center;">
144
- <nobr>{{row.f_userinfo_code}}</nobr>
145
- </td>
146
- <td style="text-align: center;">
147
- <nobr>{{row.f_user_name}}</nobr>
148
- </td>
149
- <td style="text-align: center;">
150
- <nobr>{{row.f_meternumber}}</nobr>
151
- </td>
152
- <td style="text-align: center;">
153
- <nobr>{{row.f_user_type}}</nobr>
74
+ <nobr>{{row.b_yhh}}</nobr>
154
75
  </td>
155
76
  <td style="text-align: center;">
156
- <nobr>{{row.f_gasproperties}}</nobr>
77
+ <nobr>{{row.c_yhmc}}</nobr>
157
78
  </td>
158
79
  <td style="text-align: center;">
159
- <nobr>{{row.f_last_tablebase}}</nobr>
80
+ <nobr>{{row.d_yqdz}}</nobr>
160
81
  </td>
161
82
  <td style="text-align: center;">
162
- <nobr>{{row.f_tablebase}}</nobr>
83
+ <nobr>{{row.khlx}}</nobr>
163
84
  </td>
164
85
  <td style="text-align: center;">
165
- <nobr>{{row.f_price}}</nobr>
86
+ <nobr>{{row.r_yqxzcfl}}</nobr>
166
87
  </td>
167
88
  <td style="text-align: center;">
168
- <nobr>{{row.f_gas}}</nobr>
89
+ <nobr>{{row.nyql}}</nobr>
169
90
  </td>
170
91
  <td style="text-align: center;">
171
- <nobr>{{row.f_money}}</nobr>
92
+ <nobr>{{row.nje}}</nobr>
172
93
  </td>
173
94
  </template>
174
95
  <template partial='foot'>
@@ -182,7 +103,7 @@
182
103
  汇总信息
183
104
  </td>
184
105
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
185
- 气量合计:&emsp;{{sumsmodel.f_gas}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.f_money}}
106
+ 气量合计:&emsp;{{sumsmodel.nyql}}&emsp;&emsp;金额合计:&emsp;{{sumsmodel.nje}}
186
107
  </td>
187
108
  </tr>
188
109
  </table>
@@ -213,12 +134,12 @@
213
134
  }
214
135
 
215
136
  export default {
216
- title: '抄表按用户汇总',
137
+ title: '民用汇总报表',
217
138
  data() {
218
139
  return {
219
140
  other:[],
220
141
  footer:[],
221
- model: new PagedList('rs/sql/qnChaobiaoyhhz', 20, {}, {f_gas: 0, f_money: 0}),
142
+ model: new PagedList('rs/sql/qnJgqMyhzbb', 20, {}, {nyql: 0, nje: 0}),
222
143
  criteriaShow: false,
223
144
  orgCondtionStr: '',
224
145
  modelval: [],
@@ -231,6 +152,7 @@
231
152
 
232
153
  },
233
154
  gasproperties:[],
155
+ jfnfArray:[],
234
156
  //默认打印列
235
157
  defaultfield: [],
236
158
  config: {
@@ -279,9 +201,11 @@
279
201
  }).catch((error) => {
280
202
  this.$emit('error', error)
281
203
  })
282
- this.initAreas(this.$login.f.orgid)
283
- self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
284
- self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
204
+ //this.initAreas(this.$login.f.orgid)
205
+ //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
206
+ //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
207
+ this.getJfnf();
208
+ this.getGaspropperties();
285
209
  },
286
210
  methods: {
287
211
  async getinputtores () {
@@ -309,6 +233,40 @@
309
233
  })
310
234
  }
311
235
  },
236
+ async getJfnf(){
237
+ let HttpReset = new HttpResetClass()
238
+ var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
239
+ data: {
240
+ condition: '1=1',
241
+ tablename: 'qn_jgq_myhz',
242
+ groupitem: 'jfnf',
243
+ orderitem: 'jfnf',
244
+ items: 'jfnf'
245
+ }
246
+ }, {resolveMsg: null, rejectMsg: '获取失败!'})
247
+ let nameArr = [{label: '全部', value: ''}]
248
+ for (let row of data.data){
249
+ nameArr.push({label: row.jfnf, value: row.jfnf})
250
+ }
251
+ this.jfnfArray = nameArr
252
+ },
253
+ async getGaspropperties(){
254
+ let HttpReset = new HttpResetClass()
255
+ var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
256
+ data: {
257
+ condition: '1=1',
258
+ tablename: 'qn_jgq_myhz',
259
+ groupitem: 'r_yqxzcfl',
260
+ orderitem: 'r_yqxzcfl',
261
+ items: 'r_yqxzcfl'
262
+ }
263
+ }, {resolveMsg: null, rejectMsg: '获取失败!'})
264
+ let nameArr = [{label: '全部', value: ''}]
265
+ for (let row of data.data){
266
+ nameArr.push({label: row.r_yqxzcfl, value: row.r_yqxzcfl})
267
+ }
268
+ this.gasproperties = nameArr
269
+ },
312
270
  getotherfooter () {
313
271
  // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
314
272
  // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];