diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 2aa8d8e3..9d593071 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -627,17 +627,6 @@ export default { ] }, - { - path: '/xm/core/xmIteration/XmIterationInfoRoute', - component: _import('xm/core/xmIteration/XmIterationInfoRoute'), - name: 'XmIterationInfoRoute', - iconCls: 'fa el-icon-menu', - meta: { - title: '迭代管理-路由跳转', - icon: 'flow',roles:["user"] - }, - hidden:true - }, { path: '/xm/core', component: Layout, diff --git a/src/views/xm/core/xmGroup/XmGroupDialog.vue b/src/views/xm/core/xmGroup/XmGroupDialog.vue index dad8b331..06480431 100644 --- a/src/views/xm/core/xmGroup/XmGroupDialog.vue +++ b/src/views/xm/core/xmGroup/XmGroupDialog.vue @@ -11,7 +11,7 @@ import { mapGetters } from 'vuex' - import XmGroupSelect from "./XmGroupSelect.vue" + import XmGroupSelect from "./XmGroupSelectForProject.vue" export default { name:"tagDialog", computed: { diff --git a/src/views/xm/core/xmGroup/XmGroupSelectForProduct.vue b/src/views/xm/core/xmGroup/XmGroupSelectForProduct.vue index 5d70d9e5..68f37967 100644 --- a/src/views/xm/core/xmGroup/XmGroupSelectForProduct.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelectForProduct.vue @@ -2,7 +2,7 @@
- + 确认选择 @@ -49,7 +49,7 @@ ]) }, // - props: ['visible','isSelectSingleUser','isSelectMultiUser','xmProduct'], + props: ['visible','isSelectSingleUser','isSelectMultiUser','selProject','xmProduct'], watch: { "selGroups": function(selGroups) { if(this.selGroups){ diff --git a/src/views/xm/core/xmGroup/XmGroupSelectForProject.vue b/src/views/xm/core/xmGroup/XmGroupSelectForProject.vue index 1a4a0470..809bc2ef 100644 --- a/src/views/xm/core/xmGroup/XmGroupSelectForProject.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelectForProject.vue @@ -2,7 +2,7 @@
- + 确认选择 @@ -49,7 +49,7 @@ ]) }, // - props: ['visible','selProject','isSelectSingleUser','isSelectMultiUser'], + props: ['visible','selProject','isSelectSingleUser','isSelectMultiUser','xmProduct'], watch: { "selGroups": function(selGroups) { if(this.selGroups){ diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue deleted file mode 100644 index 2b314c94..00000000 --- a/src/views/xm/core/xmIteration/XmIterationInfo.vue +++ /dev/null @@ -1,837 +0,0 @@ - - - - - diff --git a/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue b/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue deleted file mode 100644 index eaa10f55..00000000 --- a/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 1c0473c8..d1989b7c 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -179,9 +179,6 @@ 保存 - - - @@ -212,8 +209,6 @@ import { mapGetters } from 'vuex'; import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件 import {sn} from '@/common/js/sequence'; - - import XmGroupMng from '../xmGroup/XmGroupSelect'; import VueEditor from '@/components/Tinymce/index'; import XmTaskList from '../xmTask/XmTaskList'; import xmMenuSelect from '../xmMenu/XmMenuSelect'; @@ -343,7 +338,6 @@ }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ fileVisible: true, - selectUserVisible: false, userFieldName:'', xmQuestionHandles:[], selectTaskVisible:false, @@ -426,25 +420,6 @@ const d = date.getDate(); return date.getFullYear()+"-"+(m < 10 ? "0"+m : m)+"-"+ (d < 10 ? "0"+d : d) + " 00:00:00"; }, - showGroupUsers:function(fieldName){ - this.userFieldName=fieldName; - this.selectUserVisible=true; - }, - onUserConfirm:function(groupUsers){ - if(groupUsers==null || groupUsers.length==0){ - - }else{ - if(this.userFieldName==='handlerUserid'){ - this.editForm.handlerUserid=groupUsers[0].userid - this.editForm.handlerUsername=groupUsers[0].username - }else if(this.userFieldName==='askUserid'){ - this.editForm.askUserid=groupUsers[0].userid - this.editForm.askUsername=groupUsers[0].username - } - this.editXmQuestionSomeFields(this.editForm,this.userFieldName,groupUsers) - } - this.selectUserVisible=false - }, handleQuestion:function(tardgetBugStatus){ this.editSubmit(tardgetBugStatus); }, @@ -700,7 +675,7 @@ },//end method components: { //在下面添加其它组件 'xm-question-edit':XmQuestionEdit - 'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect, + 'upload': AttachmentUpload,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect, XmMyDoFocus,XmFuncSelect,MdpSelectUserXm,TestStepConfig,TestStepResult, xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseSelect'), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index ad45f87b..dab373d0 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -561,7 +561,6 @@ import xmMenuSelect from '../xmMenu/XmMenuSelect'; import XmTaskList from '../xmTask/XmTaskList'; import XmExecuserMng from '../xmTaskExecuser/XmTaskExecuserForTask'; - import XmGroupSelect from '../xmGroup/XmGroupSelect.vue'; import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail'; import TagMng from "@/views/mdp/arc/tag/TagMng"; import XmRecord from '../xmRecord/XmRecord' @@ -720,8 +719,6 @@ skillVisible: false, taskSkills: [], selectTaskVisible:false, - groupUserSelectVisible:false, - execGroupUserSelectVisible:false, pickerOptions: util.getPickerOptions('datarange'), tagSelectVisible:false, subWorkItemNum:0, @@ -1060,7 +1057,7 @@ },//end method components: { xmSkillMng, - skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, + skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), "v-region":RegionGroup , diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 4e625db4..231855c6 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -887,7 +887,6 @@ import XmMenuRichDetail from "../xmMenu/XmMenuRichDetail"; import TagMng from "@/views/mdp/arc/tag/TagMng"; import XmGantt from "../components/xm-gantt"; -import XmGroupSelect from "../xmGroup/XmGroupSelect.vue"; import XmTaskList from '../xmTask/XmTaskList'; import XmTableConfig from '@/views/xm/core/components/XmTableConfig';//修改界面 @@ -2189,7 +2188,6 @@ export default { xmMenuSelect, XmMenuRichDetail, XmGantt, - XmGroupSelect, XmProductSelect, XmTaskAgileKanban, TagMng,