Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -148,7 +148,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-menu-item.is-active.submenu-title-noDropdown {
|
.el-menu-item.is-active {
|
||||||
background: #657b96; // 激活背景
|
background: #657b96; // 激活背景
|
||||||
color: #000; // 激活文字白色
|
color: #000; // 激活文字白色
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<logo v-if="showLogo" :collapse="isCollapse" />
|
<logo v-if="showLogo" :collapse="isCollapse" />
|
||||||
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
|
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
|
||||||
<el-menu
|
<el-menu
|
||||||
active-text-color="#000"
|
active-text-color="#000"
|
||||||
:default-active="activeMenu"
|
:default-active="activeMenu"
|
||||||
:collapse="isCollapse"
|
:collapse="isCollapse"
|
||||||
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
|
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
|
||||||
|
|||||||
@@ -833,9 +833,10 @@ export default {
|
|||||||
// 打开操作对话框
|
// 打开操作对话框
|
||||||
handleOperate(row, operation) {
|
handleOperate(row, operation) {
|
||||||
this.$refs.operateForm?.resetFields()
|
this.$refs.operateForm?.resetFields()
|
||||||
|
console.log(this.selectCard, row.posIdx)
|
||||||
this.operateMatForm = {
|
this.operateMatForm = {
|
||||||
porIdx: row.posIdx || null,
|
porIdx: row.posIdx.toString() || '',
|
||||||
trIdx: row.posIdx || null,
|
trIdx: row.posIdx.toString() || '',
|
||||||
planId: row.planId || '',
|
planId: row.planId || '',
|
||||||
entryMatId: row.matId || '',
|
entryMatId: row.matId || '',
|
||||||
planNo: row.planNo || '',
|
planNo: row.planNo || '',
|
||||||
|
|||||||
Reference in New Issue
Block a user