Merge branch 'master' of https://gitee.com/beiwu/cmanager
This commit is contained in:
@@ -220,7 +220,8 @@ export default {
|
||||
label: "社区街道名称",
|
||||
prop: "companyName",
|
||||
search: true,
|
||||
searchSpan: 5,
|
||||
searchSpan: 6,
|
||||
searchLabelWidth: 100,
|
||||
display: false,
|
||||
},
|
||||
{
|
||||
@@ -230,8 +231,8 @@ export default {
|
||||
span: 20,
|
||||
display: false,
|
||||
search: true,
|
||||
searchSpan: 4,
|
||||
searchLabelWidth: 87,
|
||||
searchSpan: 6,
|
||||
searchLabelWidth: 100,
|
||||
dicUrl: getStationDic(),
|
||||
props: {
|
||||
label: "stationName",
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row :span="24">
|
||||
<el-form-item>
|
||||
<!-- <el-form-item>
|
||||
<el-select v-model="query.type" placeholder="请选择搜索时间类型">
|
||||
<el-option label="任务开始日期" :value="0"></el-option>
|
||||
<el-option label="任务结束日期" :value="2"></el-option>
|
||||
@@ -60,7 +60,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="审核状态:">
|
||||
<el-select v-model="query.reviewState">
|
||||
<el-option
|
||||
@@ -71,7 +71,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据来源:">
|
||||
<!-- <el-form-item label="数据来源:">
|
||||
<el-select v-model="query.dataSources">
|
||||
<el-option
|
||||
v-for="(item, index) in dataSourcesEnum"
|
||||
@@ -80,7 +80,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<div class="searchBtn">
|
||||
<el-button
|
||||
type="primary"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<el-form
|
||||
size="small"
|
||||
label-position="right"
|
||||
style="padding-left: 10px; padding-right: 10px"
|
||||
style="padding-left: 10px; padding-right: 10px;margin-bottom: 10px;"
|
||||
:inline="true"
|
||||
>
|
||||
<el-row :span="24">
|
||||
@@ -36,7 +36,7 @@
|
||||
<!-- <!– <el-option label="报名截止日期" :value="3"></el-option> –>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="日期范围:">
|
||||
<!-- <el-form-item label="日期范围:">
|
||||
<el-date-picker
|
||||
v-model="query.time"
|
||||
type="daterange"
|
||||
@@ -46,9 +46,9 @@
|
||||
value-format="yyyy-MM-dd"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<!-- <tool-tip></tool-tip>-->
|
||||
<br>
|
||||
<!-- <br>
|
||||
<el-form-item label="岗位状态:">
|
||||
<el-select v-model="query.jobStatus">
|
||||
<el-option
|
||||
@@ -58,7 +58,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="审核状态:">
|
||||
<el-select v-model="query.reviewState">
|
||||
<el-option
|
||||
@@ -69,7 +69,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据来源:">
|
||||
<!-- <el-form-item label="数据来源:">
|
||||
<el-select v-model="query.dataSources">
|
||||
<el-option
|
||||
v-for="(item, index) in dataSourcesEnum"
|
||||
@@ -78,7 +78,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<div class="searchBtn">
|
||||
<el-button
|
||||
type="primary"
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<!-- <!– <el-option label="报名截止日期" :value="3"></el-option> –>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="岗位日期:">
|
||||
<!-- <el-form-item label="岗位日期:">
|
||||
<el-date-picker
|
||||
v-model="query.time"
|
||||
type="daterange"
|
||||
@@ -47,7 +47,6 @@
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- <tool-tip></tool-tip>-->
|
||||
<br>
|
||||
<el-form-item label="岗位状态:">
|
||||
<el-select v-model="query.jobStatus">
|
||||
@@ -78,7 +77,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<div class="searchBtn">
|
||||
<el-button
|
||||
type="primary"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<el-input v-model="search.missionTitle" placeholder="任务名称" clearable></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="任务状态:">
|
||||
<!-- <el-form-item label="任务状态:">
|
||||
<el-select v-model="search.status" placeholder="任务状态" style="width:100%">
|
||||
<el-option
|
||||
v-for="(item,key,index) in missionTypes"
|
||||
@@ -40,7 +40,7 @@
|
||||
@change="dateChange">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<tool-tip ></tool-tip>
|
||||
<tool-tip ></tool-tip> -->
|
||||
|
||||
<div class="searchBtn">
|
||||
<el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch">搜 索</el-button>
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<!-- <!– <el-option label="报名截止日期" :value="3"></el-option> –>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="日期范围">
|
||||
<!-- <el-form-item label="日期范围">
|
||||
<el-date-picker
|
||||
v-model="search.time"
|
||||
type="daterange"
|
||||
@@ -102,7 +102,7 @@
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<div class="searchBtn">
|
||||
<el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch">搜 索</el-button>
|
||||
<el-button size="small" icon="el-icon-delete" @click="handleClear">清 空</el-button>
|
||||
|
||||
Reference in New Issue
Block a user