Commit acc054bf by zhangzhijie

修复时间查询条件为null时的报错

parent a3dd6370
...@@ -352,9 +352,12 @@ export default { ...@@ -352,9 +352,12 @@ export default {
}, },
initDate(unitCode = '') { initDate(unitCode = '') {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
if (dataRange.length > 0) { if (dataRange && dataRange.length > 0) {
this.formData.djsjKssj = dataRange[0]; this.formData.djsjKssj = dataRange[0];
this.formData.djsjJssj = dataRange[1]; this.formData.djsjJssj = dataRange[1];
} else {
this.formData.djsjKssj = '';
this.formData.djsjJssj = '';
} }
let self = this; let self = this;
this.tableLoading = true; this.tableLoading = true;
......
...@@ -191,9 +191,12 @@ export default { ...@@ -191,9 +191,12 @@ export default {
}, },
query() { query() {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
if (dataRange.length > 0) { if (dataRange && dataRange.length > 0) {
this.formData.djsjKssj = dataRange[0]; this.formData.djsjKssj = dataRange[0];
this.formData.djsjJssj = dataRange[1]; this.formData.djsjJssj = dataRange[1];
}else {
this.formData.djsjKssj = '';
this.formData.djsjJssj = '';
} }
this.tableLoading = true; this.tableLoading = true;
......
...@@ -244,9 +244,12 @@ export default { ...@@ -244,9 +244,12 @@ export default {
}, },
query() { query() {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
if (dataRange.length > 0) { if (dataRange && dataRange.length > 0) {
this.formData.djsjKssj = dataRange[0]; this.formData.djsjKssj = dataRange[0];
this.formData.djsjJssj = dataRange[1]; this.formData.djsjJssj = dataRange[1];
}else {
this.formData.djsjKssj = '';
this.formData.djsjJssj = '';
} }
this.tableLoading = true; this.tableLoading = true;
......
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
<span class="flTtitle">查询结果</span> <span class="flTtitle">查询结果</span>
<span class="total">共有{{ page.dataCount }}条查询结果</span> <span class="total">共有{{ page.dataCount }}条查询结果</span>
<el-button plain class="zdybtn export" style="float: right;margin-top: 1%;margin-right: 2%!important;" @click="exportFile" <el-button plain class="zdybtn export" style="float: right;margin-top: 1%;margin-right: 2%!important;"
@click="exportFile"
size="small"> size="small">
<i class="fa fa-external-link" aria-hidden="true" style="margin-right: 5px"></i> <i class="fa fa-external-link" aria-hidden="true" style="margin-right: 5px"></i>
导出 导出
...@@ -253,9 +254,12 @@ export default { ...@@ -253,9 +254,12 @@ export default {
}, },
query() { query() {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
if (dataRange.length > 0) { if (dataRange && dataRange.length > 0) {
this.formData.djsjKssj = dataRange[0]; this.formData.djsjKssj = dataRange[0];
this.formData.djsjJssj = dataRange[1]; this.formData.djsjJssj = dataRange[1];
} else {
this.formData.djsjKssj = '';
this.formData.djsjJssj = '';
} }
this.tableLoading = true; this.tableLoading = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment