manage-client 3.3.118 → 3.3.119

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.
@@ -14,4 +14,6 @@ export default function () {
14
14
  })
15
15
  // 用气分析
16
16
  Vue.component('gas-analysis-query', (resolve) => { require(['./GasAnalysisQuery'], resolve) })
17
+ // 用户缴费抄表查询
18
+ Vue.component('manage-payment-query', (resolve) => { require(['./paymentQuery'], resolve) })
17
19
  }
@@ -80,14 +80,16 @@
80
80
  <v-select :value.sync="model.f_user_type"
81
81
  @change="$parent.$parent.userTypeChange()"
82
82
  :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
83
- condition="f_user_type = '{}'"
83
+ condition="f_user_type in {}"
84
+ multiple
84
85
  close-on-select></v-select>
85
86
  </div>
86
87
  <div class="col-sm-2 form-group">
87
88
  <label class="font_normal_body">用气性质</label>
88
89
  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
89
90
  :options='$parent.$parent.gasproperties' placeholder='请选择'
90
- condition="f_gasproperties = '{}'"
91
+ condition="f_gasproperties in {}"
92
+ multiple
91
93
  close-on-select></v-select>
92
94
  </div>
93
95
  <div class="col-sm-2 form-group">
@@ -95,14 +97,16 @@
95
97
  <v-select :value.sync="model.f_meter_brand"
96
98
  v-model="model.f_meter_brand"
97
99
  :options='$parent.$parent.meterbrands' placeholder='请选择'
98
- condition="f_meter_brand = '{}'"
100
+ condition="f_meter_brand in {}"
101
+ multiple
99
102
  close-on-select></v-select>
100
103
  </div>
101
104
  <div class="col-sm-2 form-group">
102
105
  <label class="font_normal_body">气表型号</label>
103
106
  <v-select :value.sync="model.f_meter_type"
104
107
  :options='$parent.$parent.meterStyle' placeholder='请选择' v-model="model.f_meter_style"
105
- condition="f_meter_type = '{}'"
108
+ condition="f_meter_type in {}"
109
+ multiple
106
110
  close-on-select></v-select>
107
111
  </div>
108
112
  <div class="col-sm-2 form-group">
@@ -110,10 +114,32 @@
110
114
  <v-select :value.sync="model.f_inputtor"
111
115
  v-model="model.f_inputtor"
112
116
  :options='$parent.$parent.inputtores' placeholder='请选择'
113
- condition="f_inputtor = '{}'"
117
+ condition="f_inputtor in {}"
118
+ multiple
114
119
  close-on-select>
115
120
  </v-select>
116
121
  </div>
122
+
123
+ <div class="col-sm-2 form-group" >
124
+ <label for="startDate" class="font_normal_body" title="建档开始日期">建档时间</label>
125
+ <datepicker id="startDate" placeholder="建档开始日期" style="width:60%"
126
+ v-model="model.startDate"
127
+ :value.sync="model.startDate"
128
+ :format="'yyyy-MM-dd'"
129
+ :show-reset-button="true"
130
+ condition="f_createfile_date >= '{} 00:00:00'">
131
+ </datepicker>
132
+ </div>
133
+ <div class="col-sm-2 form-group" >
134
+ <label for="endDate" class="font_normal_body" title="建档结束日期">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
135
+ <datepicker id="endDate" placeholder="建档结束日期" style="width:60%"
136
+ v-model="model.endDate"
137
+ :value.sync="model.endDate"
138
+ :format="'yyyy-MM-dd'"
139
+ :show-reset-button="true"
140
+ condition="f_createfile_date <= '{} 23:59:59'">
141
+ </datepicker>
142
+ </div>
117
143
  </div>
118
144
  </div>
119
145
  </criteria>
@@ -122,8 +148,8 @@
122
148
  <template partial='head'>
123
149
  <tr>
124
150
  <th colspan="10" style="text-align: center;"><nobr>用户信息</nobr></th>
125
- <th colspan="12" style="text-align: center;"><nobr>查询年份</nobr></th>
126
- <th colspan="12" style="text-align: center;"><nobr>对比年份</nobr></th>
151
+ <th colspan="13" style="text-align: center;"><nobr>查询年份</nobr></th>
152
+ <th colspan="13" style="text-align: center;"><nobr>对比年份</nobr></th>
127
153
  </tr>
128
154
  <tr>
129
155
  <th style="text-align: center;">
@@ -192,6 +218,9 @@
192
218
  <th style="text-align: center;">
193
219
  <nobr>十二月</nobr>
194
220
  </th>
221
+ <th style="text-align: center;">
222
+ <nobr>合计</nobr>
223
+ </th>
195
224
  <th style="text-align: center;">
196
225
  <nobr>一月</nobr>
197
226
  </th>
@@ -228,6 +257,9 @@
228
257
  <th style="text-align: center;">
229
258
  <nobr>十二月</nobr>
230
259
  </th>
260
+ <th style="text-align: center;">
261
+ <nobr>合计</nobr>
262
+ </th>
231
263
 
232
264
  </tr>
233
265
  </template>
@@ -255,6 +287,7 @@
255
287
  <td style="text-align: center;">{{ row.oct }}</td>
256
288
  <td style="text-align: center;">{{ row.nov }}</td>
257
289
  <td style="text-align: center;">{{ row.dec }}</td>
290
+ <td style="text-align: center;">{{ row.f_gas }}</td>
258
291
  <td style="text-align: center;">{{ row.jan1 }}</td>
259
292
  <td style="text-align: center;">{{ row.feb1 }}</td>
260
293
  <td style="text-align: center;">{{ row.mar1 }}</td>
@@ -267,6 +300,7 @@
267
300
  <td style="text-align: center;">{{ row.oct1 }}</td>
268
301
  <td style="text-align: center;">{{ row.nov1 }}</td>
269
302
  <td style="text-align: center;">{{ row.dec1 }}</td>
303
+ <td style="text-align: center;">{{ row.f_gas1 }}</td>
270
304
  </tr>
271
305
  </template>
272
306
  <template partial='foot'></template>
@@ -302,6 +336,7 @@ export default {
302
336
  org: [this.$login.f.orgid]
303
337
  },
304
338
  meterbrands: [],
339
+ gasproperties:[],
305
340
  inputtores: [{label: '全部',value: ''}],
306
341
  criteriaShow: false,
307
342
  condition: '',
@@ -392,8 +427,8 @@ export default {
392
427
  userTypeChange () {
393
428
  this.gasproperties = []
394
429
  if (this.$refs.paged.$refs.cri.model !== null) {
395
- this.$refs.paged.$refs.cri.model.f_gasproperties = ''
396
- this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
430
+ this.$refs.paged.$refs.cri.model.f_gasproperties = []
431
+ this.gasproperties = this.$appdata.getParam('用气性质')
397
432
  } else {
398
433
  this.gasproperties = [{label: '全部', value: ''}]
399
434
  }