diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue index 8f3ff9c3..67cfae55 100644 --- a/src/views/xm/core/components/XmIterationSelect.vue +++ b/src/views/xm/core/components/XmIterationSelect.vue @@ -165,7 +165,7 @@ import { mapGetters } from 'vuex' - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + import XmIterationAdd from "../xmIteration/XmIterationEdit.vue"; export default { @@ -436,7 +436,7 @@ }, },//end methods components: { - MdpSelectUserXm, + XmIterationAdd, //在下面添加其它组件 }, diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue index 39e73a82..87475307 100644 --- a/src/views/xm/core/components/XmProductSelect.vue +++ b/src/views/xm/core/components/XmProductSelect.vue @@ -224,7 +224,7 @@ import util from "@/common/js/util"; //全局公共库 import { listXmProductWithState } from "@/api/xm/core/xmProduct"; import { mapGetters } from "vuex"; -import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + import XmProductAdd from "../xmProduct/XmProductEdit.vue"; const map = new Map(); @@ -509,7 +509,7 @@ export default { }, }, //end methods components: { - MdpSelectUserXm, + XmProductAdd, //在下面添加其它组件 }, diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue index fa77a29d..c2125f45 100644 --- a/src/views/xm/core/components/XmProjectSelect.vue +++ b/src/views/xm/core/components/XmProjectSelect.vue @@ -508,8 +508,7 @@ export default { this.addProjectVisible = false; }, }, //end methods - components: { - "mdp-select-user-xm":()=>import("./MdpSelectUserXm/index.vue"),XmProjectAdd, + components: { XmProjectAdd, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue index 0b54d709..6d2524f2 100644 --- a/src/views/xm/core/xmIteration/XmIterationEdit.vue +++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue @@ -53,7 +53,7 @@ import { initDicts,addXmIteration,editSomeFieldsXmIteration } from '@/api/xm/core/xmIteration'; import { mapGetters } from 'vuex' - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm"; + import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue' export default { @@ -249,7 +249,7 @@ },//end method components: { //在下面添加其它组件 'xm-iteration-edit':XmIterationEdit - MdpSelectUserXm,XmProductSelect, + XmProductSelect, }, mounted() { this.$nextTick(()=>{ diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index f3f1470d..f359d689 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -121,7 +121,7 @@ import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import XmFuncSelect from '../xmFunc/XmFuncSelect' - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' + export default { computed: { @@ -312,7 +312,7 @@ },//end method components: { //在下面添加其它组件 'xm-menu-edit':XmMenuEdit - MdpSelectUserXm, + 'xm-menu-edit':()=>import("./XmMenuDetail"), 'xm-epic-features-select':()=>import("./XmEpicFeaturesSelect"), XmFuncSelect, diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 558087a0..eeffe775 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -319,7 +319,7 @@ import XmFuncSelect from '../xmFunc/XmFuncSelect' import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect"; - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' + import CommentArea from '../xmMenuComment/comment-area.vue'; export default { computed: { @@ -681,7 +681,7 @@ import CommentArea from '../xmMenuComment/comment-area.vue'; XmRecord, XmMyDoFocus, ArchiveEdit, - XmTestCaseMng,MdpSelectUserXm, + XmTestCaseMng, 'xm-menu-edit':()=>import("./XmMenuDetail"), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), XmEpicFeaturesSelect, diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 3d59c7df..2c3e1461 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -432,7 +432,7 @@ import {sn} from '@/common/js/sequence' import { mapGetters } from 'vuex' - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + export default { props:[ 'xmIteration','xmProduct','disabledMng','parentMenu','selProject'], @@ -1383,7 +1383,7 @@ XmTableConfig, XmGroupDialog, XmIterationSelect, - MdpSelectUserXm, + XmMenuAgileKanbanUser, XmFuncSelect, //在下面添加其它组件 diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue index b56d8f1c..5a51c811 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue @@ -91,7 +91,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 import XmGroupDialog from '../xmGroup/XmGroupDialog'; import { mapGetters } from 'vuex' - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm/index';//修改界面 + export default { computed: { @@ -331,7 +331,7 @@ export default { } }, //end methods components: { - XmGroupDialog,'xm-question-edit':()=>import('../xmQuestion/XmQuestionEdit'),MdpSelectUserXm, + XmGroupDialog,'xm-question-edit':()=>import('../xmQuestion/XmQuestionEdit'), }, mounted() { this.initData(); diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue index 827a952c..7974f8d8 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue @@ -100,7 +100,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 import XmMenuWorkload from '@/views/xm/core/components/XmMenuWorkload';//修改界面 import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';//修改界面 - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm/index';//修改界面 + import TagDialog from "@/views/mdp/arc/tag/TagDialog"; import { mapGetters } from 'vuex' @@ -335,7 +335,7 @@ export default { TagDialog, XmMenuWorkload, XmIterationSelect, - MdpSelectUserXm, + 'xm-menu-edit':()=>import('../xmMenu/XmMenuEdit') }, mounted() { diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue index d8269f13..5c8eb83a 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue @@ -152,7 +152,7 @@ import XmWorkloadRecordDialog from '../xmWorkload/XmWorkloadRecordDialog.vue'; import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm/index';//修改界面 + export default { computed: { ...mapGetters(["userInfo", "roles"]), @@ -547,7 +547,7 @@ export default { } }, //end methods components: { - XmWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),XmPhaseSelect,MdpSelectUserXm, + XmWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),XmPhaseSelect, }, mounted() { this.initData(); diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 542f6d72..aa1abd0e 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -418,7 +418,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'; import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'; import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus'; - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + import Guider from '@/components/Guider/Index.js'; import store from '@/store' @@ -855,7 +855,7 @@ XmIterationSelect, XmProductSelect, XmProductTplMng, - MdpSelectUserXm, + //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 7814ea89..18b769f8 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -406,7 +406,7 @@ import xmTaskMng from '../xmTask/XmTaskMng'; import XmProjectTplMng from './XmProjectTplMng'; import XmProductSelect from '@/views/xm/core/components/XmProductSelect'; - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + import store from '@/store' @@ -947,7 +947,7 @@ 'xm-project-edit':XmProjectEdit, XmProductSelect, xmTaskMng, - XmProjectTplMng,MdpSelectUserXm + XmProjectTplMng //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 178cb247..6d469ea9 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -215,7 +215,7 @@ import XmMyDoFocus from '@/views/myWork/my/components/DoFocus'; import XmFuncSelect from '../xmFunc/XmFuncSelect' - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm/index' + import TestStepConfig from '../xmTestCase/TestStepConfig.vue'; import TestStepResult from '../xmTestPlanCase/TestStepResult.vue'; import XmProductSelect from '@/views/xm/core/components/XmProductSelect' @@ -672,7 +672,7 @@ components: { //在下面添加其它组件 'xm-question-edit':XmQuestionEdit 'upload': AttachmentUpload,VueEditor,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect, - XmMyDoFocus,XmFuncSelect,MdpSelectUserXm,TestStepConfig,TestStepResult, + XmMyDoFocus,XmFuncSelect,TestStepConfig,TestStepResult, xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseSelect'), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), }, diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 7ae86de6..739eae98 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -254,7 +254,7 @@ import xmMenuSelect from '../xmMenu/XmMenuSelect'; import XmGroupDialog from '../xmGroup/XmGroupDialog'; import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect'; - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面 import TagDialog from '@/views/mdp/arc/tag/TagDialog.vue'; @@ -1090,7 +1090,7 @@ components: { 'xm-question-add':XmQuestionAdd, 'xm-question-edit':XmQuestionEdit, - XmGroupDialog,XmProjectSelect,xmMenuSelect,XmProductSelect, TagDialog,MdpSelectUserXm, + XmGroupDialog,XmProjectSelect,xmMenuSelect,XmProductSelect, TagDialog, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index cb90bb9a..a3be47ba 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -243,7 +243,7 @@ import xmMenuSelect from '../xmMenu/XmMenuSelect'; import XmPhaseSelect from './XmPhaseSelect'; import XmTaskList from '../xmTask/XmTaskList'; - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' + import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; export default { computed: { @@ -673,7 +673,7 @@ },//end method components: { xmSkillMng, - skillMng,xmMenuSelect,XmTaskList,MdpSelectUserXm,XmPhaseSelect,XmProjectSelect + skillMng,xmMenuSelect,XmTaskList,XmPhaseSelect,XmProjectSelect //在下面添加其它组件 'xm-task-edit':XmTaskEdit }, mounted() { diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index fb2971f5..65baf01f 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -554,7 +554,7 @@ import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail'; import TagMng from "@/views/mdp/arc/tag/TagMng"; import XmRecord from '../xmRecord/XmRecord' - import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' + import XmSubWorkItem from "@/views/xm/core/xmTaskWorkItem/XmSubWorkItem"; import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng"; import XmWorkloadRecord from "../xmWorkload/XmWorkloadRecord" @@ -1056,7 +1056,7 @@ components: { xmSkillMng, skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, - XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"), + XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,'xm-task-edit':()=>import("./XmTaskDetail"), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), "v-region":RegionGroup , //在下面添加其它组件 'xm-task-edit':XmTaskEdit diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index edc83b15..f545196a 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -891,7 +891,7 @@ import XmGantt from "../components/xm-gantt"; import XmPhaseSelect from "./XmPhaseSelect.vue"; import { addTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; -import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + export default { computed: { @@ -2263,7 +2263,7 @@ export default { XmWorkloadEdit, XmWorkloadInit, XmPhaseSelect, - MdpSelectUserXm, + //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue index d3b636bd..0d5ded80 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue @@ -143,7 +143,7 @@ import { mapGetters } from 'vuex' import html2canvas from 'html2canvas' import { uploadBase64 } from '@/api/mdp/arc/image'; - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + export default { computed: { @@ -739,7 +739,7 @@ components: { 'xm-task-execuser-add':XmTaskExecuserAdd, 'xm-task-execuser-edit':XmTaskExecuserEdit, - MdpSelectUserXm, + //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index 30dcb3a8..22a02dba 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -180,7 +180,7 @@ import html2canvas from 'html2canvas' import { uploadBase64 } from '@/api/mdp/arc/image'; import XmWorkloadEdit from "@/views/xm/core/xmWorkload/XmWorkloadEdit"; - import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; + export default { computed: { @@ -828,7 +828,7 @@ },//end methods components: { 'xm-task-execuser-add':XmTaskExecuserAdd, - 'xm-task-execuser-edit':XmTaskExecuserEdit, XmWorkloadEdit,MdpSelectUserXm + 'xm-task-execuser-edit':XmTaskExecuserEdit, XmWorkloadEdit //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue index 6cd212d8..7e37dcdf 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue @@ -81,7 +81,7 @@