Browse Source

字典缓存

master
陈裕财 4 years ago
parent
commit
41471b4e3e
  1. 4
      src/views/xm/XmOverview.vue
  2. 2
      src/views/xm/core/skill/skillMng.vue
  3. 4
      src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
  4. 4
      src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
  5. 4
      src/views/xm/core/xmAttachment/XmAttachmentMng.vue
  6. 4
      src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
  7. 4
      src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
  8. 8
      src/views/xm/core/xmBranchState/XmBranchStateMng.vue
  9. 4
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
  10. 4
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
  11. 8
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
  12. 4
      src/views/xm/core/xmEnvList/XmEnvListAdd.vue
  13. 4
      src/views/xm/core/xmEnvList/XmEnvListEdit.vue
  14. 4
      src/views/xm/core/xmEnvList/XmEnvListMng.vue
  15. 4
      src/views/xm/core/xmExchange/XmExchangeAdd.vue
  16. 4
      src/views/xm/core/xmExchange/XmExchangeEdit.vue
  17. 8
      src/views/xm/core/xmExchange/XmExchangeMng.vue
  18. 4
      src/views/xm/core/xmFile/XmFileAdd.vue
  19. 4
      src/views/xm/core/xmFile/XmFileEdit.vue
  20. 4
      src/views/xm/core/xmFile/XmFileMng.vue
  21. 4
      src/views/xm/core/xmGroup/XmGroupSelect.vue
  22. 8
      src/views/xm/core/xmGroupState/XmGroupStateMng.vue
  23. 2
      src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
  24. 4
      src/views/xm/core/xmIteration/XmIterationAdd.vue
  25. 4
      src/views/xm/core/xmIteration/XmIterationEdit.vue
  26. 2
      src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
  27. 8
      src/views/xm/core/xmIteration/XmIterationInfo.vue
  28. 8
      src/views/xm/core/xmIteration/XmIterationMng.vue
  29. 4
      src/views/xm/core/xmIteration/XmIterationSelect.vue
  30. 4
      src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue
  31. 4
      src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue
  32. 8
      src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
  33. 8
      src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
  34. 4
      src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
  35. 4
      src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
  36. 8
      src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
  37. 4
      src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
  38. 4
      src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
  39. 8
      src/views/xm/core/xmIterationState/XmIterationStateMng.vue
  40. 8
      src/views/xm/core/xmIterationState/XmIterationStateShow.vue
  41. 16
      src/views/xm/core/xmMenu/XmMenuAdd.vue
  42. 16
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  43. 2
      src/views/xm/core/xmMenu/XmMenuMng.vue
  44. 10
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue
  45. 2
      src/views/xm/core/xmMenu/XmMenuOverview.vue
  46. 4
      src/views/xm/core/xmMenu/XmMenuRichDetail.vue
  47. 4
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  48. 16
      src/views/xm/core/xmMenu/XmMenuWithPlan.vue
  49. 8
      src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
  50. 2
      src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue
  51. 4
      src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
  52. 4
      src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
  53. 16
      src/views/xm/core/xmMenuState/XmMenuStateMng.vue
  54. 4
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
  55. 4
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
  56. 4
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
  57. 4
      src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
  58. 4
      src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
  59. 4
      src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
  60. 14
      src/views/xm/core/xmPhase/XmPhaseAdd.vue
  61. 25
      src/views/xm/core/xmPhase/XmPhaseBatch.vue
  62. 14
      src/views/xm/core/xmPhase/XmPhaseEdit.vue
  63. 16
      src/views/xm/core/xmPhase/XmPhaseForProduct.vue
  64. 16
      src/views/xm/core/xmPhase/XmPhaseMng.vue
  65. 2
      src/views/xm/core/xmPhase/XmPhaseOverview.vue
  66. 18
      src/views/xm/core/xmPhase/XmPhaseSelect.vue
  67. 17
      src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
  68. 15
      src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
  69. 4
      src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
  70. 4
      src/views/xm/core/xmProduct/XmProductAdd.vue
  71. 20
      src/views/xm/core/xmProduct/XmProductEdit.vue
  72. 2
      src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
  73. 8
      src/views/xm/core/xmProduct/XmProductInfo.vue
  74. 12
      src/views/xm/core/xmProduct/XmProductMng.vue
  75. 16
      src/views/xm/core/xmProduct/XmProductOverview.vue
  76. 2
      src/views/xm/core/xmProduct/XmProductProjectForLink.vue
  77. 4
      src/views/xm/core/xmProduct/XmProductRecycle.vue
  78. 4
      src/views/xm/core/xmProduct/XmProductSelect.vue
  79. 4
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  80. 4
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue
  81. 4
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue
  82. 8
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
  83. 4
      src/views/xm/core/xmProductState/XmProductStateAdd.vue
  84. 4
      src/views/xm/core/xmProductState/XmProductStateEdit.vue
  85. 8
      src/views/xm/core/xmProductState/XmProductStateMng.vue
  86. 4
      src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
  87. 4
      src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
  88. 4
      src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
  89. 29
      src/views/xm/core/xmProject/XmProjectAdd.vue
  90. 2
      src/views/xm/core/xmProject/XmProjectAssess.vue
  91. 2
      src/views/xm/core/xmProject/XmProjectBudgetCost.vue
  92. 2
      src/views/xm/core/xmProject/XmProjectComplex.vue
  93. 2
      src/views/xm/core/xmProject/XmProjectCost.vue
  94. 2
      src/views/xm/core/xmProject/XmProjectDetail.vue
  95. 37
      src/views/xm/core/xmProject/XmProjectEdit.vue
  96. 4
      src/views/xm/core/xmProject/XmProjectForLink.vue
  97. 8
      src/views/xm/core/xmProject/XmProjectInfo.vue
  98. 4
      src/views/xm/core/xmProject/XmProjectList.vue
  99. 26
      src/views/xm/core/xmProject/XmProjectMng.vue
  100. 26
      src/views/xm/core/xmProject/XmProjectOverview.vue

4
src/views/xm/XmOverview.vue

@ -335,7 +335,7 @@
<script>
import util from "@/common/js/util"; //
import { mapGetters } from "vuex";
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmBranchState,loadProjectStateToXmBranchState } from '@/api/xm/core/xmBranchState';
import Guider from '@/components/Guider/Index.js';
@ -411,7 +411,7 @@ export default {
isActive: true,
xmBranchState:{},
maxTableHeight:300,
// options: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
// dicts: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
};
},

2
src/views/xm/core/skill/skillMng.vue

@ -104,7 +104,7 @@
<script>
import util from "@/common/js/util"; //
//import Sticky from "@/components/Sticky"; // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import {
getAllHrSkill,
delHrSkillCategory,

4
src/views/xm/core/xmAttachment/XmAttachmentAdd.vue

