manage-client 3.2.89-aode → 3.2.90-aode
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
CHANGED
package/package.json
CHANGED
|
@@ -75,11 +75,18 @@
|
|
|
75
75
|
<div class="button-range" style="float:right;margin-top:10px">
|
|
76
76
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
77
77
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
78
|
-
<
|
|
78
|
+
<easy-excel-export :data="$parent.$parent.getCondition" v-ref:exportexcel
|
|
79
79
|
:field="$parent.$parent.getfield"
|
|
80
80
|
:defaultselect="$parent.$parent.selectfields"
|
|
81
|
-
sqlurl="rs/
|
|
82
|
-
class="button_export button_spacing"></
|
|
81
|
+
sqlurl="rs/easyexcel/export" sql-name="aode_dayReport" template-name='日清单' :choose-col="true"
|
|
82
|
+
class="button_export button_spacing"></easy-excel-export>
|
|
83
|
+
<!-- <easy-excel-export :data="$parent.$parent.getCondition"-->
|
|
84
|
+
<!-- :defaultselect="$parent.$parent.selectfields"-->
|
|
85
|
+
<!-- :field="$parent.$parent.getfield"-->
|
|
86
|
+
<!-- :exportprogress="true" v-ref:exports-->
|
|
87
|
+
<!-- sqlurl="rs/easyexcel/export" sql-name="webmeter_getUserGasList" :template-name="$parent.$parent.getName"-->
|
|
88
|
+
<!-- :choose-col="true">-->
|
|
89
|
+
<!-- </easy-excel-export>-->
|
|
83
90
|
<day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></day-report-list-print>
|
|
84
91
|
<!-- <button v-if="$parent.$parent.pushncshow && $parent.$parent.pushncshow2 " class="button_search button_spacing" @click="$parent.$parent.showpushconfirm()">交账</button>-->
|
|
85
92
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}" @click="$parent.$parent.show()"></div>
|
|
@@ -387,8 +394,19 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
387
394
|
if (this.$refs.paged.$refs.cri.model.slice_area) {
|
|
388
395
|
condvalue = condvalue + ` and isnull(ss.f_zones,u3.f_slice_area) = '${this.$refs.paged.$refs.cri.model.slice_area}'`
|
|
389
396
|
}
|
|
397
|
+
|
|
390
398
|
this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
|
|
391
399
|
this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
|
|
400
|
+
const startDate = new Date(this.model.params.startDate);
|
|
401
|
+
const endDate = new Date(this.model.params.endDate);
|
|
402
|
+
// 计算两个日期之间的时间差，单位为毫秒
|
|
403
|
+
const timeDifference = endDate - startDate;
|
|
404
|
+
// 将时间差转换为年数（1年 = 365.25 天 * 24 小时 * 60 分钟 * 60 秒 * 1000 毫秒）
|
|
405
|
+
const yearDifference = timeDifference / (366 * 24 * 60 * 60 * 1000);
|
|
406
|
+
// 判断日期间隔是否大于一年
|
|
407
|
+
if (yearDifference > 1) {
|
|
408
|
+
return this.$showMessage('最大间隔时间不得超过一年')
|
|
409
|
+
}
|
|
392
410
|
|
|
393
411
|
//推送条件: 需要 选择公司,部门
|
|
394
412
|
if(this.depname != null && this.depname != '' ){
|