From 5749d7cd9cb870f3aaceac107048eb75e1d7683f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 16 May 2025 09:59:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
src/views/tickets/ticket.vue | 16 ++++++++++++----
src/views/system/user.vue | 14 ++++++++++++++
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 92b8d9c..4750487 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -363,6 +363,20 @@
viewDisplay: false,
rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
+ {
+ label: '到期时间',
+ prop: 'expireTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ rules: [
+ {
+ required: true,
+ message: '请选择到期时间',
+ trigger: 'blur',
+ },
+ ],
+ },
],
},
{
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 2b71973..e3b0b52 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -453,8 +453,7 @@
:preview-src-list="getImageList()" :initial-index="currentImageIndex - 1" class="preview-image"
style="cursor: pointer"> -->
<el-image v-if="currentReviewImage" :src="getPreviewUrl(currentReviewImage)" fit="fill"
- :initial-index="currentImageIndex - 1" class="preview-image"
- style="cursor: pointer">
+ :initial-index="currentImageIndex - 1" class="preview-image" style="cursor: pointer">
<template #error>
<div class="image-error">
<i class="el-icon-picture-outline"></i>
@@ -869,7 +868,11 @@
formattedDetailFields () {
const fields = [
{ label: '工单名称', value: this.currentDetail.orderName },
- { label: '工单类型', value: this.currentDetail.type },
+ {
+ label: '工单类型',
+ // 修改这里：使用 types 数组查找对应的 label
+ value: this.types.find(t => t.value === this.currentDetail.type)?.label || this.currentDetail.type || '/'
+ },
{ label: '关联任务', value: this.currentDetail.job_name || '/' },
{ label: '任务发起人', value: this.currentDetail.creator },
{ label: '当前状态', value: this.mapStatus(this.currentDetail.status) },
@@ -2432,6 +2435,9 @@
function closeConfirm () {
that.reCheckDialog = false
+ that.page.currentPage = 1
+ that.fetchTableData()
+ that.fetchTabCounts()
loading.close()
}
@@ -2440,6 +2446,8 @@
ElMessageBox.confirm(`预计复核执行时间为${res.data.data}`, '提示', {
confirmButtonText: '确定',
showCancelButton: false, // 关键配置
+ closeOnClickModal: false,
+ closeOnPressEscape: false,
type: 'warning',
}).then(() => {
closeConfirm()
@@ -2975,7 +2983,7 @@
:deep(.el-dialog__body) {
padding: 0;
background-color: #f5f7fa;
-
+
}
}
--
Gitblit v1.9.3