This commit is contained in:
parent
71797054a3
commit
626155d519
|
|
@ -27,26 +27,6 @@
|
||||||
<el-form :model="queryParams" ref="queryFormRef" :inline="true" inline label-width="auto" size="small">
|
<el-form :model="queryParams" ref="queryFormRef" :inline="true" inline label-width="auto" size="small">
|
||||||
<el-card class="search-box">
|
<el-card class="search-box">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form-item prop="orderCreateUser" label="申请人">
|
|
||||||
<el-input
|
|
||||||
clearable
|
|
||||||
style="width: 200px"
|
|
||||||
placeholder="请输入内容"
|
|
||||||
v-model.trim="queryParams.orderCreateUser"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="申请时间" prop="orderCreateTime">
|
|
||||||
<el-date-picker
|
|
||||||
type="daterange"
|
|
||||||
style="width: 200px"
|
|
||||||
unlink-panels
|
|
||||||
range-separator="至"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
value-format="yyyy-MM-dd"
|
|
||||||
v-model="queryParams.orderCreateTime"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="审批状态" prop="status">
|
<el-form-item label="审批状态" prop="status">
|
||||||
<el-select clearable style="width: 200px" placeholder="请选择审批状态" v-model="queryParams.status">
|
<el-select clearable style="width: 200px" placeholder="请选择审批状态" v-model="queryParams.status">
|
||||||
|
|
|
||||||
|
|
@ -212,9 +212,12 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
// 获取流转记录列表
|
// 获取流转记录列表
|
||||||
async getRoamRecordList() {
|
async getRoamRecordList() {
|
||||||
if (this.dateRange.length > 0) {
|
if (this.dateRange&&this.dateRange.length > 0) {
|
||||||
this.queryParams.startTime = this.dateRange[0]
|
this.queryParams.startTime = this.dateRange[0]
|
||||||
this.queryParams.endTime = this.dateRange[1]
|
this.queryParams.endTime = this.dateRange[1]
|
||||||
|
}else{
|
||||||
|
this.queryParams.startTime = ''
|
||||||
|
this.queryParams.endTime = ''
|
||||||
}
|
}
|
||||||
const res = await getRoamRecordListAPI(this.queryParams)
|
const res = await getRoamRecordListAPI(this.queryParams)
|
||||||
this.tableData = res.rows
|
this.tableData = res.rows
|
||||||
|
|
|
||||||
|
|
@ -221,9 +221,12 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
// 获取流转记录列表
|
// 获取流转记录列表
|
||||||
async getRoamRecordList() {
|
async getRoamRecordList() {
|
||||||
if (this.dateRange.length > 0) {
|
if (this.dateRange && this.dateRange.length > 0) {
|
||||||
this.queryParams.startTime = this.dateRange[0]
|
this.queryParams.startTime = this.dateRange[0]
|
||||||
this.queryParams.endTime = this.dateRange[1]
|
this.queryParams.endTime = this.dateRange[1]
|
||||||
|
}else{
|
||||||
|
this.queryParams.startTime = ''
|
||||||
|
this.queryParams.endTime = ''
|
||||||
}
|
}
|
||||||
const res = await getRoamRecordListAPI(this.queryParams)
|
const res = await getRoamRecordListAPI(this.queryParams)
|
||||||
this.tableData = res.rows
|
this.tableData = res.rows
|
||||||
|
|
@ -247,7 +250,7 @@ export default {
|
||||||
|
|
||||||
// 重置
|
// 重置
|
||||||
onHandleReset() {
|
onHandleReset() {
|
||||||
this.queryParams = { keyWord: '', type: '', startTime: '', endTime: '', pageNum: 1, pageSize: 10 }
|
this.queryParams = { keyWord: '', type: '2', startTime: '', endTime: '', pageNum: 1, pageSize: 10 }
|
||||||
this.dateRange = []
|
this.dateRange = []
|
||||||
this.getRoamRecordList()
|
this.getRoamRecordList()
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -222,9 +222,12 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
// 获取流转记录列表
|
// 获取流转记录列表
|
||||||
async getRoamRecordList() {
|
async getRoamRecordList() {
|
||||||
if (this.dateRange.length > 0) {
|
if (this.dateRange&&this.dateRange.length > 0) {
|
||||||
this.queryParams.startTime = this.dateRange[0]
|
this.queryParams.startTime = this.dateRange[0]
|
||||||
this.queryParams.endTime = this.dateRange[1]
|
this.queryParams.endTime = this.dateRange[1]
|
||||||
|
}else{
|
||||||
|
this.queryParams.startTime = ''
|
||||||
|
this.queryParams.endTime = ''
|
||||||
}
|
}
|
||||||
const res = await getRoamRecordListAPI(this.queryParams)
|
const res = await getRoamRecordListAPI(this.queryParams)
|
||||||
this.tableData = res.rows
|
this.tableData = res.rows
|
||||||
|
|
|
||||||
|
|
@ -212,9 +212,12 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
// 获取流转记录列表
|
// 获取流转记录列表
|
||||||
async getRoamRecordList() {
|
async getRoamRecordList() {
|
||||||
if (this.dateRange.length > 0) {
|
if (this.dateRange &&this.dateRange.length > 0) {
|
||||||
this.queryParams.startTime = this.dateRange[0]
|
this.queryParams.startTime = this.dateRange[0]
|
||||||
this.queryParams.endTime = this.dateRange[1]
|
this.queryParams.endTime = this.dateRange[1]
|
||||||
|
}else{
|
||||||
|
this.queryParams.startTime = ''
|
||||||
|
this.queryParams.endTime = ''
|
||||||
}
|
}
|
||||||
const res = await getRoamRecordListAPI(this.queryParams)
|
const res = await getRoamRecordListAPI(this.queryParams)
|
||||||
this.tableData = res.rows
|
this.tableData = res.rows
|
||||||
|
|
|
||||||
|
|
@ -512,14 +512,20 @@ export default {
|
||||||
// 获取列表数据
|
// 获取列表数据
|
||||||
async getLeaseListData() {
|
async getLeaseListData() {
|
||||||
// 处理日期范围
|
// 处理日期范围
|
||||||
if (this.qcTime.length > 0) {
|
if (this.qcTime &&this.qcTime.length > 0) {
|
||||||
console.log(this.qcTime)
|
console.log(this.qcTime)
|
||||||
this.searchParams.qcStartTime = this.qcTime[0]
|
this.searchParams.qcStartTime = this.qcTime[0]
|
||||||
this.searchParams.qcEndTime = this.qcTime[1]
|
this.searchParams.qcEndTime = this.qcTime[1]
|
||||||
|
}else{
|
||||||
|
this.searchParams.qcStartTime = ''
|
||||||
|
this.searchParams.qcEndTime = ''
|
||||||
}
|
}
|
||||||
if (this.createTime.length > 0) {
|
if (this.createTime && this.createTime.length > 0) {
|
||||||
this.searchParams.createStartTime = this.createTime[0]
|
this.searchParams.createStartTime = this.createTime[0]
|
||||||
this.searchParams.createEndTime = this.createTime[1]
|
this.searchParams.createEndTime = this.createTime[1]
|
||||||
|
}else{
|
||||||
|
this.searchParams.createStartTime = ''
|
||||||
|
this.searchParams.createEndTime = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
@ -610,13 +616,19 @@ export default {
|
||||||
// 获取详情列表数据
|
// 获取详情列表数据
|
||||||
async getLeaseListDataInDialog() {
|
async getLeaseListDataInDialog() {
|
||||||
// 处理日期范围
|
// 处理日期范围
|
||||||
if (this.qcTime_1.length > 0) {
|
if (this.qcTime_1 && this.qcTime_1.length > 0) {
|
||||||
this.searchParamsInDialog.qcStartTime = this.qcTime_1[0]
|
this.searchParamsInDialog.qcStartTime = this.qcTime_1[0]
|
||||||
this.searchParamsInDialog.qcEndTime = this.qcTime_1[1]
|
this.searchParamsInDialog.qcEndTime = this.qcTime_1[1]
|
||||||
|
}else{
|
||||||
|
this.searchParamsInDialog.qcStartTime = ''
|
||||||
|
this.searchParamsInDialog.qcEndTime = ''
|
||||||
}
|
}
|
||||||
if (this.createTime_1.length > 0) {
|
if (this.createTime_1 &&this.createTime_1.length > 0) {
|
||||||
this.searchParamsInDialog.createStartTime = this.createTime_1[0]
|
this.searchParamsInDialog.createStartTime = this.createTime_1[0]
|
||||||
this.searchParamsInDialog.createEndTime = this.createTime_1[1]
|
this.searchParamsInDialog.createEndTime = this.createTime_1[1]
|
||||||
|
}else{
|
||||||
|
this.searchParamsInDialog.createStartTime = ''
|
||||||
|
this.searchParamsInDialog.createEndTime = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue