From 1ff5a84b5a95d17dae9b77ad4570c34293935a75 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 17 Apr 2025 11:37:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 9519a7d..ae7d30f 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -67,7 +67,7 @@
:table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
@on-load="onLoad" @search-change="searchChange" @size-change="sizeChange">
<template #menu-left>
- <el-button v-if="hasAddBtnPermission()" type="primary" icon="el-icon-plus" @click="handleAdd">新建工单</el-button>
+ <el-button v-if="hasAddBtnPermission() && activeTab!='WAIT_AUDIT'" type="primary" icon="el-icon-plus" >新建工单</el-button>
<el-button type="success" plain icon="el-icon-download" @click="exportData">导出</el-button>
</template>
@@ -118,7 +118,9 @@
</el-tabs>
<!-- 新建工单对话框 -->
- <el-dialog v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
+ <el-dialog v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
+
+
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
@@ -523,7 +525,7 @@
},
formatCycleTime(row) {
return row.begin_time + '-' + row.end_time + '<br/>'
- + row.rep_rule_type + row.rep_rule_val
+ + row.rep_rule_val
},
async fetchTableData() {
--
Gitblit v1.9.3