|
@@ -23,17 +23,17 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
<el-form-item label="时间类型">
|
|
|
|
|
|
<el-select v-model="queryParams.dateType" placeholder="请选择" clearable filterable class="se" @change="selectChange">
|
|
|
<el-option v-for="t in datelist" :key="t.value" :label="t.label" :value="t.value" />
|
|
|
</el-select>
|
|
|
|
|
|
+ <el-date-picker v-if="queryParams.dateType == 1" v-model="queryParams.yearVlue" type="year" placeholder="选择年" value-format="yyyy" format="yyyy 年" style="margin-left: 10px;"></el-date-picker>
|
|
|
+
|
|
|
<el-select v-if="queryParams.dateType == 1" v-model="formatY" placeholder="选择月" clearable filterable class="se" style="margin-left: 10px;">
|
|
|
- <el-option v-for="t in 12" :key="t.value" :label="t + '月'" :value="t" />
|
|
|
+ <el-option v-for="t in 12" :key="t.value" :label="t + '月'" :value="t" />
|
|
|
</el-select>
|
|
|
-
|
|
|
<el-select v-if="queryParams.dateType == 2" v-model="queryParams.dateValue" placeholder="选择季度" clearable filterable class="se" style="margin-left: 10px;">
|
|
|
<el-option v-for="t in jdlist" :key="t.value" :label="t.label" :value="t.value"/>
|
|
|
</el-select>
|
|
@@ -103,7 +103,7 @@
|
|
|
</template>
|
|
|
<el-table-column label="对比值(去年)" align="center" prop="colName" width="120px">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.datails[0].oldValue }}
|
|
|
+ {{ scope.row.datails[2].oldValue }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="当前" align="center" prop="colName">
|
|
@@ -213,6 +213,7 @@ export default {
|
|
|
dateType:'', //查询时间类型(1=月,2=季度,3=年)
|
|
|
dateValue:'', //查询时间值
|
|
|
normFeeId:'', //指标明细id
|
|
|
+ yearVlue:'',//如果选了月 那这里接收年的值 选的年还是传的dateValue
|
|
|
},
|
|
|
normFeelistAll:[], //指标列表
|
|
|
regionList:[], //保税区列表
|
|
@@ -226,6 +227,7 @@ export default {
|
|
|
methods: {
|
|
|
selectChange(val){
|
|
|
this.queryParams.dateValue = ''
|
|
|
+ this.queryParams.yearVlue = ''
|
|
|
},
|
|
|
getList() {
|
|
|
this.timeValue = []
|
|
@@ -280,6 +282,8 @@ export default {
|
|
|
this.queryParams.dateType = '';
|
|
|
this.queryParams.dateValue = '';
|
|
|
this.queryParams.normFeeId = '';
|
|
|
+ this.queryParams.yearVlue = '';
|
|
|
+ this.formatY = ''
|
|
|
this.resetForm('queryForm');
|
|
|
},
|
|
|
}
|