@ -37,7 +37,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmAttachment } from '@/api/xm/core/xmAttachment';
import { mapGetters } from 'vuex'
@ -60,7 +60,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmAttachment/XmAttachmentEdit.vue

@ -37,7 +37,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmAttachment } from '@/api/xm/core/xmAttachment';
import { mapGetters } from 'vuex'
@ -60,7 +60,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

4
src/views/xm/core/xmAttachment/XmAttachmentMng.vue

@ -43,7 +43,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmAttachment, delXmAttachment, batchDelXmAttachment } from '@/api/xm/core/xmAttachment';
import XmAttachmentAdd from './XmAttachmentAdd';//
import XmAttachmentEdit from './XmAttachmentEdit';//
@ -71,7 +71,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmAttachment
//xmAttachment

4
src/views/xm/core/xmBranchState/XmBranchStateAdd.vue

@ -172,7 +172,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmBranchState } from '@/api/xm/core/xmBranchState';
import { mapGetters } from 'vuex'
@ -195,7 +195,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmBranchState/XmBranchStateEdit.vue

@ -172,7 +172,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmBranchState } from '@/api/xm/core/xmBranchState';
import { mapGetters } from 'vuex'
@ -195,7 +195,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmBranchState/XmBranchStateMng.vue

@ -90,7 +90,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmBranchState, delXmBranchState, batchDelXmBranchState,loadProjectStateToXmBranchState } from '@/api/xm/core/xmBranchState';
import XmBranchStateAdd from './XmBranchStateAdd';//
import XmBranchStateEdit from './XmBranchStateEdit';//
@ -118,7 +118,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -295,9 +295,9 @@
this.getXmBranchStates();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue

@ -76,7 +76,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
import { mapGetters } from 'vuex'
@ -99,7 +99,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue

@ -76,7 +76,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
import { mapGetters } from 'vuex'
@ -99,7 +99,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue

@ -56,7 +56,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmBranchTaskTypeState, delXmBranchTaskTypeState, batchDelXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
import XmBranchTaskTypeStateAdd from './XmBranchTaskTypeStateAdd';//
import XmBranchTaskTypeStateEdit from './XmBranchTaskTypeStateEdit';//
@ -84,7 +84,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -242,9 +242,9 @@
this.getXmBranchTaskTypeStates();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmEnvList/XmEnvListAdd.vue

@ -72,7 +72,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmEnvList } from '@/api/xm/core/xmEnvList';
import { mapGetters } from 'vuex'
@ -119,7 +119,7 @@
};
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
startTime: [

4
src/views/xm/core/xmEnvList/XmEnvListEdit.vue

@ -72,7 +72,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmEnvList } from '@/api/xm/core/xmEnvList';
import { mapGetters } from 'vuex'
@ -98,7 +98,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

4
src/views/xm/core/xmEnvList/XmEnvListMng.vue

@ -57,7 +57,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmEnvList, delXmEnvList, batchDelXmEnvList } from '@/api/xm/core/xmEnvList';
import XmEnvListAdd from './XmEnvListAdd';//
import XmEnvListEdit from './XmEnvListEdit';//
@ -85,7 +85,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmEnvList
//xmEnvList

4
src/views/xm/core/xmExchange/XmExchangeAdd.vue

@ -85,7 +85,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmExchange } from '@/api/xm/core/xmExchange';
import { mapGetters } from 'vuex'
@ -108,7 +108,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmExchange/XmExchangeEdit.vue

@ -85,7 +85,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmExchange } from '@/api/xm/core/xmExchange';
import { mapGetters } from 'vuex'
@ -108,7 +108,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmExchange/XmExchangeMng.vue

@ -43,7 +43,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmExchange, delXmExchange, batchDelXmExchange,addXmExchange } from '@/api/xm/core/xmExchange';
import TaskUserEditor from './TaskUserEditor'
import { mapGetters } from 'vuex'
@ -77,7 +77,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -262,9 +262,9 @@
this.getXmExchanges();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmFile/XmFileAdd.vue

@ -32,7 +32,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmFile } from '@/api/xm/core/xmFile';
import { mapGetters } from 'vuex';
import VueEditor from '@/components/Tinymce/index';
@ -59,7 +59,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmFile/XmFileEdit.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmFile } from '@/api/xm/core/xmFile';
import { mapGetters } from 'vuex'
import VueEditor from '@/components/Tinymce/index';
@ -59,7 +59,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

4
src/views/xm/core/xmFile/XmFileMng.vue

@ -76,7 +76,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmFile, delXmFile, batchDelXmFile } from '@/api/xm/core/xmFile';
import XmFileAdd from './XmFileAdd';//
import XmFileEdit from './XmFileEdit';//
@ -108,7 +108,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmFile
//xmFile

4
src/views/xm/core/xmGroup/XmGroupSelect.vue

@ -41,7 +41,7 @@
<script>
import util from '@/common/js/util'; //
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { getGroups } from '@/api/xm/core/xmGroup';
import XmProjectList from '../xmProject/XmProjectList';
@ -94,7 +94,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
selGroups:[],
load: {list: false,edit: false,del: false,add: false}, //...
sels: [], //
options: {
dicts: {
projectGroupType:[]
}, // params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}

8
src/views/xm/core/xmGroupState/XmGroupStateMng.vue

@ -53,7 +53,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmGroupState, delXmGroupState, batchDelXmGroupState,loadTasksToXmGroupState } from '@/api/xm/core/xmGroupState';
import { mapGetters } from 'vuex'
import XmGroupStateOverview from './XmGroupStateOverview.vue';
@ -88,7 +88,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -274,9 +274,9 @@ XmGroupStateOverview
this.getXmGroupStates();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

2
src/views/xm/core/xmGroupState/XmGroupStateOverview.vue

@ -207,7 +207,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex'

4
src/views/xm/core/xmIteration/XmIterationAdd.vue

@ -39,7 +39,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmIteration } from '@/api/xm/core/xmIteration';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -67,7 +67,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
iterationName: [

4
src/views/xm/core/xmIteration/XmIterationEdit.vue

@ -41,7 +41,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmIteration } from '@/api/xm/core/xmIteration';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -65,7 +65,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
iterationName: [

2
src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue

@ -60,7 +60,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { delXmIterationLink } from '@/api/xm/core/xmIterationLink';
import XmIterationSelect from './XmIterationSelect.vue'

8
src/views/xm/core/xmIteration/XmIterationInfo.vue

@ -50,7 +50,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
import XmProjectAdd from '../xmProject/XmProjectAdd';//
import XmProjectEdit from '../xmProject/XmProjectEdit';//
@ -251,13 +251,13 @@
} else {
return v[j];
}
const options = this.$refs.xmMenuWithPlan.options;
const options = this.$refs.xmMenuWithPlan.dicts;
if(options[key]==undefined || options[key]==null || options[key].length==0 ){
return v[j];
}
var rowData=options[key].filter(i=>i.optionValue==v[j])
var rowData=options[key].filter(i=>i.id==v[j])
if(rowData.length>0){
return rowData[0].optionName
return rowData[0].name
}else{
return v[j];
}

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

