From e3b93be481dd6e1daa05e92f1cddf953c4ab870e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 28 Apr 2025 19:13:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 3ca9667..40e8f5e 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -25,7 +25,7 @@
:value="dept.value" />
</el-select>
- <el-date-picker v-model="filters.dateRange" type="datetimerange" range-separator="至"
+ <el-date-picker v-model="filters.dateRange" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" class="filter-item" style="width: 100px"
:default-value="datePickerDefaultVal" />
<el-select v-model="filters.file_id" placeholder="请选择关联航线" class="filter-item frequency"
@@ -49,17 +49,17 @@
:value="item.value" />
</el-select>
- <el-date-picker v-model="filters.cycleDateRange" type="datetimerange" range-separator="至"
+ <!-- <el-date-picker v-model="filters.cycleDateRange" type="datetimerange" range-separator="至"
start-placeholder="工单周期开始日期" end-placeholder="工单周期结束时间日期" class="filter-item"
- :default-value="datePickerDefaultVal"
- style="width: 220px !important" />
- <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item frequency">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- <el-time-picker style="width: 150px" v-model="filters.deal_time" placeholder="请选择执行时间"
+ style="width: 220px !important" /> -->
+ <el-time-picker style="width: 250px" v-model="filters.deal_time" placeholder="请选择执行时间"
prop="deal_time" value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
+ <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item frequency">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+
<el-col :span="8">
</el-col>
<el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
--
Gitblit v1.9.3