manage-client 4.0.49 → 4.0.51

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.
File without changes
@@ -0,0 +1,2 @@
1
+ #Mon Nov 04 18:30:03 CST 2024
2
+ gradle.version=8.5
Binary file
File without changes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.49",
3
+ "version": "4.0.51",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -205,6 +205,8 @@
205
205
 
206
206
  },
207
207
  ready() {
208
+ this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
209
+ this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
208
210
  this.$refs.paged.$refs.cri.search()
209
211
  readySomething(this).then(() => {
210
212
  this.$emit('ready')
@@ -35,6 +35,9 @@
35
35
  <th style="white-space: nowrap;text-align:center">
36
36
  <nobr>楼栋</nobr>
37
37
  </th>
38
+ <th style="white-space: nowrap;text-align:center">
39
+ <nobr>管道安装时间</nobr>
40
+ </th>
38
41
  <th style="white-space: nowrap;text-align:center">
39
42
  <nobr>楼栋用户数</nobr>
40
43
  </th>
@@ -60,6 +63,10 @@
60
63
  :rowspan="row.f_buildingspan" :class="{hidden: row.f_buildingdis}">
61
64
  <nobr>{{ row.f_building }}</nobr>
62
65
  </td>
66
+ <td style="white-space: nowrap;text-align:center"
67
+ :rowspan="row.f_pipe_install_datespan" :class="{hidden: row.f_pipe_install_datedis}">
68
+ <nobr>{{ row.f_pipe_install_date }}</nobr>
69
+ </td>
63
70
  <td style="white-space: nowrap;text-align:center"
64
71
  :rowspan=" row.f_user_numspan" :class="{hidden: row.f_user_numdis}">
65
72
  <nobr>{{ row.f_user_num }}</nobr>
@@ -282,6 +282,13 @@
282
282
  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_pregas_big"
283
283
  condition="f_pregas <= '{}' " placeholder="小于等于">
284
284
  </div>
285
+ <div class="col-sm-2 form-group">
286
+ <label class="font_normal_body">累计充值气量</label>
287
+ <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_total_pregas_small"
288
+ condition="f_total_pregas >= '{}' " placeholder="大于等于">
289
+ <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_total_pregas_big"
290
+ condition="f_total_pregas <= '{}' " placeholder="小于等于">
291
+ </div>
285
292
  </div>
286
293
  </div>
287
294
  </criteria>
@@ -718,7 +725,7 @@
718
725
  dep:[],
719
726
  user:[]
720
727
  },
721
- model: new PagedList('api/af-revenue/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code'`},{
728
+ model: new PagedList('api/af-revenue/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code'`, startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
722
729
  f_pregas: 0,
723
730
  f_preamount: 0,
724
731
  f_delaypay: 0,