From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/tickets/ticketComponent/TicketDetailDialog.vue | 139 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 128 insertions(+), 11 deletions(-)
diff --git a/src/views/tickets/ticketComponent/TicketDetailDialog.vue b/src/views/tickets/ticketComponent/TicketDetailDialog.vue
index 8a4209d..3532696 100644
--- a/src/views/tickets/ticketComponent/TicketDetailDialog.vue
+++ b/src/views/tickets/ticketComponent/TicketDetailDialog.vue
@@ -641,7 +641,7 @@
const hasProcessedAndOverBtnPermission = () => {
return props.permission && props.permission.tickets_view_processedAndOver === true;
};
-
+// 通过不通过
const hasReviewBtnPermission = () => {
return props.permission && props.permission.tickets_review_btn === true;
};
@@ -783,9 +783,9 @@
<style lang="scss">
.custom-dialog {
height: 96vh;
+// min-height: 50vh;
.el-dialog__body {
border-top: 0.1rem solid #f0f0f0;
- overflow: hidden;
}
}
@@ -828,8 +828,8 @@
right: 92%;
top: 50%;
transform: translateY(-50%);
- min-width: 100px;
-
+ width: 100px;
+ margin-left: 4px;
color: #666;
font-size: 12px;
white-space: nowrap;
@@ -842,6 +842,9 @@
margin-bottom: 12px;
}
+.action-bar {
+ margin-bottom: 16px;
+}
.el-dialog {
.el-form-item {
@@ -869,14 +872,116 @@
margin-top: 12px;
}
+.create-ticket-form {
+ padding: 20px 10px;
+
+ .form-section {
+ background-color: #fff;
+ border-radius: 4px;
+
+ .el-row {
+ margin-bottom: 16px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
+
+ .location-wrapper {
+ width: 100%; // 修改为100%以适应父容器
+ height: auto; // 修改为auto以自适应内容
+
+ .map-button {
+ width: 100%; // 让按钮填满容器宽度
+ height: 36px; // 与其他输入框保持一致的高度
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ i {
+ margin-right: 4px;
+ }
+ }
+
+ .location-text {
+ margin-top: 8px;
+ padding: 8px 12px;
+ background-color: #f5f7fa;
+ border-radius: 4px;
+ color: #606266;
+ font-size: 13px;
+ line-height: 1.4;
+ }
+ }
+
+ .upload-wrapper {
+ .uploader {
+ :deep(.el-upload--picture-card) {
+ width: 120px;
+ height: 100px;
+ line-height: 128px;
+ }
+
+ :deep(.el-upload-list__item) {
+ width: 120px;
+ height: 120px;
+ }
+ }
+
+ .upload-tip {
+ font-size: 12px;
+ color: #909399;
+ line-height: 1.4;
+ margin-top: 8px;
+ }
+ }
+
+ .el-form-item {
+ margin-bottom: 18px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+
+ :deep(.el-form-item__label) {
+ font-weight: 500;
+ color: #606266;
+ }
+ :deep(.el-textarea__inner) {
+ padding: 8px 12px;
+ }
+ .full-width {
+ width: 100%;
+ }
+}
+
:deep(.el-dialog__body) {
border-top: 0.1rem solid #f0f0f0;
}
+.dialog-footer-new {
+ text-align: right;
+ padding-top: 16px;
+ border-top: 1px solid #ebeef5;
+
+ .el-button + .el-button {
+ margin-left: 12px;
+ }
+
+ .el-button {
+ padding: 9px 20px;
+
+ &:last-child {
+ margin-left: 12px;
+ }
+ }
+}
.dialog-footer1-new {
position: sticky;
- // bottom: 28px;
+ bottom: 28px;
left: 0;
right: 0;
background: white;
@@ -918,6 +1023,18 @@
}
}
+.location-info {
+ margin-top: 10px;
+ padding: 10px;
+ background-color: #f5f7fa;
+ border-radius: 4px;
+
+ p {
+ margin: 5px 0;
+ color: #606266;
+ font-size: 14px;
+ }
+}
.map-select {
display: flex;
@@ -1073,13 +1190,12 @@
}
.PopUpTableScrolls {
- max-height: calc(100vh - 370px);
- min-height: 200px;
- overflow-y: auto;
+ max-height: 600px;
+ overflow-y: scroll;
overflow-x: hidden;
- padding-bottom: 30px;
- // scrollbar-width: thin;
+
}
+
.media-box {
width: 100%;
border: 1px solid #dcdfe6;
@@ -1263,7 +1379,6 @@
}
}
}
-
/* 新建工单和处理工单的上传组件样式 */
.create-upload,
.detail-upload {
@@ -1298,6 +1413,7 @@
object-fit: contain;
}
}
+
/* 必填项样式 */
.required-label {
position: relative;
@@ -1308,6 +1424,7 @@
margin-right: 4px;
}
}
+
/* 必填输入框样式 */
.required-input {
width: 100%;
--
Gitblit v1.9.3