diff --git a/src/components/mdp-ui/mixin/MdpTableMixin.js b/src/components/mdp-ui/mixin/MdpTableMixin.js
index fc76b971..f1ed1e73 100644
--- a/src/components/mdp-ui/mixin/MdpTableMixin.js
+++ b/src/components/mdp-ui/mixin/MdpTableMixin.js
@@ -265,7 +265,7 @@ export const MdpTableMixin = {
defaultCheckColumnNum:{
type: Number,//默认展示的表格列数,前8列
- default: 9
+ default: 30
},
/**
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index c514cd7c..0e6c9fff 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -267,11 +267,11 @@ import { useUserStore } from '@/store/modules/user'
this.addForm.mmUserid=this.userInfo.userid
this.addForm.mmUsername=this.userInfo.username
this.addForm.remark="
"
- if(this.parentMenu && this.parentMenu.menuId){
+ if(this.parentMenu && this.parentMenu.menuId){
if(this.parentMenu.childrenCnt){
- this.addForm.seqNo=this.parentMenu.seqNo+"."+(this.parentMenu.childrenCnt+1)
+ this.addForm.seqNo=(this.parentMenu.seqNo||'')+"."+(this.parentMenu.childrenCnt+1)
}else{
- this.addForm.seqNo=this.parentMenu.seqNo+"."+1
+ this.addForm.seqNo=(this.parentMenu.seqNo||'')+"."+1
}
this.addForm.pmenuId=this.parentMenu.menuId
this.addForm.pmenuName=this.parentMenu.menuName
@@ -294,6 +294,8 @@ import { useUserStore } from '@/store/modules/user'
this.addForm.calcType="1"
}
+ }else{
+ this.addForm.seqNo=''
}
},
onParentMenuSelected(pmenu){
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index a4724c84..f216066d 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -78,16 +78,13 @@
-
-
-
-
- 查看上级
+ 查看上级
更换上级
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index f7848c06..c6dc6393 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -184,7 +184,7 @@
>
-
+
选择新的上级
- {
*/
- // ['/api/xm']: {
- // target: 'http://localhost:7067',
- // ws: false,
- // changeOrigin: true,
- // rewrite: (path) => path.replace(new RegExp(`^/api/xm`), '/'),
- // },
+ ['/api/xm']: {
+ target: 'http://localhost:7067',
+ ws: false,
+ changeOrigin: true,
+ rewrite: (path) => path.replace(new RegExp(`^/api/xm`), '/'),
+ },
['/api']: {
target: 'https://www.qingqinkj.com',
ws: false,