From b2639577f119115edb1bb5a67f3d137ddb3be6c6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 18 三月 2025 14:56:31 +0800
Subject: [PATCH] 1.成品下单-退回可以重新提交 2.侧边栏样式修改
---
src/assets/styles/sidebar.scss | 26 +++++++++++++++++---------
src/views/business/productOrder/components/add.vue | 9 ++++++---
src/layout/components/Sidebar/SidebarItem.vue | 5 +++++
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 8e69993..1b8d070 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -109,11 +109,11 @@
.hideSidebar {
.sidebar-container {
- width: 54px !important;
+ width: 70px !important;
}
.main-container {
- margin-left: 54px;
+ margin-left: 70px;
}
.submenu-title-noDropdown {
@@ -124,7 +124,9 @@
padding: 0 !important;
.svg-icon {
- margin-left: 20px;
+ width: 1.5em;
+ height: 1.5em;
+ margin-left: 25px;
}
}
}
@@ -136,7 +138,9 @@
padding: 0 !important;
.svg-icon {
- margin-left: 20px;
+ width: 1.5em;
+ height: 1.5em;
+ margin-left: 25px;
}
}
@@ -145,12 +149,16 @@
.el-menu--collapse {
.el-submenu {
&>.el-submenu__title {
+ height: auto; /* 鏍规嵁鍐呭鑷姩璋冩暣楂樺害 */
+ flex-direction: column; /* 鏀瑰彉甯冨眬鏂瑰悜涓哄瀭鐩� */
+ align-items: center; /* 灞呬腑瀵归綈 */
+ margin-bottom: 10px;
&>span {
- height: 0;
- width: 0;
- overflow: hidden;
- visibility: hidden;
- display: inline-block;
+ display: block !important;
+ visibility: visible !important;
+ white-space: normal; /* 鍏佽鎹㈣ */
+ text-align: center; /* 鏂囨湰灞呬腑瀵归綈 */
+ line-height: normal;
}
}
}
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index fabc61e..1a7b1bf 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -97,3 +97,8 @@
}
}
</script>
+<style scoped>
+::v-deep .el-submenu__title i {
+ color: #ffffff !important;
+}
+</style>
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index bb0553c..bf2f385 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -1130,7 +1130,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1168,7 +1170,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1657,7 +1661,6 @@
},
tableRowClassName({row, rowIndex}) {
if (row.state == 1) {
- console.log('row.state---', row.state)
return 'warning-row';
} else {
return '';
--
Gitblit v1.9.3