@ -129,7 +129,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration,loadTasksToXmIterationState } from '@/api/xm/core/xmIteration';
import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
@ -191,7 +191,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -530,9 +530,9 @@ import XmIterationSelect from './XmIterationSelect.vue';
});
// console.log(this.dateRanger,this.dateRangerOnline);
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmIteration/XmIterationSelect.vue

@ -72,7 +72,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration,loadTasksToXmIterationState } from '@/api/xm/core/xmIteration';
@ -125,7 +125,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}

4
src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
iterationId: [

4
src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
iterationId: [

8
src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue

@ -42,7 +42,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIterationLinkWithProductInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { mapGetters } from 'vuex'
@ -82,7 +82,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -287,9 +287,9 @@
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmIterationLink.$el)
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

8
src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue

@ -42,7 +42,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIterationLinkWithProjectInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { mapGetters } from 'vuex'
@ -82,7 +82,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -287,9 +287,9 @@
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmIterationLink.$el)
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmIterationMenu } from '@/api/xm/core/xmIterationMenu';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmIterationMenu } from '@/api/xm/core/xmIterationMenu';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue

@ -46,7 +46,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIterationMenu, delXmIterationMenu, batchDelXmIterationMenu,batchAddXmIterationMenu } from '@/api/xm/core/xmIterationMenu';
import XmIterationMng from '../xmIteration/XmIterationSelect';//
import { mapGetters } from 'vuex'
@ -86,7 +86,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -336,9 +336,9 @@
this.getXmIterationMenus();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmIterationState/XmIterationStateAdd.vue

@ -79,7 +79,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmIterationState } from '@/api/xm/core/xmIterationState';
import { mapGetters } from 'vuex'
@ -102,7 +102,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmIterationState/XmIterationStateEdit.vue

@ -79,7 +79,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmIterationState } from '@/api/xm/core/xmIterationState';
import { mapGetters } from 'vuex'
@ -102,7 +102,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmIterationState/XmIterationStateMng.vue

@ -50,7 +50,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIterationState, delXmIterationState, batchDelXmIterationState } from '@/api/xm/core/xmIterationState';
import XmIterationStateAdd from './XmIterationStateAdd';//
import XmIterationStateEdit from './XmIterationStateEdit';//
@ -84,7 +84,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -247,9 +247,9 @@
this.getXmIterationStates();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

8
src/views/xm/core/xmIterationState/XmIterationStateShow.vue

@ -50,7 +50,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmIterationState, delXmIterationState, batchDelXmIterationState } from '@/api/xm/core/xmIterationState';
import XmIterationStateAdd from './XmIterationStateAdd';//
import XmIterationStateEdit from './XmIterationStateEdit';//
@ -84,7 +84,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -246,9 +246,9 @@
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

16
src/views/xm/core/xmMenu/XmMenuAdd.vue

@ -45,28 +45,28 @@
<el-col :span="12">
<el-form-item label="需求类型" prop="dtype" >
<el-select v-model="addForm.dtype">
<el-option v-for="i in this.options.demandType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="需求来源" prop="source">
<el-select v-model="addForm.source">
<el-option v-for="i in this.options.demandSource" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="需求层次" prop="dlvl" >
<el-select v-model="addForm.dlvl">
<el-option v-for="i in this.options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优先级" prop="priority" >
<el-select v-model="addForm.priority">
<el-option v-for="i in options.priority" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -137,7 +137,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmMenu } from '@/api/xm/core/xmMenu';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -176,7 +176,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
menuId: [
@ -295,8 +295,8 @@
},
mounted() {
listOption([{categoryId:'all',itemCode:'demandSource'},{categoryId:'all',itemCode:'demandLvl'},{categoryId:'all',itemCode:'demandType'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{
this.dicts=res.data.data;
})
this.addForm=Object.assign(this.addForm, this.xmMenu);
this.addForm.mmUserid=this.userInfo.userid

16
src/views/xm/core/xmMenu/XmMenuEdit.vue

@ -51,28 +51,28 @@
<el-col :span="12">
<el-form-item label="需求类型" prop="dtype" >
<el-select v-model="editForm.dtype">
<el-option v-for="i in this.options.demandType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="需求来源" prop="source">
<el-select v-model="editForm.source">
<el-option v-for="i in this.options.demandSource" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="需求层次" prop="dlvl" >
<el-select v-model="editForm.dlvl">
<el-option v-for="i in this.options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优先级" prop="priority" >
<el-select v-model="editForm.priority">
<el-option v-for="i in options.priority" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -155,7 +155,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmMenu } from '@/api/xm/core/xmMenu';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -183,7 +183,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
menuId: [
@ -318,8 +318,8 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
mounted() {
listOption([{categoryId:'all',itemCode:'demandSource'},{categoryId:'all',itemCode:'demandLvl'},{categoryId:'all',itemCode:'demandType'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{
this.dicts=res.data.data;
})
this.editForm=Object.assign(this.editForm, this.xmMenu);
/**在下面写其它函数***/

2
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -357,7 +357,7 @@
parentMenuList:[],
status:'',
},
options:{
dicts:{
menuStatus:[
{id:"0", name:"初始"},

10
src/views/xm/core/xmMenu/XmMenuMngBatch.vue

@ -33,16 +33,16 @@
<el-table-column label="需求属性" width="500" >
<template slot-scope="scope">
<el-select v-model="scope.row.dtype" clearable placeholder="需求类型">
<el-option v-for="i in options.demandType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<el-select v-model="scope.row.source" placeholder="需求来源" clearable>
<el-option v-for="i in options.demandSource" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<el-select v-model="scope.row.dlvl" placeholder="需求层次" clearable class="hidden-md-and-down">
<el-option v-for="i in options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<el-select v-model="scope.row.priority" placeholder="优先级" clearable>
<el-option v-for="i in options.priority" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</template>
</el-table-column>
@ -73,7 +73,7 @@
<script>
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { batchEditXmMenu,listXmMenuWithState } from '@/api/xm/core/xmMenu';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";

2
src/views/xm/core/xmMenu/XmMenuOverview.vue

@ -237,7 +237,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex'

4
src/views/xm/core/xmMenu/XmMenuRichDetail.vue

@ -39,7 +39,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmMenu,listXmMenu } from '@/api/xm/core/xmMenu';
import { mapGetters } from 'vuex'
import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng';//
@ -71,7 +71,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
menuId: [

4
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -116,7 +116,7 @@
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMenu } from '@/api/xm/core/xmMenu';
import XmProductSelect from '../xmProduct/XmProductSelect';//
import XmMenuRichDetail from './XmMenuRichDetail';
@ -179,7 +179,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmMenu
//xmMenu

16
src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@ -127,7 +127,7 @@
<el-table-column prop="planStatus" label="计划状态" min-width="80" >
<template slot-scope="scope">
<el-select v-model="scope.row.planStatus" @change="fieldChange(scope.row,'planStatus')" :disabled="!scope.row.projectId">
<el-option v-for="i in options.xmMenuPlanStatus" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.xmMenuPlanStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</template>
</el-table-column>
@ -164,7 +164,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMenuWithPlan } from '@/api/xm/core/xmMenu';
import { delXmMenuPlan, batchDelXmMenuPlan,batchAddPlanFromTasks, loadTasksToXmMenuPlan,batchEditXmMenuPlan} from '@/api/xm/core/xmMenuPlan';
@ -207,7 +207,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmMenuPlanStatus:[]
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -484,12 +484,12 @@
}else{
return cellValue
}
if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0 ){
if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0 ){
return cellValue;
}
var list=this.options[key].filter(i=>i.optionValue==cellValue)
var list=this.dicts[key].filter(i=>i.id==cellValue)
if(list.length>0){
return list[0].optionName
return list[0].name
}else{
return cellValue;
}
@ -578,8 +578,8 @@
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenus();
});
listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['xmMenuPlanStatus'] ).then(res=>{
this.dicts=res.data.data;
})
}
}

