Browse Source

优化focus

master
陈裕财 4 years ago
parent
commit
989508d826
  1. 6
      src/views/xm/core/crowd/XmTaskCrowdMng.vue
  2. 6
      src/views/xm/core/xmIteration/XmIterationMng.vue
  3. 6
      src/views/xm/core/xmMyFocus/XmMyDoFocus.vue
  4. 4
      src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
  5. 4
      src/views/xm/core/xmMyFocus/XmMyFocusList.vue
  6. 4
      src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
  7. 6
      src/views/xm/core/xmProduct/XmProductMng.vue
  8. 6
      src/views/xm/core/xmProject/XmProjectMng.vue
  9. 6
      src/views/xm/core/xmProject/XmProjectTplMng.vue
  10. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

6
src/views/xm/core/crowd/XmTaskCrowdMng.vue

@ -621,7 +621,7 @@ import { batchAddSkill } from "@/api/xm/core/xmTaskSkill";
import xmTaskTemplateMng from "../xmTaskTemplate/XmTaskTemplateMng"; import xmTaskTemplateMng from "../xmTaskTemplate/XmTaskTemplateMng";
import xmExchangeMng from "../xmExchange/XmExchangeMng"; import xmExchangeMng from "../xmExchange/XmExchangeMng";
import { addXmMyFocus, delXmMyFocus } from "@/api/xm/core/xmMyFocus";
import { addUserFocus, delUserFocus } from "@/api/mdp/sys/userFocus";
import XmMenuRichDetail from "../xmMenu/XmMenuRichDetail"; import XmMenuRichDetail from "../xmMenu/XmMenuRichDetail";
import TagMng from "@/views/mdp/arc/tag/TagMng"; import TagMng from "@/views/mdp/arc/tag/TagMng";
@ -1065,7 +1065,7 @@ export default {
focusOrUnfocus: function (row) { focusOrUnfocus: function (row) {
if (this.selkey == "myFocus") { if (this.selkey == "myFocus") {
delXmMyFocus({
delUserFocus({
projectId: row.projectId, projectId: row.projectId,
focusType: "task", focusType: "task",
taskId: row.id, taskId: row.id,
@ -1084,7 +1084,7 @@ export default {
}); });
}); });
} else { } else {
addXmMyFocus({
addUserFocus({
projectId: row.projectId, projectId: row.projectId,
projectName: row.projectName, projectName: row.projectName,
focusType: "task", focusType: "task",

6
src/views/xm/core/xmIteration/XmIterationMng.vue

@ -121,7 +121,7 @@
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'; import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';
import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus';
export default { export default {
computed: { computed: {
...mapGetters([ ...mapGetters([
@ -456,7 +456,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
}, },
focusOrUnfocus:function(row){ focusOrUnfocus:function(row){
if(this.menukey=="myFocus"){ if(this.menukey=="myFocus"){
delXmMyFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{
delUserFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.getXmIterations(); this.getXmIterations();
@ -464,7 +464,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })
}else{ }else{
addXmMyFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{
addUserFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })

6
src/views/xm/core/xmMyFocus/XmMyDoFocus.vue

@ -13,7 +13,7 @@
<script> <script>
import util from '@/common/js/util';// import util from '@/common/js/util';//
import config from "@/common/config"; //import import config from "@/common/config"; //import
import { initDicts, listXmMyFocus,addXmMyFocus,delXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { initDicts, listXmMyFocus,addUserFocus,delUserFocus } from '@/api/mdp/sys/userFocus';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@ -72,7 +72,7 @@
var row=this.xmMyFocuss[0] var row=this.xmMyFocuss[0]
this.load.del=true; this.load.del=true;
let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId }; let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId };
delXmMyFocus(params).then((res) => {
delUserFocus(params).then((res) => {
this.load.del=false; this.load.del=false;
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
@ -85,7 +85,7 @@
saveSubmit: function () { saveSubmit: function () {
this.load.edit=true this.load.edit=true
let params = {pbizId:this.pbizId,bizId:this.bizId,focusType:this.focusType,bizName:this.bizName} let params = {pbizId:this.pbizId,bizId:this.bizId,focusType:this.focusType,bizName:this.bizName}
var func=addXmMyFocus
var func=addUserFocus
func(params).then((res) => { func(params).then((res) => {
this.load.edit=false this.load.edit=false
var tips=res.data.tips; var tips=res.data.tips;

4
src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue

@ -45,7 +45,7 @@
<script> <script>
import util from '@/common/js/util';// import util from '@/common/js/util';//
import config from "@/common/config"; //import import config from "@/common/config"; //import
import { initDicts, addXmMyFocus,editXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { initDicts, addUserFocus,editXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/mdp/sys/userFocus';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@ -104,7 +104,7 @@
this.$confirm('确认提交吗?', '提示', {}).then(() => { this.$confirm('确认提交吗?', '提示', {}).then(() => {
this.load.edit=true this.load.edit=true
let params = Object.assign({}, this.editForm); let params = Object.assign({}, this.editForm);
var func=addXmMyFocus
var func=addUserFocus
if(this.currOpType=='edit'){ if(this.currOpType=='edit'){
func=editXmMyFocus func=editXmMyFocus
} }

4
src/views/xm/core/xmMyFocus/XmMyFocusList.vue

@ -74,7 +74,7 @@
import util from '@/common/js/util';// import util from '@/common/js/util';//
import config from '@/common/config';// import config from '@/common/config';//
import { initDicts,myFocusForIndex, delXmMyFocus, batchDelXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { initDicts,myFocusForIndex, delUserFocus, batchDelXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/mdp/sys/userFocus';
import XmMyFocusEdit from './XmMyFocusEdit';// import XmMyFocusEdit from './XmMyFocusEdit';//
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -251,7 +251,7 @@ export default {
handleDel: function (row,index) { handleDel: function (row,index) {
this.load.del=true; this.load.del=true;
let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId }; let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId };
delXmMyFocus(params).then((res) => {
delUserFocus(params).then((res) => {
this.load.del=false; this.load.del=false;
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){

4
src/views/xm/core/xmMyFocus/XmMyFocusMng.vue

@ -77,7 +77,7 @@
import util from '@/common/js/util';// import util from '@/common/js/util';//
import config from '@/common/config';// import config from '@/common/config';//
import { initDicts,listXmMyFocus, delXmMyFocus, batchDelXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { initDicts,listXmMyFocus, delUserFocus, batchDelXmMyFocus,editSomeFieldsXmMyFocus } from '@/api/mdp/sys/userFocus';
import XmMyFocusEdit from './XmMyFocusEdit';// import XmMyFocusEdit from './XmMyFocusEdit';//
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -226,7 +226,7 @@ export default {
}).then(() => { }).then(() => {
this.load.del=true; this.load.del=true;
let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId }; let params = { userid:row.userid, bizId:row.bizId, pbizId:row.pbizId };
delXmMyFocus(params).then((res) => {
delUserFocus(params).then((res) => {
this.load.del=false; this.load.del=false;
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){

6
src/views/xm/core/xmProduct/XmProductMng.vue

@ -320,7 +320,7 @@
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'; import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';
import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'; import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue';
import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus';
import Guider from '@/components/Guider/Index.js'; import Guider from '@/components/Guider/Index.js';
@ -717,7 +717,7 @@
focusOrUnfocus:function(row){ focusOrUnfocus:function(row){
if(this.menukey=="myFocus"){ if(this.menukey=="myFocus"){
delXmMyFocus({pbizId:row.id,bizId:row.id}).then(res=>{
delUserFocus({pbizId:row.id,bizId:row.id}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); this.getXmProjects();
@ -725,7 +725,7 @@
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })
}else{ }else{
addXmMyFocus({pbizId:row.id,focusType:'3',bizId:row.id,bizName:row.productName}).then(res=>{
addUserFocus({pbizId:row.id,focusType:'3',bizId:row.id,bizName:row.productName}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })

6
src/views/xm/core/xmProject/XmProjectMng.vue

@ -313,7 +313,7 @@
import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode ,getDefOptions} from '@/api/xm/core/xmProject'; import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode ,getDefOptions} from '@/api/xm/core/xmProject';
import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState'; import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus';
import XmProjectAdd from './XmProjectEdit';// import XmProjectAdd from './XmProjectEdit';//
import XmProjectEdit from './XmProjectEdit';// import XmProjectEdit from './XmProjectEdit';//
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -761,7 +761,7 @@
}, },
focusOrUnfocus:function(row){ focusOrUnfocus:function(row){
if(this.menukey=="myFocus"){ if(this.menukey=="myFocus"){
delXmMyFocus({pbizId:row.id,focusType:'1',bizId:row.id,bizName:row.name}).then(res=>{
delUserFocus({pbizId:row.id,focusType:'1',bizId:row.id,bizName:row.name}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); this.getXmProjects();
@ -769,7 +769,7 @@
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })
}else{ }else{
addXmMyFocus({pbizId:row.id,focusType:'1',bizId:row.id,bizName:row.name}).then(res=>{
addUserFocus({pbizId:row.id,focusType:'1',bizId:row.id,bizName:row.name}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })

6
src/views/xm/core/xmProject/XmProjectTplMng.vue

@ -86,7 +86,7 @@
import config from "@/common/config"; // import config from "@/common/config"; //
//import { initSimpleDicts } from '@/api/mdp/meta/item';// //import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode} from '@/api/xm/core/xmProject'; import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode} from '@/api/xm/core/xmProject';
import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -495,7 +495,7 @@
}, },
focusOrUnfocus:function(row){ focusOrUnfocus:function(row){
if(this.menukey=="myFocus"){ if(this.menukey=="myFocus"){
delXmMyFocus({projectId:row.id,focusType:'project',userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
delUserFocus({projectId:row.id,focusType:'project',userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); this.getXmProjects();
@ -503,7 +503,7 @@
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })
}else{ }else{
addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
addUserFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}) })

6
src/views/xm/core/xmTask/XmTaskMng.vue

@ -876,7 +876,7 @@ import xmTaskTemplateMng from "../xmTaskTemplate/XmTaskTemplateMng";
import xmExchangeMng from "../xmExchange/XmExchangeMng"; import xmExchangeMng from "../xmExchange/XmExchangeMng";
import xmMenuSelect from "../xmMenu/XmMenuSelect"; import xmMenuSelect from "../xmMenu/XmMenuSelect";
import { addXmMyFocus, delXmMyFocus } from "@/api/xm/core/xmMyFocus";
import { addUserFocus, delUserFocus } from "@/api/mdp/sys/userFocus";
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
import XmProductSelect from "@/views/xm/core/components/XmProductSelect"; import XmProductSelect from "@/views/xm/core/components/XmProductSelect";
@ -1788,7 +1788,7 @@ export default {
focusOrUnfocus: function (row) { focusOrUnfocus: function (row) {
if (this.selkey == "myFocus") { if (this.selkey == "myFocus") {
delXmMyFocus({
delUserFocus({
projectId: row.projectId, projectId: row.projectId,
focusType: "task", focusType: "task",
taskId: row.id, taskId: row.id,
@ -1807,7 +1807,7 @@ export default {
}); });
}); });
} else { } else {
addXmMyFocus({
addUserFocus({
projectId: row.projectId, projectId: row.projectId,
projectName: row.projectName, projectName: row.projectName,
focusType: "task", focusType: "task",

Loading…
Cancel
Save