mirror of
https://gitee.com/maimengcloud/xm-ui-web.git
synced 2025-12-30 10:12:26 +00:00
优化
This commit is contained in:
@@ -265,7 +265,7 @@ export const MdpTableMixin = {
|
||||
|
||||
defaultCheckColumnNum:{
|
||||
type: Number,//默认展示的表格列数,前8列
|
||||
default: 9
|
||||
default: 30
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@@ -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="<ol><li></li><li></li></ol>"
|
||||
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){
|
||||
|
||||
@@ -78,16 +78,13 @@
|
||||
</el-form-item>
|
||||
<el-row class="padding">
|
||||
<el-col :span="8">
|
||||
<mdp-field v-if="!editForm.pmenuId" show-style="x" v-model="editForm.pmenuId" :disabled="true" label="上级需求" />
|
||||
|
||||
|
||||
<mdp-field v-else show-style="x" v-model="editForm.pmenuId"
|
||||
<mdp-field show-style="x" v-model="editForm.pmenuId"
|
||||
:label="editForm.dclass === '3' ? '归属特性' : (editForm.dclass === '2' ? '归属史诗' : '归属')"
|
||||
:icon="editForm.dclass === '2' ? 's-promotion' : 's-flag'"
|
||||
:color="editForm.dclass === '2' ? 'rgb(255, 153, 51)' : 'rgb(0, 153, 51)'">
|
||||
<template #oper>
|
||||
<el-space wrap>
|
||||
<el-button @click="$refs['parentDetailDlg'].open()" title="查看上级" icon="upload2"> 查看上级</el-button>
|
||||
<el-button v-if="editForm.pmenuId && editForm.pmenuId!='0'" @click="$refs['parentDetailDlg'].open()" title="查看上级" icon="upload2"> 查看上级</el-button>
|
||||
<el-button @click="$refs['parentDlg'].open()" title="更换上级" icon="upload2"> 更换上级</el-button>
|
||||
</el-space>
|
||||
</template>
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
>
|
||||
<el-table-column sortable type="selection" width="40" v-if="currOpType=='mng'||multiple"/>
|
||||
|
||||
<el-table-column prop="menuName" :label="queryScope=='story'?'故事名称':'史诗/特性/故事'" min-width="350" col-prefix="res." sortable>
|
||||
<el-table-column fixed="left" prop="menuName" :label="queryScope=='story'?'故事名称':'史诗/特性/故事'" min-width="350" col-prefix="res." sortable>
|
||||
<template #default="scope">
|
||||
<el-popover placement="right-start"
|
||||
:width="200" show-after="200"
|
||||
|
||||
@@ -597,6 +597,7 @@ import { Editor as VueEditor } from '@/components/Editor'
|
||||
this.editForm.toTaskCenter = "0"
|
||||
this.editForm.crowd = "0"
|
||||
this.editForm.level='2'
|
||||
|
||||
} else {
|
||||
this.editForm.parentTaskid = ''
|
||||
this.editForm.parentTaskname = '';
|
||||
@@ -615,13 +616,13 @@ import { Editor as VueEditor } from '@/components/Editor'
|
||||
this.editForm.productName = this.xmIteration.productName
|
||||
}
|
||||
if (this.parentTask && this.parentTask.id) {
|
||||
if (this.parentTask.childrenCnt && this.parentTask.sortLevel) {
|
||||
this.editForm.sortLevel = this.parentTask.sortLevel + "." + (this.parentTask.childrenCnt + 1)
|
||||
} else if (this.parentTask.sortLevel) {
|
||||
this.editForm.sortLevel = this.parentTask.sortLevel + "." + 1
|
||||
} else {
|
||||
this.editForm.sortLevel = "" + 1
|
||||
}
|
||||
if (this.parentTask.childrenCnt) {
|
||||
this.editForm.sortLevel = (this.parentTask.sortLevel||'') + "." + (this.parentTask.childrenCnt + 1)
|
||||
} else {
|
||||
this.editForm.sortLevel = (this.parentTask.sortLevel||'') + "." + 1
|
||||
}
|
||||
}else {
|
||||
this.editForm.sortLevel=''
|
||||
}
|
||||
if (!this.editForm.uniInnerPrice) {
|
||||
this.editForm.uniInnerPrice = 80
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
icon="upload2"
|
||||
> 选择新的上级</el-button>
|
||||
|
||||
<el-button v-if="editForm.parentTaskid"
|
||||
<el-button v-if="editForm.parentTaskid && editForm.parentTaskid!='0'"
|
||||
@click="parentPlanVisible=true"
|
||||
title="查看上级计划明细"
|
||||
icon="upload2"
|
||||
|
||||
@@ -715,6 +715,7 @@ export default {
|
||||
i.id = i.menuId;
|
||||
i.parentTaskid = i.pmenuId;
|
||||
i.name = i.menuName;
|
||||
i.sortLevel=i.seqNo
|
||||
i.ntype = (this.queryScope=='task'?'0':'1')
|
||||
});
|
||||
this.onTaskTemplatesSelected(menus2);
|
||||
|
||||
@@ -46,12 +46,12 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
|
||||
|
||||
*/
|
||||
|
||||
// ['/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,
|
||||
|
||||
Reference in New Issue
Block a user