diff --git a/src/api/xm/core/xmTaskWorkload.js b/src/api/xm/core/xmWorkload.js similarity index 62% rename from src/api/xm/core/xmTaskWorkload.js rename to src/api/xm/core/xmWorkload.js index 46cbfaf0..55e076bc 100644 --- a/src/api/xm/core/xmTaskWorkload.js +++ b/src/api/xm/core/xmWorkload.js @@ -14,39 +14,39 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmTaskWorkload = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/list`, { params: params }); }; +export const listXmWorkload = params => { return axios.get(`${base}/xm/core/xmWorkload/list`, { params: params }); }; //模糊查询工时登记表 条件之间or关系 -//export const listXmTaskWorkloadKey = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listKey`, { params: params }); }; +//export const listXmWorkloadKey = params => { return axios.get(`${base}/xm/core/xmWorkload/listKey`, { params: params }); }; //删除一条工时登记表 params={id:'主键 主键'} -export const delXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/del`,params); }; +export const delXmWorkload = params => { return axios.post(`${base}/xm/core/xmWorkload/del`,params); }; //批量删除工时登记表 params=[{id:'主键 主键'}] -export const batchDelXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/batchDel`, params); }; +export const batchDelXmWorkload = params => { return axios.post(`${base}/xm/core/xmWorkload/batchDel`, params); }; //修改一条工时登记表记录 -export const editXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/edit`, params); }; +export const editXmWorkload = params => { return axios.post(`${base}/xm/core/xmWorkload/edit`, params); }; //新增一条工时登记表 -export const addXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/add`, params); }; +export const addXmWorkload = params => { return axios.post(`${base}/xm/core/xmWorkload/add`, params); }; //普通查询 条件之间and关系 -export const listByProject = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listByProject`, { params: params }); }; +export const listByProject = params => { return axios.get(`${base}/xm/core/xmWorkload/listByProject`, { params: params }); }; -export const editWorkloadToSbill = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/editWorkloadToSbill`, params); }; +export const editWorkloadToSbill = params => { return axios.post(`${base}/xm/core/xmWorkload/editWorkloadToSbill`, params); }; -export const editXmTaskWorkloadSomeFields = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/editSomeFields`, params); }; +export const editXmWorkloadSomeFields = params => { return axios.post(`${base}/xm/core/xmWorkload/editSomeFields`, params); }; -export const listProjectWorkloadSetDay = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listProjectWorkloadSetDay`, { params: params }); }; -export const listProjectWorkloadSetMonth = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listProjectWorkloadSetMonth`, { params: params }); }; -export const batchSetSbillIdNull = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/batchSetSbillIdNull`, params); }; +export const listProjectWorkloadSetDay = params => { return axios.get(`${base}/xm/core/xmWorkload/listProjectWorkloadSetDay`, { params: params }); }; +export const listProjectWorkloadSetMonth = params => { return axios.get(`${base}/xm/core/xmWorkload/listProjectWorkloadSetMonth`, { params: params }); }; +export const batchSetSbillIdNull = params => { return axios.post(`${base}/xm/core/xmWorkload/batchSetSbillIdNull`, params); }; -export const listXmTaskWorkloadGroupByTaskIdAndUserid = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/ListGroupByTaskIdAndUserid`, { params: params }); }; +export const listXmWorkloadGroupByTaskIdAndUserid = params => { return axios.get(`${base}/xm/core/xmWorkload/ListGroupByTaskIdAndUserid`, { params: params }); }; -export const listXmTaskWorkloadGroupByTaskIdAndUseridToSet = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/ListGroupByTaskIdAndUseridToSet`, { params: params }); }; +export const listXmWorkloadGroupByTaskIdAndUseridToSet = params => { return axios.get(`${base}/xm/core/xmWorkload/ListGroupByTaskIdAndUseridToSet`, { params: params }); }; diff --git a/src/components/ModulesMenu/modulesOfRouter.js b/src/components/ModulesMenu/modulesOfRouter.js index f151d4ff..e8940db7 100644 --- a/src/components/ModulesMenu/modulesOfRouter.js +++ b/src/components/ModulesMenu/modulesOfRouter.js @@ -117,7 +117,7 @@ export const modulesOfRouter = [ }, { id: 'xm-workload', - path: '/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy', + path: '/xm/core/xmWorkload/XmWorkloadInfoMy', context: 'xm' }, { diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 5201ebd8..2b43026d 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -172,10 +172,10 @@ export default { { path: 'xmProject/XmProjectCost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款'}}, { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}}, - { path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报(我)'}}, - { path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报(我)'}}, - { path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报'}}, - { path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报'}}, + { path: 'xmWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报(我)'}}, + { path: 'xmWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报(我)'}}, + { path: 'xmWorkload/WorkloadSetDayList', component: _import('xm/core/xmWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报'}}, + { path: 'xmWorkload/WorkloadSetMonthList', component: _import('xm/core/xmWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报'}}, ] } ] diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 9cac30c1..120e8055 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -509,13 +509,13 @@ append-to-body :close-on-click-modal="false" > - + > @@ -631,7 +631,7 @@ import XmGantt from "../components/xm-gantt"; import XmTableConfig from '@/views/xm/core/components/XmTableConfig';//修改界面 import TagDialog from "@/views/mdp/arc/tag/TagDialog"; - import XmTaskWorkloadEdit from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit"; + import XmWorkloadEdit from "@/views/xm/core/xmWorkload/XmWorkloadEdit"; export default { computed: { @@ -1436,7 +1436,7 @@ export default { TagMng, TagDialog, XmTableConfig, - XmTaskWorkloadEdit, + XmWorkloadEdit, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue index 5fcabb28..ffd6d885 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue @@ -138,7 +138,7 @@ - + @@ -151,7 +151,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 import { mapGetters } from 'vuex' -import XmTaskWorkloadRecordDialog from '../xmTaskWorkload/XmTaskWorkloadRecordDialog.vue'; +import XmWorkloadRecordDialog from '../xmWorkload/XmWorkloadRecordDialog.vue'; import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; @@ -523,7 +523,7 @@ export default { }, }, //end methods components: { - XmTaskWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),XmPhaseSelect,MdpSelectUserXm, + XmWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),XmPhaseSelect,MdpSelectUserXm, }, mounted() { this.initData(); diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue index d0a92c61..89da41fe 100644 --- a/src/views/xm/core/xmProject/XmProjectInfo.vue +++ b/src/views/xm/core/xmProject/XmProjectInfo.vue @@ -404,8 +404,8 @@ import xmMenuMng from "../xmMenu/XmMenuBox"; import XmIterationForLinkComplex from "../xmIteration/XmIterationForLinkComplex.vue"; import XmProjectOverviewComplex from "./XmProjectOverviewComplex.vue"; import XmProductForLinkComplex from "../xmProduct/XmProductForLinkComplex.vue"; -import XmWorkloadSetDayList from "../xmTaskWorkload/WorkloadSetDayList.vue"; -import XmWorkloadSetMonthList from "../xmTaskWorkload/WorkloadSetMonthList.vue"; +import XmWorkloadSetDayList from "../xmWorkload/WorkloadSetDayList.vue"; +import XmWorkloadSetMonthList from "../xmWorkload/WorkloadSetMonthList.vue"; import XmReport from "@/views/xm/rpt/reportIndex"; import XmPlan from "../xmTask/XmPlan.vue"; diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index cdfc2100..7e7f62fc 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -263,7 +263,7 @@ - + @@ -567,7 +567,7 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' import XmSubWorkItem from "@/views/xm/core/xmTaskWorkItem/XmSubWorkItem"; import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng"; - import XmTaskWorkloadRecord from "../xmTaskWorkload/XmTaskWorkloadRecord" + import XmWorkloadRecord from "../xmWorkload/XmWorkloadRecord" import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; import XmMyDoFocus from '@/views/myWork/my/components/DoFocus'; import XmTaskExecuserForTask from '../xmTaskExecuser/XmTaskExecuserForTask.vue'; @@ -996,7 +996,7 @@ },//end method components: { xmSkillMng, - skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmTaskWorkloadRecord,XmMenuEdit, + skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"), //在下面添加其它组件 'xm-task-edit':XmTaskEdit }, diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 2cf538b0..0dadbbca 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -653,13 +653,13 @@ append-to-body :close-on-click-modal="false" > - + > @@ -883,7 +883,7 @@ import XmGroupSelect from "../xmGroup/XmGroupSelect.vue"; import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 import TagDialog from "@/views/mdp/arc/tag/TagDialog"; - import XmTaskWorkloadEdit from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit"; + import XmWorkloadEdit from "@/views/xm/core/xmWorkload/XmWorkloadEdit"; import XmPhaseSelect from "./XmPhaseSelect.vue"; import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; @@ -2179,7 +2179,7 @@ export default { TagDialog, XmGroupDialog, XmTableConfig, - XmTaskWorkloadEdit, + XmWorkloadEdit, XmPhaseSelect, //在下面添加其它组件 }, diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index a144b0ec..95f5666d 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -156,13 +156,13 @@ append-to-body :close-on-click-modal="false" > - + > @@ -180,7 +180,7 @@ import { mapGetters } from 'vuex' import html2canvas from 'html2canvas' import { uploadBase64 } from '@/api/mdp/arc/image'; - import XmTaskWorkloadEdit from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit"; + import XmWorkloadEdit from "@/views/xm/core/xmWorkload/XmWorkloadEdit"; export default { computed: { @@ -828,7 +828,7 @@ },//end methods components: { 'xm-task-execuser-add':XmTaskExecuserAdd, - 'xm-task-execuser-edit':XmTaskExecuserEdit, XmTaskWorkloadEdit, + 'xm-task-execuser-edit':XmTaskExecuserEdit, XmWorkloadEdit, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue index f94f5c65..93523cea 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue @@ -146,7 +146,7 @@ import { mapGetters } from 'vuex' import {editXmTaskSbill} from "../../../../api/xm/core/xmTaskSbill"; import dateUtil from "../../../../common/js/dateUtil"; - import {editXmTaskWorkload} from "../../../../api/xm/core/xmTaskWorkload"; + import {editXmWorkload} from "../../../../api/xm/core/xmWorkload"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import XmProjectSelect from "../components/XmProjectSelect"; @@ -381,7 +381,7 @@ //修改xmTaskSbill this.changeXmTaskSbill(this.thisBillRow); //更新xmTaskWokload现状 - this.changeXmTaskWorkload(row,this.thisBillRow); + this.changeXmWorkload(row,this.thisBillRow); this.getXmTaskSbills(); }, changeXmTaskSbill(data){ @@ -395,14 +395,14 @@ }).catch( err =>{}); }, //添加到结算的要修改工时登记的状态 - changeXmTaskWorkload(data,sbill){ + changeXmWorkload(data,sbill){ let params={ id:data.id, sstatus:'2',//2为已提交结算 stime:this.dateFormat("YYYY-mm-dd HH:MM:SS",new Date()), sbillId:sbill.id } - editXmTaskWorkload(params).then((res) => { + editXmWorkload(params).then((res) => { let tips=res.data.tips; if(tips.isOk){ } diff --git a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue index 0656abc9..947daecf 100644 --- a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue +++ b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue @@ -211,7 +211,7 @@ top="20px" width="80%" > - + > - + > @@ -249,12 +249,12 @@ import { initDicts,listXmTaskSbillDetail, delXmTaskSbillDetail, batchDelXmTaskSbillDetail,editSomeFieldsXmTaskSbillDetail } from '@/api/xm/core/xmTaskSbillDetail'; import XmTaskSbillDetailEdit from './XmTaskSbillDetailEdit';//新增修改界面 import { mapGetters } from 'vuex' - import XmTaskWorkloadSimpleListForBizDate from '../xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate'; + import XmWorkloadSimpleListForBizDate from '../xmWorkload/XmWorkloadSimpleListForBizDate'; export default { name:'xmTaskSbillDetailMng', components: { - XmTaskSbillDetailEdit,XmTaskWorkloadSimpleListForBizDate, + XmTaskSbillDetailEdit,XmWorkloadSimpleListForBizDate, }, props:['visible','branchId','userid','bizMonth','projectId','sbillId'], computed: { diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue index 2b793934..f8c20135 100644 --- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue @@ -122,7 +122,7 @@ @edit-fields="onEditXmTaskSomeFields" > - + @@ -135,7 +135,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 import { mapGetters } from 'vuex' -import XmTaskWorkloadRecordDialog from '../xmTaskWorkload/XmTaskWorkloadRecordDialog.vue'; +import XmWorkloadRecordDialog from '../xmWorkload/XmWorkloadRecordDialog.vue'; import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm/index';//修改界面 @@ -523,7 +523,7 @@ export default { } }, //end methods components: { - XmTaskWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),MdpSelectUserXm, + XmWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),MdpSelectUserXm, }, mounted() { this.initData(); diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue b/src/views/xm/core/xmWorkload/WorkloadSetDayList.vue similarity index 97% rename from src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue rename to src/views/xm/core/xmWorkload/WorkloadSetDayList.vue index d2a3e56d..7aa6e65e 100644 --- a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue +++ b/src/views/xm/core/xmWorkload/WorkloadSetDayList.vue @@ -51,9 +51,9 @@ - + - + > @@ -248,12 +248,12 @@ import { initSimpleDicts } from "@/api/mdp/meta/item"; //下拉框数据查询 import { mapGetters } from "vuex"; import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; //新增界面 -import { listProjectWorkloadSetDay } from "@/api/xm/core/xmTaskWorkload"; -import XmTaskWorkloadSimpleListForBizDate from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate"; +import { listProjectWorkloadSetDay } from "@/api/xm/core/xmWorkload"; +import XmWorkloadSimpleListForBizDate from "@/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate"; export default { components: { XmProjectSelect, - XmTaskWorkloadSimpleListForBizDate, + XmWorkloadSimpleListForBizDate, }, props: ["xmProduct", "xmProject", "queryScope"], computed: { diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayListMy.vue b/src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue similarity index 100% rename from src/views/xm/core/xmTaskWorkload/WorkloadSetDayListMy.vue rename to src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmWorkload/WorkloadSetMonthList.vue similarity index 97% rename from src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue rename to src/views/xm/core/xmWorkload/WorkloadSetMonthList.vue index fd3de6b5..693788e5 100644 --- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue +++ b/src/views/xm/core/xmWorkload/WorkloadSetMonthList.vue @@ -51,9 +51,9 @@ - + - + > @@ -248,12 +248,12 @@ import { initSimpleDicts } from "@/api/mdp/meta/item"; //下拉框数据查询 import { mapGetters } from "vuex"; import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; //新增界面 -import { listProjectWorkloadSetMonth } from "@/api/xm/core/xmTaskWorkload"; -import XmTaskWorkloadSimpleListForBizDate from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate"; +import { listProjectWorkloadSetMonth } from "@/api/xm/core/xmWorkload"; +import XmWorkloadSimpleListForBizDate from "@/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate"; export default { components: { XmProjectSelect, - XmTaskWorkloadSimpleListForBizDate, + XmWorkloadSimpleListForBizDate, }, props: ["xmProduct", "xmProject", "queryScope"], computed: { diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthListMy.vue b/src/views/xm/core/xmWorkload/WorkloadSetMonthListMy.vue similarity index 100% rename from src/views/xm/core/xmTaskWorkload/WorkloadSetMonthListMy.vue rename to src/views/xm/core/xmWorkload/WorkloadSetMonthListMy.vue diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue b/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue similarity index 100% rename from src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue rename to src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue similarity index 94% rename from src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue rename to src/views/xm/core/xmWorkload/XmWorkloadEdit.vue index 0e76e925..ecdc8396 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue @@ -3,7 +3,7 @@ - + @@ -99,14 +99,14 @@ import util from '@/common/js/util';//全局公共库 import config from "@/common/config"; //全局公共库import import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 - import { addXmTaskWorkload,editXmTaskWorkload } from '@/api/xm/core/xmTaskWorkload'; + import { addXmWorkload,editXmWorkload } from '@/api/xm/core/xmWorkload'; import { listXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; import XmGroupSelect from '../xmGroup/XmGroupSelect.vue'; import { mapGetters } from 'vuex' export default { - name:'xmTaskWorkloadEdit', + name:'xmWorkloadEdit', components: { XmGroupSelect }, @@ -130,12 +130,12 @@ }, }, - props:['xmTask','xmTaskWorkload','visible','opType'], + props:['xmTask','xmWorkload','visible','opType'], watch: { - 'xmTaskWorkload':function( xmTaskWorkload ) { - if(xmTaskWorkload){ - Object.assign(this.editForm,xmTaskWorkload); + 'xmWorkload':function( xmWorkload ) { + if(xmWorkload){ + Object.assign(this.editForm,xmWorkload); } }, @@ -194,16 +194,16 @@ handleCancel:function(){ this.$emit('cancel'); }, - //新增、编辑提交XmTaskWorkload 工时登记表父组件监听@submit="afterEditSubmit" + //新增、编辑提交XmWorkload 工时登记表父组件监听@submit="afterEditSubmit" saveSubmit: function () { this.$refs.editFormRef.validate((valid) => { if (valid) { this.$confirm('确认提交吗？', '提示', {}).then(() => { this.load.edit=true let params = Object.assign({}, this.editForm); - var func=addXmTaskWorkload + var func=addXmWorkload if(this.currOpType=='edit'){ - func=editXmTaskWorkload + func=editXmWorkload }else{ params.id=null; } @@ -224,8 +224,8 @@ }, initData: function(){ this.currOpType=this.opType - if(this.xmTaskWorkload){ - this.editForm = Object.assign({},this.xmTaskWorkload); + if(this.xmWorkload){ + this.editForm = Object.assign({},this.xmWorkload); } if(this.opType=='edit'){ diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue similarity index 82% rename from src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue rename to src/views/xm/core/xmWorkload/XmWorkloadInfo.vue index adb62412..c61ad525 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue @@ -2,13 +2,13 @@
- + @@ -40,7 +40,7 @@ 我的 - 关闭查询 + 关闭查询 @@ -48,8 +48,8 @@ - - + @@ -60,7 +60,7 @@ - + 所有工时记录 @@ -74,7 +74,7 @@ - + 所有工时记录 @@ -106,7 +106,7 @@ @@ -123,7 +123,7 @@ {{scope.row.sworkload}}h - + @@ -134,7 +134,7 @@ - - + @@ -147,7 +147,7 @@ - - + @@ -157,7 +157,7 @@ {{scope.row.sbillId}} - + @@ -181,14 +181,14 @@ - + - + - + - + @@ -201,26 +201,26 @@ import util from '@/common/js/util';//全局公共库 import config from '@/common/config';//全局公共库 import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 - import { listXmTaskWorkloadGroupByTaskIdAndUserid, delXmTaskWorkload, batchDelXmTaskWorkload,batchSetSbillIdNull,initDicts } from '@/api/xm/core/xmTaskWorkload'; - import XmTaskWorkloadEdit from './XmTaskWorkloadEdit';//新增修改界面 + import { listXmWorkloadGroupByTaskIdAndUserid, delXmWorkload, batchDelXmWorkload,batchSetSbillIdNull,initDicts } from '@/api/xm/core/xmWorkload'; + import XmWorkloadEdit from './XmWorkloadEdit';//新增修改界面 import { mapGetters } from 'vuex' import XmProjectSelect from "../components/XmProjectSelect"; import XmTaskSbillSelect from "./XmTaskSbillSelect"; - import {editWorkloadToSbill} from "@/api/xm/core/xmTaskWorkload"; - import {editXmTaskWorkloadSomeFields} from "../../../../api/xm/core/xmTaskWorkload"; + import {editWorkloadToSbill} from "@/api/xm/core/xmWorkload"; + import {editXmWorkloadSomeFields} from "../../../../api/xm/core/xmWorkload"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; - import XmTaskWorkloadSimpleList from './XmTaskWorkloadSimpleList'; + import XmWorkloadSimpleList from './XmWorkloadSimpleList'; import { listXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser'; import { listXmTask } from '@/api/xm/core/xmTask'; export default { - name:'xmTaskWorkloadMng', + name:'xmWorkloadMng', components: { - XmTaskWorkloadEdit, + XmWorkloadEdit, XmProjectSelect, XmTaskSbillSelect, UsersSelect, - XmTaskWorkloadSimpleList, + XmWorkloadSimpleList, }, props:['visible','wstatuses','sstatuses','queryScope'/**my/all */,'sbillId'], computed: { @@ -232,13 +232,13 @@ handler:function(o,n){ if(n==true){ this.initData(); - this.searchXmTaskWorkloads() + this.searchXmWorkloads() } }, immediate: true }, sbillId(){ - this.searchXmTaskWorkloads(); + this.searchXmWorkloads(); } }, data() { @@ -254,7 +254,7 @@ taskId:'', userid:'' }, - xmTaskWorkloads: [],//查询结果 + xmWorkloads: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 pageSize:10,//每页数据 @@ -271,7 +271,7 @@ sstatus:[{id:'0',name:'无需结算'},{id:'1',name: '待结算'},{id:'2',name:'已提交'},{id:'3',name:'已通过'},{id:'4',name:'已结算'}] /**0-无需结算，1-待结算2-已提交3-已通过4-已结算 */ },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} - addFormVisible: false,//新增xmTaskWorkload界面是否显示 + addFormVisible: false,//新增xmWorkload界面是否显示 addForm: { userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',rworkload:'',cusername:'',projectId:'' }, @@ -286,18 +286,18 @@ pickerOptions: util.getPickerOptions('datarange'), dateRanger: [], selectFiltersPmUserVisible:false, - xmTaskWorkloadSimpleListVisible:false, + xmWorkloadSimpleListVisible:false, } },//end data methods: { ...util, handleSizeChange(pageSize) { this.pageInfo.pageSize=pageSize; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, handleCurrentChange(pageNum) { this.pageInfo.pageNum = pageNum; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名 sortChange( obj ){ @@ -315,14 +315,14 @@ this.pageInfo.orderFields=[util.toLine(obj.prop)]; this.pageInfo.orderDirs=[dir]; } - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, - searchXmTaskWorkloads(){ + searchXmWorkloads(){ this.pageInfo.count=true; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, - //获取列表 XmTaskWorkload 工时登记表 - getXmTaskWorkloads() { + //获取列表 XmWorkload 工时登记表 + getXmWorkloads() { let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, @@ -379,12 +379,12 @@ } this.load.list = true; - listXmTaskWorkloadGroupByTaskIdAndUserid(params).then((res) => { + listXmWorkloadGroupByTaskIdAndUserid(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ this.pageInfo.total = res.data.total; this.pageInfo.count=false; - this.xmTaskWorkloads = res.data.data; + this.xmWorkloads = res.data.data; }else{ this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' }); } @@ -392,12 +392,12 @@ }).catch( err => this.load.list = false ); }, - //显示编辑界面 XmTaskWorkload 工时登记表 + //显示编辑界面 XmWorkload 工时登记表 showEdit: function ( row,index ) { this.editFormVisible = true; this.editForm = Object.assign({}, row); }, - //显示新增界面 XmTaskWorkload 工时登记表 + //显示新增界面 XmWorkload 工时登记表 showAdd: function () { this.addFormVisible = true; //this.addForm=Object.assign({}, this.editForm); @@ -405,34 +405,34 @@ afterAddSubmit(){ this.addFormVisible=false; this.pageInfo.count=true; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, afterEditSubmit(){ this.editFormVisible=false; }, - //选择行xmTaskWorkload + //选择行xmWorkload selsChange: function (sels) { this.sels = sels; }, - //删除xmTaskWorkload + //删除xmWorkload handleDel: function (row,index) { this.$confirm('确认删除该记录吗?', '提示', { type: 'warning' }).then(() => { this.load.del=true; let params = { id:row.id }; - delXmTaskWorkload(params).then((res) => { + delXmWorkload(params).then((res) => { this.load.del=false; var tips=res.data.tips; if(tips.isOk){ this.pageInfo.count=true; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); } this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, - //批量删除xmTaskWorkload + //批量删除xmWorkload batchSetSbillIdNull: function () { if(this.sels.length<=0){ return; @@ -453,7 +453,7 @@ var tips=res.data.tips; if( tips.isOk ){ this.pageInfo.count=true; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); } this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); @@ -471,12 +471,12 @@ type: 'warning' }).then(() => { this.load.del=true; - batchDelXmTaskWorkload(params).then((res) => { + batchDelXmWorkload(params).then((res) => { this.load.del=false; var tips=res.data.tips; if( tips.isOk ){ this.pageInfo.count=true; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); } this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); @@ -491,13 +491,13 @@ }, onProjectConfirm(obj){ this.selProject = obj.projectId; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, clearProject(){ this.selProject = null; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); }, - editXmTaskWorkloadSomeFields(row,fieldName,$event){ + editXmWorkloadSomeFields(row,fieldName,$event){ let params={ ids:[row.id], }; @@ -511,7 +511,7 @@ params.ids = [row.id]; params[fieldName]=$event } - var func = editXmTaskWorkloadSomeFields + var func = editXmWorkloadSomeFields if(fieldName==='sbillId'){ func = editWorkloadToSbill params.sbillId=$event.id @@ -520,7 +520,7 @@ } func(params).then(res=>{ let tips = res.data.tips; - this.getXmTaskWorkloads(); + this.getXmWorkloads(); if(tips.isOk){ }else{ this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) @@ -529,7 +529,7 @@ }, clearFiltersPmUser:function(){ this.filters.pmUser=null; - this.searchXmTaskWorkloads(); + this.searchXmWorkloads(); }, selectFiltersPmUser(){ this.selectFiltersPmUserVisible=true; @@ -541,11 +541,11 @@ this.filters.pmUser=null; } this.selectFiltersPmUserVisible=false; - this.searchXmTaskWorkloads(); + this.searchXmWorkloads(); }, setFiltersPmUserAsMySelf(){ this.filters.pmUser=this.userInfo; - this.searchXmTaskWorkloads(); + this.searchXmWorkloads(); }, },//end methods @@ -554,15 +554,15 @@ //initSimpleDicts('all',['sex','gradeLvl']).then(res=>this.dicts=res.data.data); initDicts(this); this.initData() - this.searchXmTaskWorkloads(); - this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el) + this.searchXmWorkloads(); + this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmWorkloadTable.$el) }); }, activated(){ this.initData(); - this.searchXmTaskWorkloads(); + this.searchXmWorkloads(); } } diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue b/src/views/xm/core/xmWorkload/XmWorkloadInfoMy.vue similarity index 77% rename from src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue rename to src/views/xm/core/xmWorkload/XmWorkloadInfoMy.vue index 329df479..12027a0a 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadInfoMy.vue @@ -1,12 +1,12 @@