|
|
@@ -68,7 +68,15 @@
|
|
|
end-placeholder="合同结束时间结束"
|
|
|
range-separator="至"
|
|
|
start-placeholder="合同结束时间开始"
|
|
|
- style="width: 100%"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="contractSignTime">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryForm.contractSignTime"
|
|
|
+ end-placeholder="合同签订时间结束"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="合同签订时间开始"
|
|
|
type="daterange"
|
|
|
value-format="yyyy-MM-dd" />
|
|
|
</el-form-item>
|
|
|
@@ -232,7 +240,7 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- height: this.$baseTableHeight(2),
|
|
|
+ height: this.$baseTableHeight(3),
|
|
|
approStatusOption: {
|
|
|
10: '待提交审核',
|
|
|
20: '待审核',
|
|
|
@@ -260,6 +268,7 @@
|
|
|
custCityId: 0,
|
|
|
custCity: null,
|
|
|
filterDate: [],
|
|
|
+ contractSignTime: [],
|
|
|
},
|
|
|
provinceOptions: [],
|
|
|
selectRows: [], //选择的表格数据
|
|
|
@@ -415,6 +424,10 @@
|
|
|
params.contractEndTimeStart = this.queryForm.filterDate[0]
|
|
|
params.contractEndTimeEnd = this.queryForm.filterDate[1]
|
|
|
}
|
|
|
+ if (this.queryForm.contractSignTime && this.queryForm.contractSignTime.length === 2) {
|
|
|
+ params.contractSignTimeStart = this.queryForm.contractSignTime[0]
|
|
|
+ params.contractSignTimeEnd = this.queryForm.contractSignTime[1]
|
|
|
+ }
|
|
|
const [err, res] = await to(contractApi.getList(params))
|
|
|
if (err) return (this.listLoading = false)
|
|
|
this.list = res.data.list || []
|