Commit 7d99adc1 authored by 李苏's avatar 李苏 💬

搜索条件改年和月

parent 3b68935f
...@@ -8,13 +8,27 @@ ...@@ -8,13 +8,27 @@
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">年度:</span> <span class="search-span">年度:</span>
<el-date-picker v-model="queryParams.year"></el-date-picker> <!-- <el-date-picker v-model="queryParams.year"></el-date-picker> -->
<el-date-picker
value-format='yyyy'
v-model="queryParams.year"
type="year"
placeholder="选择年">
</el-date-picker>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">月份:</span> <span class="search-span">月份:</span>
<el-date-picker v-model="queryParams.month"></el-date-picker> <!-- <el-date-picker v-model="queryParams.month"></el-date-picker> -->
<el-select clearable v-model="queryParams.month" placeholder="请选择">
<el-option
v-for="item in 12"
:key="item"
:label="item+'月'"
:value="item">
</el-option>
</el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
...@@ -85,9 +99,9 @@ ...@@ -85,9 +99,9 @@
tableTitle: [ tableTitle: [
{label: "年度", prop: "year", fieldType: "int"}, {label: "年度", prop: "year", fieldType: "int"},
{label: "月份", prop: "month", fieldType: "int",width:160}, {label: "月份", prop: "month", fieldType: "int",width:160},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:180}, {label: "分公司", prop: "gsName", fieldType: "ftString",width:280},
{label: "班组", prop: "bmName", fieldType: "ftString",width:180}, {label: "班组", prop: "bmName", fieldType: "ftString",width:280},
{label: "安全活动次数/计划次数", prop: "bz", fieldType: "ftString",width:160, {label: "安全活动次数/计划次数", prop: "bz",
formatter:function(row, b, c){ formatter:function(row, b, c){
return row.count+'/'+row.planCount; return row.count+'/'+row.planCount;
} }
...@@ -104,7 +118,7 @@ ...@@ -104,7 +118,7 @@
} }
}, },
components: { components: {
} }
......
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