From ff84e2e824811de3ba5790fd89b06e416a9b2cf2 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 21 Nov 2025 18:43:37 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.3' into test
---
src/views/tickets/orderLog.vue | 51 +++++++++++++++++++++++++++++++++++++--------------
src/views/device/airport.vue | 2 +-
2 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index ccaa340..fdddfba 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -85,7 +85,7 @@
</el-button>
</el-dropdown-item>
<el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete"
- v-if="permission.fly_device_offline" @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
+ v-if="permission.fly_device_offline && scope.row.mode_code !==0" @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
</el-dropdown-item>
<el-dropdown-item command="e">
<el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 3c39063..fe17d06 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -229,15 +229,15 @@
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="5">
<div class="flex">
- <div class="flex-1">
+ <div class="flex-1 flex-3">
<el-select v-model="form.rep_fre_type" placeholder="请选择频次">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
@@ -359,25 +359,35 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
+ <div class="flex">
+ <div class="flex-1 flex-3">
<el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
- </el-col>
-
- <el-col :span="3">
- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"
+ </div>
+ <div class="flex-1">
+ <el-time-picker v-model="form.deal_time" prop="deal_time"
value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" :disabled="detailTitle === '工单详情'" />
+ </div>
+ </div>
</el-col>
+
+<!-- <el-col :span="3">-->
+<!-- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"-->
+<!-- value-format="HH:mm" :picker-options="{-->
+<!-- selectableRange: '00:00 - 23:59',-->
+<!-- }" :disabled="detailTitle === '工单详情'" />-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -500,24 +510,34 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
+ <div class="flex">
+ <div class="flex-1 flex-3">
<el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
- </el-col>
-
- <el-col :span="3">
+ </div>
+ <div class="flex-1">
<el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
+ </div>
+ </div>
</el-col>
+
+<!-- <el-col :span="3">-->
+<!-- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"-->
+<!-- value-format="HH:mm" :picker-options="{-->
+<!-- selectableRange: '00:00 - 23:59',-->
+<!-- }" />-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -1680,4 +1700,7 @@
width: 100% !important;
}
}
+.flex-3 {
+ margin-right: 4px;
+}
</style>
--
Gitblit v1.9.3