|
@@ -4,8 +4,8 @@
|
|
|
<div class="blockCon">
|
|
|
<div class="lefts">
|
|
|
<el-dropdown>
|
|
|
- <el-button :class="formData.year.name ? 'color-btn' : ''">
|
|
|
- {{ formData.year.name || '按年' }}
|
|
|
+ <el-button :class="formData.year && formData.year.name ? 'color-btn' : ''">
|
|
|
+ {{ (formData.year && formData.year.name) || '按年' }}
|
|
|
<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
@@ -14,8 +14,8 @@
|
|
|
</el-dropdown>
|
|
|
|
|
|
<el-dropdown>
|
|
|
- <el-button :disabled="formData.year.name == ''" :class="formData.quarter.name ? 'color-btn' : ''">
|
|
|
- {{ formData.quarter.name || '按季' }}
|
|
|
+ <el-button :disabled="formData.year && formData.year.name == ''" :class="formData.quarter && formData.quarter.name ? 'color-btn' : ''">
|
|
|
+ {{ (formData.quarter && formData.quarter.name) || '按季' }}
|
|
|
<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
@@ -217,14 +217,14 @@ export default {
|
|
|
},
|
|
|
funQuery() {
|
|
|
//查询
|
|
|
- let type_id = '';
|
|
|
- if (this.formData.type == '1') {
|
|
|
- type_id = this.formData.year.id || '';
|
|
|
- } else if (this.formData.type == '2') {
|
|
|
- type_id = this.formData.quarter.id;
|
|
|
- } else {
|
|
|
- type_id = this.formData.month.id;
|
|
|
- }
|
|
|
+ // let type_id = '';
|
|
|
+ // if (this.formData.type == '1') {
|
|
|
+ // type_id = this.formData.year.id || '';
|
|
|
+ // } else if (this.formData.type == '2') {
|
|
|
+ // type_id = this.formData.quarter.id;
|
|
|
+ // } else {
|
|
|
+ // type_id = this.formData.month.id;
|
|
|
+ // }
|
|
|
let pramse = {
|
|
|
start_time: this.formData.startTime,
|
|
|
end_time: this.formData.endTime,
|