8
src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue

@ -43,7 +43,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMenuExchange, delXmMenuExchange, batchDelXmMenuExchange,addXmMenuExchange } from '@/api/xm/core/xmMenuExchange';
import MenuUserEditor from './MenuUserEditor'
import { mapGetters } from 'vuex'
@ -82,7 +82,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -323,9 +323,9 @@
this.getXmMenuExchanges();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

2
src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue

@ -7,7 +7,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex'
import {sn} from '@/common/js/sequence';

4
src/views/xm/core/xmMenuState/XmMenuStateAdd.vue

@ -154,7 +154,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmMenuState } from '@/api/xm/core/xmMenuState';
import { mapGetters } from 'vuex'
@ -177,7 +177,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmMenuState/XmMenuStateEdit.vue

@ -154,7 +154,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmMenuState } from '@/api/xm/core/xmMenuState';
import { mapGetters } from 'vuex'
@ -177,7 +177,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

16
src/views/xm/core/xmMenuState/XmMenuStateMng.vue

@ -121,7 +121,7 @@
<el-table-column prop="planStatus" label="计划状态" min-width="80" >
<template slot-scope="scope">
<el-select v-model="scope.row.planStatus" @change="fieldChange(scope.row,'planStatus')" :disabled="!scope.row.projectId">
<el-option v-for="i in options.xmMenuStateStatus" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.xmMenuStateStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</template>
</el-table-column>
@ -152,7 +152,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMenuWithState} from '@/api/xm/core/xmMenu';
import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState';
@ -195,7 +195,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmMenuStateStatus:[]
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -394,12 +394,12 @@
}else{
return cellValue
}
if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0 ){
if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0 ){
return cellValue;
}
var list=this.options[key].filter(i=>i.optionValue==cellValue)
var list=this.dicts[key].filter(i=>i.id==cellValue)
if(list.length>0){
return list[0].optionName
return list[0].name
}else{
return cellValue;
}
@ -484,8 +484,8 @@
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenus();
});
listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['xmMenuStateStatus'] ).then(res=>{
this.dicts=res.data.data;
})
}
}

4
src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue

@ -25,7 +25,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmMenuTemplate } from '@/api/xm/core/xmMenuTemplate';
import { mapGetters } from 'vuex'
@ -48,7 +48,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
menuId: [

4
src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue

@ -25,7 +25,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmMenuTemplate } from '@/api/xm/core/xmMenuTemplate';
import { mapGetters } from 'vuex'
@ -48,7 +48,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
menuId: [

4
src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@ -47,7 +47,7 @@
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu';
import XmProductTplMng from '../xmProduct/XmProductTplMng';//
@ -86,7 +86,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmMenuTemplate
//xmMenuTemplate

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

@ -40,7 +40,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { mapGetters } from 'vuex'
@ -63,7 +63,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

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

@ -40,7 +40,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmMyFocus } from '@/api/xm/core/xmMyFocus';
import { mapGetters } from 'vuex'
@ -63,7 +63,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

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

@ -44,7 +44,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmMyFocus, delXmMyFocus, batchDelXmMyFocus } from '@/api/xm/core/xmMyFocus';
import XmMyFocusAdd from './XmMyFocusAdd';//
import XmMyFocusEdit from './XmMyFocusEdit';//
@ -72,7 +72,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmMyFocus
//xmMyFocus

14
src/views/xm/core/xmPhase/XmPhaseAdd.vue

@ -13,12 +13,12 @@
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select v-model="addForm.planType">
<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<el-select v-model="addForm.taskType">
<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -102,7 +102,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmPhase } from '@/api/xm/core/xmPhase';
import { mapGetters } from 'vuex'
@ -194,7 +194,7 @@
const endDate = new Date();
endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [
@ -378,9 +378,9 @@
this.addForm.seqNo=this.parentProjectPhase.seqNo+"."+1
}
}
listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
this.options=res.data.data;
}
initSimpleDicts('all',['planType','taskType']).then(res=>{
this.dicts=res.data.data;
})
}//end mounted
}

25
src/views/xm/core/xmPhase/XmPhaseBatch.vue

