From 090103c6938f2361dea6b11e844eb21daaf0b8e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 16:59:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 3 -
applications/task-work-order/src/styles/common/cockpit.scss | 45 ++++++++++++++++++++++
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 7 ---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue | 17 --------
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 1
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 1
6 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 31714b1..e84887a 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -471,6 +471,33 @@
color: #161B2C;
}
+
+ .detail-container {
+ display: flex;
+ justify-content: space-between;
+
+ .detail-left {
+ margin-right: 20px;
+ width: 312px;
+ padding: 24px;
+ border: 1px solid #E4E4E4;
+ }
+
+ .detail-right {
+ &>div {
+ .detail-title {
+ margin: 10px 0;
+ }
+
+ &:first-child {
+ .detail-title {
+ margin-top: 0;
+ }
+ }
+ }
+ }
+ }
+
// 查看
.detail-row-view {
background: #F2F3F5;
@@ -1127,4 +1154,22 @@
.fixed-column {
background-color: #1A1A2A !important;
}
+}
+
+.el-popper {
+ .el-menu--popup-container {
+ .el-menu {
+ .el-menu-item.is-active {
+ &::before {
+ display: none;
+ }
+
+ background: #4C34FF;
+
+ span {
+ color: #fff;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index 79da1ba..c5d77b1 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -479,9 +479,6 @@
</script>
<style scoped lang="scss">
-.detail-container {
- padding: 20px;
-}
.upload-container {
width: 100%;
}
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
index 6a64925..34c28df 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -419,13 +419,6 @@
</script>
<style scoped lang="scss">
-.detail-container {
- padding: 20px;
- display: flex;
- gap: 30px;
- align-items: stretch;
-}
-
/* 左侧步骤条 */
.detail-left {
width: 35%;
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
index 57931d3..3fa0b0e 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
@@ -65,21 +65,4 @@
</script>
<style scoped lang="scss">
-.detail-container {
- padding: 20px;
- display: flex;
- align-items: flex-start;
- gap: 30px;
- .detail-cell {
- display: flex;
- justify-content: center;
- .cell-label {
- min-width: 80px;
- flex-shrink: 0;
- }
- :deep(.el-textarea__inner) {
- height: 100px !important;
- }
- }
-}
</style>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index a7012a1..ccbe7a3 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -525,7 +525,6 @@
}
}
.processBox {
- margin-right: 20px;
width: 312px;
padding: 24px 0;
border: 1px solid #e4e4e4;
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 5c51aed..02b0a4b 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -650,7 +650,6 @@
}
.processBox {
- margin-right: 20px;
padding: 24px 0;
width: 312px;
border: 1px solid #e4e4e4;
--
Gitblit v1.9.3