@ -276,7 +276,7 @@
import util from "@/common/js/util"; //
import treeTool from "@/common/js/treeTool"; //
//import Sticky from '@/components/Sticky' // header
import { listOption } from "@/api/mdp/meta/itemOption"; //
import { initSimpleDicts } from '@/api/mdp/meta/item'; //
import {
listXmPhase,
delXmPhase,
@ -420,7 +420,7 @@ export default {
},
load: { list: false, edit: false, del: false, add: false }, //...
sels: [], //
options: {
dicts: {
xmPhaseStatus: [],
}, // params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -1587,12 +1587,12 @@ export default {
},
/**end 自定义函数请在上面加**/
formateOption: function (itemCode, value) {
if (this.options[itemCode]) {
var options = this.options[itemCode].filter(
(i) => i.optionValue == value
if (this.dicts[itemCode]) {
var options = this.dicts[itemCode].filter(
(i) => i.id == value
);
if (options && options.length > 0) {
return options[0].optionName;
if (options && dicts.length > 0) {
return options[0].name;
} else {
return value;
}
@ -1739,13 +1739,10 @@ export default {
this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
if (this.selProject) {
this.getXmPhases();
}
listOption([{ categoryId: "all", itemCode: "xmPhaseStatus" }]).then(
(res) => {
this.options = res.data.data;
}
);
}
initSimpleDicts('all',['xmPhaseStatus']).then(res=>{
this.dicts=res.data.data;
})
});
//
document.body.ondrop = function (event) {

14
src/views/xm/core/xmPhase/XmPhaseEdit.vue

@ -22,12 +22,12 @@
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<el-select v-model="editForm.taskType">
<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select v-model="editForm.planType">
<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -116,7 +116,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmPhase } from '@/api/xm/core/xmPhase';
import { mapGetters } from 'vuex'
import XmPhaseOverview from './XmPhaseOverview';//
@ -202,7 +202,7 @@
const endDate = new Date();
endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
id: [
@ -385,9 +385,9 @@
mounted() {
this.editForm=Object.assign(this.editForm, this.xmPhase);
/**在下面写其它函数***/
this.dateRanger=[this.editForm.beginDate,this.editForm.endDate]
listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
this.options=res.data.data;
this.dateRanger=[this.editForm.beginDate,this.editForm.endDate]
initSimpleDicts('all',['planType','taskType']).then(res=>{
this.dicts=res.data.data;
})
}//end mounted
}

16
src/views/xm/core/xmPhase/XmPhaseForProduct.vue

@ -6,7 +6,7 @@
<el-checkbox v-model="filters.milestone" true-label="1" false-label="" >里程碑</el-checkbox>
<el-checkbox v-model="filters.isKeyPath" true-label="1" false-label="" >关键路径</el-checkbox>
<el-select v-model="filters.phaseStatus" placeholder="计划状态" clearable style="width:100px;">
<el-option :label="item.name" :value="item.id" v-for="(item,index) in options.xmPhaseStatus" :key="index"></el-option>
<el-option :label="item.name" :value="item.id" v-for="(item,index) in dicts.xmPhaseStatus" :key="index"></el-option>
</el-select>
<el-input v-model="filters.key" style="width:200px;" placeholder="模糊查询">
</el-input>
@ -108,7 +108,7 @@
</el-table-column>
<el-table-column prop="phaseStatus" label="计划状态" width="100" >
<template slot-scope="scope">
<font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
<font v-if="dicts.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{dicts.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
</template>
</el-table-column>
<el-table-column label="操作" width="200" >
@ -186,7 +186,7 @@
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { batchAddXmPhaseMenu,batchDelXmPhaseMenu } from '@/api/xm/core/xmPhaseMenu';
import { listXmPhase,calcKeyPaths, delXmPhase, batchDelXmPhase,batchImportFromTemplate,batchSaveBudget,loadMenusToXmPhase,setPhaseMngUser,selectTotalProductAndPhaseBudgetCost } from '@/api/xm/core/xmPhase';
@ -268,7 +268,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmPhaseStatus:[
{id:'0',name:'初始'},
{id:'1',name:'执行中'},
@ -1105,10 +1105,10 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
},
/**end 自定义函数请在上面加**/
formateOption:function(itemCode,value){
if(this.options[itemCode]){
var options=this.options[itemCode].filter(i=>i.optionValue==value);
if(options && options.length > 0){
return options[0].optionName
if(this.dicts[itemCode]){
var options=this.dicts[itemCode].filter(i=>i.id==value);
if(options && dicts.length > 0){
return options[0].name
}else{
return value;
}

16
src/views/xm/core/xmPhase/XmPhaseMng.vue

@ -6,7 +6,7 @@
<el-checkbox v-model="filters.milestone" true-label="1" false-label="" >里程碑</el-checkbox>
<el-checkbox v-model="filters.isKeyPath" true-label="1" false-label="" >关键路径</el-checkbox>
<el-select v-model="filters.phaseStatus" placeholder="计划状态" clearable style="width:100px;">
<el-option :label="item.name" :value="item.id" v-for="(item,index) in options.xmPhaseStatus" :key="index"></el-option>
<el-option :label="item.name" :value="item.id" v-for="(item,index) in dicts.xmPhaseStatus" :key="index"></el-option>
</el-select>
<el-input v-model="filters.key" style="width:200px;" placeholder="模糊查询">
</el-input>
@ -121,7 +121,7 @@
</el-table-column>
<el-table-column prop="phaseStatus" label="计划状态" width="100" >
<template slot-scope="scope">
<font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
<font v-if="dicts.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{dicts.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
</template>
</el-table-column>
<el-table-column label="操作" width="200" >
@ -207,7 +207,7 @@
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { batchRelTasksWithPhase } from '@/api/xm/core/xmTask';
import { listXmPhase,calcKeyPaths, delXmPhase, batchDelXmPhase,batchImportFromTemplate,batchSaveBudget,loadTasksToXmPhase,setPhaseMngUser,selectTotalProjectAndPhaseBudgetCost } from '@/api/xm/core/xmPhase';
@ -300,7 +300,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmPhaseStatus:[
{id:'0',name:'初始'},
{id:'1',name:'执行中'},
@ -1140,10 +1140,10 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
},
/**end 自定义函数请在上面加**/
formateOption:function(itemCode,value){
if(this.options[itemCode]){
var options=this.options[itemCode].filter(i=>i.optionValue==value);
if(options && options.length > 0){
return options[0].optionName
if(this.dicts[itemCode]){
var options=this.dicts[itemCode].filter(i=>i.id==value);
if(options && dicts.length > 0){
return options[0].name
}else{
return value;
}

2
src/views/xm/core/xmPhase/XmPhaseOverview.vue

@ -224,7 +224,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex'

18
src/views/xm/core/xmPhase/XmPhaseSelect.vue

@ -21,7 +21,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmPhase } from '@/api/xm/core/xmPhase';
import {sn} from '@/common/js/sequence'
@ -75,7 +75,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmPhaseStatus:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -440,10 +440,10 @@
},
/**end 自定义函数请在上面加**/
formateOption:function(itemCode,value){
if(this.options[itemCode]){
var options=this.options[itemCode].filter(i=>i.optionValue==value);
if(options && options.length > 0){
return options[0].optionName
if(this.dicts[itemCode]){
var options=this.dicts[itemCode].filter(i=>i.id==value);
if(options && dicts.length > 0){
return options[0].name
}else{
return value;
}
@ -467,10 +467,8 @@
this.getXmPhases();
}
listOption([
{categoryId:'all',itemCode:'xmPhaseStatus'}
]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['xmPhaseStatus']).then(res=>{
this.dicts=res.data.data;
})
});
}

17
src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue

@ -11,12 +11,12 @@
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select v-model="addForm.planType">
<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<el-select v-model="addForm.taskType">
<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -53,7 +53,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
import { mapGetters } from 'vuex'
@ -105,7 +105,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [
@ -208,12 +208,11 @@
if(this.selProjectTemplate){
this.addForm.projectId=this.selProjectTemplate.id
this.addForm.projectName=this.selProjectTemplate.projectName
}
/**在下面写其它函数***/
listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
this.options=res.data.data;
}
initSimpleDicts('all',['planType','taskType']).then(res=>{
this.dicts=res.data.data;
})
}//end mounted
}

15
src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue

@ -11,12 +11,12 @@
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select v-model="editForm.planType">
<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<el-select v-model="editForm.taskType">
<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -53,7 +53,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
import { mapGetters } from 'vuex'
@ -101,7 +101,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
id: [
@ -196,9 +196,10 @@
},
mounted() {
this.editForm=Object.assign(this.editForm, this.xmPhaseTemplate);
/**在下面写其它函数***/
listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
this.options=res.data.data;
initSimpleDicts('all',['planType','taskType']).then(res=>{
this.dicts=res.data.data;
})

4
src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue

@ -83,7 +83,7 @@
import util from '@/common/js/util';//
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmPhase } from '@/api/xm/core/xmPhase';
import XmProjectTemplateList from '../xmProjectTemplate/XmProjectTemplateList';//
import { mapGetters } from 'vuex'
@ -129,7 +129,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{projectType:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{projectType:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmPhaseTemplate
//xmPhaseTemplate

4
src/views/xm/core/xmProduct/XmProductAdd.vue

@ -54,7 +54,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmProduct,createProductCode } from '@/api/xm/core/xmProduct';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -82,7 +82,7 @@
},
data() {
return {
options:{xmProductPstatus:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{xmProductPstatus:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
productName: [

20
src/views/xm/core/xmProduct/XmProductEdit.vue

@ -3,9 +3,9 @@
<el-row class="padding-header">
<el-steps :active="calcXmProductPstatusStep" simple finish-status="success">
<el-step v-for="(i,index) in options['xmProductPstatus']" :title="i.optionName" :key="index" @click.native.stop="editForm.pstatus=i.optionValue">
<el-step v-for="(i,index) in dicts['xmProductPstatus']" :title="i.name" :key="index" @click.native.stop="editForm.pstatus=i.id">
<el-link slot="title" >
{{i.optionName}}
{{i.name}}
</el-link>
</el-step>
</el-steps>
@ -22,7 +22,7 @@
<el-form-item label="状态" prop="pstatus">
<el-select v-model="editForm.pstatus" placeholder="状态" >
<el-option v-for="(item,index) in options['xmProductPstatus']" :label="item.optionName" :value="item.optionValue" :key="index"></el-option>
<el-option v-for="(item,index) in dicts['xmProductPstatus']" :label="item.name" :value="item.id" :key="index"></el-option>
</el-select>
</el-form-item>
<el-row>
@ -64,7 +64,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmProduct } from '@/api/xm/core/xmProduct';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -76,9 +76,9 @@
'userInfo','roles'
]),
calcXmProductPstatusStep(){
if(this.options['xmProductPstatus']){
var index=this.options['xmProductPstatus'].findIndex(i=>{
if(i.optionValue==this.editForm.pstatus){
if(this.dicts['xmProductPstatus']){
var index=this.dicts['xmProductPstatus'].findIndex(i=>{
if(i.id==this.editForm.pstatus){
return true;
}else{
return false;
@ -103,7 +103,7 @@
},
data() {
return {
options:{xmProductPstatus:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{xmProductPstatus:[]},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
id: [
@ -199,9 +199,9 @@
mounted() {
listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
if(res.data.tips.isOk){
this.options['xmProductPstatus']=res.data.data.xmProductPstatus
this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus
}
});
this.editForm= this.xmProduct;

2
src/views/xm/core/xmProduct/XmProductForProjectComplex.vue

@ -59,7 +59,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import XmIterationMng from '../xmIteration/XmIterationMng.vue'
import XmMenuMng from '../xmMenu/XmMenuMng.vue'
import XmIterationStateShow from '../xmIterationState/XmIterationStateShow.vue'

8
src/views/xm/core/xmProduct/XmProductInfo.vue

@ -162,7 +162,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
import XmProjectAdd from '../xmProject/XmProjectAdd';//
import XmProjectEdit from '../xmProject/XmProjectEdit';//
@ -365,13 +365,13 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
} else {
return v[j];
}
const options = this.$refs.xmMenuWithPlan.options;
const options = this.$refs.xmMenuWithPlan.dicts;
if(options[key]==undefined || options[key]==null || options[key].length==0 ){
return v[j];
}
var rowData=options[key].filter(i=>i.optionValue==v[j])
var rowData=options[key].filter(i=>i.id==v[j])
if(rowData.length>0){
return rowData[0].optionName
return rowData[0].name
}else{
return v[j];
}

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

@ -265,7 +265,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
@ -320,7 +320,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
xmProductPstatus:[]
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -656,9 +656,9 @@
})
},
formatPstatus(row, column, cellValue, index){
var item=this.options.xmProductPstatus.find(i=>i.optionValue==cellValue)
var item=this.dicts.xmProductPstatus.find(i=>i.id==cellValue)
if(item){
return item.optionName
return item.name
}else{
return cellValue;
}
@ -691,9 +691,9 @@
},
mounted() {
listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
if(res.data.tips.isOk){
this.options['xmProductPstatus']=res.data.data.xmProductPstatus
this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus
}
});
this.$nextTick(() => {

16
src/views/xm/core/xmProduct/XmProductOverview.vue

@ -6,7 +6,7 @@
<div>
<el-row style="padding:10px">
<el-steps :active="calcXmProductPstatusStep" align-center finish-status="success">
<el-step v-for="(i,index) in options['xmProductPstatus']" :title="i.optionName" :key="index" >
<el-step v-for="(i,index) in dicts['xmProductPstatus']" :title="i.name" :key="index" >
</el-step>
</el-steps>
@ -242,7 +242,7 @@
import util from "@/common/js/util"; //
import { mapGetters } from "vuex";
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
export default {
computed: {
@ -309,9 +309,9 @@ export default {
return this.xmProduct;
},
calcXmProductPstatusStep(){
if(this.options['xmProductPstatus']){
var index=this.options['xmProductPstatus'].findIndex(i=>{
if(i.optionValue==this.xmProductCpd.pstatus){
if(this.dicts['xmProductPstatus']){
var index=this.dicts['xmProductPstatus'].findIndex(i=>{
if(i.id==this.xmProductCpd.pstatus){
return true;
}else{
return false;
@ -337,7 +337,7 @@ export default {
data() {
return {
isActive: true,
options:{
dicts:{
xmProductPstatus:[]
},
maxTableHeight:300,
@ -598,9 +598,9 @@ export default {
mounted() {
listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
if(res.data.tips.isOk){
this.options['xmProductPstatus']=res.data.data.xmProductPstatus
this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus
}
});
this.$nextTick(() => {

2
src/views/xm/core/xmProduct/XmProductProjectForLink.vue

@ -17,7 +17,7 @@
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import config from "@/common/config"; //
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject, } from '@/api/xm/core/xmProject';
import { mapGetters } from 'vuex'
import XmProjectForLink from '../xmProject/XmProjectForLink.vue';

4
src/views/xm/core/xmProduct/XmProductRecycle.vue

@ -130,7 +130,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProductWithState,unDelXmProduct } from '@/api/xm/core/xmProduct';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -175,7 +175,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProduct
//xmProduct

4
src/views/xm/core/xmProduct/XmProductSelect.vue

@ -91,7 +91,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProductWithState } from '@/api/xm/core/xmProduct';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -136,7 +136,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProduct
//xmProduct

4
src/views/xm/core/xmProduct/XmProductTplMng.vue

@ -121,7 +121,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
@ -162,7 +162,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProduct
//xmProduct

4
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
projectId: [

4
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue

@ -34,7 +34,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
import { mapGetters } from 'vuex'
@ -57,7 +57,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
projectId: [

8
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue

@ -35,7 +35,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProductProjectLink,addXmProductProjectLink, delXmProductProjectLink, batchDelXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
import XmProductProjectLinkAdd from './XmProductProjectLinkAdd';//
import XmProductProjectLinkEdit from './XmProductProjectLinkEdit';//
@ -74,7 +74,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -279,9 +279,9 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
this.maxTableHeight = util.calcTableMaxHeight(".el-table")
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmProductState/XmProductStateAdd.vue

@ -124,7 +124,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmProductState } from '@/api/xm/core/xmProductState';
import { mapGetters } from 'vuex'
@ -147,7 +147,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmProductState/XmProductStateEdit.vue

@ -124,7 +124,7 @@
<script>
import util from '@/common/js/util';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmProductState } from '@/api/xm/core/xmProductState';
import { mapGetters } from 'vuex'
@ -147,7 +147,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

8
src/views/xm/core/xmProductState/XmProductStateMng.vue

@ -41,7 +41,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProductState, delXmProductState, batchDelXmProductState } from '@/api/xm/core/xmProductState';
import { mapGetters } from 'vuex'
@ -68,7 +68,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{
dicts:{
//sex:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
@ -231,9 +231,9 @@
this.getXmProductStates();
});
/**
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
initSimpleDicts( "all",["sex","grade"] ).then(res=>{
if(res.data.tips.isOk){
this.options=res.data.data
this.dicts=res.data.data
}
});
**/

4
src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue

@ -25,7 +25,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmProductTemplate } from '@/api/xm/core/xmProductTemplate';
import { mapGetters } from 'vuex'
@ -48,7 +48,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
addFormRules: {
id: [

4
src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue

@ -25,7 +25,7 @@
<script>
import util from '@/common/js/util';//
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmProductTemplate } from '@/api/xm/core/xmProductTemplate';
import { mapGetters } from 'vuex'
@ -48,7 +48,7 @@
},
data() {
return {
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//...
editFormRules: {
id: [

4
src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue

@ -49,7 +49,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProduct } from '@/api/xm/core/xmProduct';
import XmProductTemplateAdd from './XmProductTemplateAdd';//
import XmProductTemplateEdit from './XmProductTemplateEdit';//
@ -78,7 +78,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProductTemplate
//xmProductTemplate

29
src/views/xm/core/xmProject/XmProjectAdd.vue

@ -16,13 +16,13 @@
</el-form-item>
<el-form-item label="项目属性" prop="xmType">
<el-select v-model="addForm.xmType">
<el-option v-for="(i,index) in options['projectType']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['projectType']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
<el-select v-model="addForm.urgent">
<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
<el-select v-model="addForm.priority">
<el-option v-for="(i,index) in options['priority']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="预算控制">
@ -167,7 +167,7 @@
import util from '@/common/js/util';//
import {sn} from '@/common/js/sequence';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { addXmProject,createProjectCode } from '@/api/xm/core/xmProject';
import { mapGetters } from 'vuex';
@ -304,7 +304,7 @@
filters: {
ids: [],
},
options:{
dicts:{
projectType:[],
urgencyLevel:[],
priority:[],
@ -504,20 +504,11 @@
},
mounted() {
this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el);
listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
if(res.data.tips.isOk){
this.options['projectType']=res.data.data.projectType
this.options['urgencyLevel']=res.data.data.urgencyLevel
this.options['priority']=res.data.data.priority
this.options['projectStatus']=res.data.data.projectStatus
this.addForm.xmType=this.options['projectType'][0].optionValue
this.addForm.urgent=this.options['urgencyLevel'][0].optionValue
this.addForm.priority=this.options['priority'][0].optionValue
//this.addForm.projectStatus=this.options['projectStatus'][0].optionValue
}
});
this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el);
initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
this.dicts=res.data.data;
})
}
}

2
src/views/xm/core/xmProject/XmProjectAssess.vue

@ -47,7 +47,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex';
import VueEditor from '@/components/Tinymce/index';
import { editAssess, listXmProject, delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';

2
src/views/xm/core/xmProject/XmProjectBudgetCost.vue

@ -103,7 +103,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex';
import { editBudget } from '@/api/xm/core/xmProject';
import { listSumXmProjectMBudgetCostUser } from '@/api/xm/core/xmProjectMBudgetCostUser';

2
src/views/xm/core/xmProject/XmProjectComplex.vue

@ -64,7 +64,7 @@
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import XmIterationMng from '../xmIteration/XmIterationMng.vue'
import XmMenuMng from '../xmMenu/XmMenuMng.vue'
import XmIterationStateShow from '../xmIterationState/XmIterationStateShow.vue'

2
src/views/xm/core/xmProject/XmProjectCost.vue

@ -101,7 +101,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex';
import { editBudget } from '@/api/xm/core/xmProject';
import { listSumXmProjectMCostUser } from '@/api/xm/core/xmProjectMCostUser';

2
src/views/xm/core/xmProject/XmProjectDetail.vue

@ -9,7 +9,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from 'vuex'
import { listXmProject } from '@/api/xm/core/xmProject';
import XmProjectEdit from './XmProjectEdit';//

37
src/views/xm/core/xmProject/XmProjectEdit.vue

@ -2,9 +2,9 @@
<section class="page-container padding border">
<el-row class="padding-bottom">
<el-steps :active="calcProjectStatusStep" simple finish-status="success">
<el-step v-for="(i,index) in options['projectStatus']" :title="i.optionName" :key="index" @click.native.stop="editForm.status=i.optionValue">
<el-link slot="title" @click.native.stop="editForm.status=i.optionValue">
{{i.optionName}}
<el-step v-for="(i,index) in dicts['projectStatus']" :title="i.name" :key="index" @click.native.stop="editForm.status=i.id">
<el-link slot="title" @click.native.stop="editForm.status=i.id">
{{i.name}}
</el-link>
</el-step>
</el-steps>
@ -16,13 +16,13 @@
</el-form-item>
<el-form-item label="项目属性" prop="xmType">
<el-select v-model="editForm.xmType">
<el-option v-for="(i,index) in options['projectType']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['projectType']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
<el-select v-model="editForm.urgent">
<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
<el-select v-model="editForm.priority">
<el-option v-for="(i,index) in options['priority']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option>
<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="预算控制">
@ -167,7 +167,7 @@
import {sn} from '@/common/js/sequence';//
import config from "@/common/config"; //
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { editXmProject,getDefOptions } from '@/api/xm/core/xmProject';
import { uploadBase64 } from '@/api/mdp/arc/image';
@ -276,9 +276,9 @@
return this.editForm.totalReceivables
},
calcProjectStatusStep(){
if(this.options['projectStatus'] && this.editForm){
var index=this.options['projectStatus'].findIndex(i=>{
if(i.optionValue==this.editForm.status){
if(this.dicts['projectStatus'] && this.editForm){
var index=this.dicts['projectStatus'].findIndex(i=>{
if(i.id==this.editForm.status){
return true;
}else{
return false;
@ -366,7 +366,7 @@
filters: {
ids: [],
},
options: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, add: false, del: false, edit: false },//...
editFormRules: {
name: [{
@ -738,16 +738,11 @@
this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el);
this.editForm=Object.assign({},this.selProject);
this.dateRanger=[this.editForm.startTime,this.editForm.endTime]
listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
if(res.data.tips.isOk){
this.options['projectType']=res.data.data.projectType
this.options['urgencyLevel']=res.data.data.urgencyLevel
this.options['priority']=res.data.data.priority
this.options['projectStatus']=res.data.data.projectStatus
//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
}
});
initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
this.dicts=res.data.data;
})
}
}

4
src/views/xm/core/xmProject/XmProjectForLink.vue

@ -39,7 +39,7 @@
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import config from "@/common/config"; //
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject, } from '@/api/xm/core/xmProject';
import { mapGetters } from 'vuex'
import { delXmProductProjectLink, addXmProductProjectLink,batchDelXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
@ -78,7 +78,7 @@ import XmProjectList from './XmProjectList.vue';
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProject
//xmProject

8
src/views/xm/core/xmProject/XmProjectInfo.vue

@ -161,7 +161,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
import XmProjectAdd from './XmProjectAdd';//
import XmProjectEdit from './XmProjectEdit';//
@ -362,13 +362,13 @@
} else {
return v[j];
}
const options = this.$refs.xmMenuWithPlan.options;
const options = this.$refs.xmMenuWithPlan.dicts;
if(options[key]==undefined || options[key]==null || options[key].length==0 ){
return v[j];
}
var rowData=options[key].filter(i=>i.optionValue==v[j])
var rowData=options[key].filter(i=>i.id==v[j])
if(rowData.length>0){
return rowData[0].optionName
return rowData[0].name
}else{
return v[j];
}

4
src/views/xm/core/xmProject/XmProjectList.vue

@ -32,7 +32,7 @@
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import config from "@/common/config"; //
//import { listOption } from '@/api/mdp/meta/itemOption';//
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject, } from '@/api/xm/core/xmProject';
import { mapGetters } from 'vuex'
@ -60,7 +60,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProject
//xmProject

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

@ -26,7 +26,7 @@
<el-option value="myExecuserStatus7" label="我放弃"></el-option>
</el-select>
<el-select v-model="filters.status" clearable placeholder="项目状态">
<el-option v-for="(item,index) in options['projectStatus']" :value="item.optionValue" :label="item.optionName" :key="index"></el-option>
<el-option v-for="(item,index) in dicts['projectStatus']" :value="item.id" :label="item.name" :key="index"></el-option>
</el-select>
<el-input class="hidden-md-and-down" placeholder="选择产品" v-model="filters.productName" @click.native="productSelectVisible=true" clearable @clear="onProductClose" style="width:15%;"></el-input>
<el-input v-model="filters.key" style="width:15%;" placeholder="项目名称模糊查询" clearable>
@ -303,7 +303,7 @@
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import config from "@/common/config"; //
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode ,getDefOptions} from '@/api/xm/core/xmProject';
import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
@ -370,7 +370,7 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
options: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmProject
//xmProject
@ -808,10 +808,10 @@
})
},
formatProjectStatus(status){
if(this.options['projectStatus'] && this.options['projectStatus'].length>0 ){
var sts=this.options['projectStatus'].find(i=>i.optionValue==status)
if(this.dicts['projectStatus'] && this.dicts['projectStatus'].length>0 ){
var sts=this.dicts['projectStatus'].find(i=>i.id==status)
if(sts){
return sts.optionName
return sts.name
}else{
return status;
}
@ -853,16 +853,10 @@
this.filters.productId=this.$route.params.productId;
this.filters.productName=this.$route.params.productName;
}
this.$nextTick(() => {
listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
if(res.data.tips.isOk){
this.options['projectType']=res.data.data.projectType
this.options['urgencyLevel']=res.data.data.urgencyLevel
this.options['priority']=res.data.data.priority
this.options['projectStatus']=res.data.data.projectStatus
}
});
this.$nextTick(() => {
initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
this.dicts=res.data.data;
})
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table1.$el);
this.showInfo = false;
this.getXmProjects(this.guiderStart);

26
src/views/xm/core/xmProject/XmProjectOverview.vue

@ -6,9 +6,9 @@
<div>
<el-row style="padding:10px">
<el-steps :active="calcProjectStatusStep" finish-status="success">
<el-step v-for="(i,index) in options['projectStatus']" :title="i.optionName" :key="index">
<el-step v-for="(i,index) in dicts['projectStatus']" :title="i.name" :key="index">
<el-row slot="title">
{{i.optionName}}
{{i.name}}
</el-row>
</el-step>
</el-steps>
@ -266,7 +266,7 @@
<script>
import util from "@/common/js/util"; //
import { mapGetters } from "vuex";
import { listOption } from '@/api/mdp/meta/itemOption';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { getDefOptions} from '@/api/xm/core/xmProject';
export default {
@ -335,9 +335,9 @@ export default {
return this.selProject
},
calcProjectStatusStep(){
if(this.options['projectStatus'] && this.selProject){
var index=this.options['projectStatus'].findIndex(i=>{
if(i.optionValue==this.selProject.status){
if(this.dicts['projectStatus'] && this.selProject){
var index=this.dicts['projectStatus'].findIndex(i=>{
if(i.id==this.selProject.status){
return true;
}else{
return false;
@ -366,7 +366,7 @@ export default {
return {
isActive: true,
maxTableHeight:300,
options: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts: getDefOptions(),// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
};
},
@ -754,14 +754,10 @@ export default {
this.$nextTick(() => {
this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
});
listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
if(res.data.tips.isOk){
this.options['projectType']=res.data.data.projectType
this.options['urgencyLevel']=res.data.data.urgencyLevel
this.options['priority']=res.data.data.priority
this.options['projectStatus']=res.data.data.projectStatus
}
});
initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
this.dicts=res.data.data;
})
this.drawAllBar();
this.drawTaskByDate();
this.drawPieBug();

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save