重命名xmTaskWorkload为xmWorkload

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'
     },
     {

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: '工时月报'}},
       ]
     }
   ]

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

@@ -509,13 +509,13 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <xm-task-workload-edit 
+      <xm-workload-edit 
         :xm-task="editForm"
         :visible="taskWorkloadVisible" 
         op-type="add"
         @cancel="taskWorkloadVisible=false"
         @submit="onTaskWorkloadSubmit"
-      ></xm-task-workload-edit>
+      ></xm-workload-edit>
     </el-dialog> 
 
  			<tag-dialog ref="tagDialog"   @select-confirm="onTagSelected">
@@ -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() {

src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue

@@ -138,7 +138,7 @@
       </el-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="linkProjectId?{id:linkProjectId}:null" :xm-product="parentXmMenu?{id:parentXmMenu.productId}:null" @user-confirm="selectCreateUserConfirm">
 			</xm-group-dialog>  
-      <xm-task-workload-record-dialog ref="workloadRecordDialog" @submi="afterWorkloadSubmit" @edit-xm-task-some-fields="onEditXmTaskSomeFields" @submit="onWorkloadSubmit"></xm-task-workload-record-dialog>
+      <xm-workload-record-dialog ref="workloadRecordDialog" @submi="afterWorkloadSubmit" @edit-xm-task-some-fields="onEditXmTaskSomeFields" @submit="onWorkloadSubmit"></xm-workload-record-dialog>
     </el-row> 
 </template>
 
@@ -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();

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";

src/views/xm/core/xmTask/XmTaskEdit.vue

@@ -263,7 +263,7 @@
 					</el-tab-pane>
 					
 					<el-tab-pane label="工时" name="5"> 
-						 <xm-task-workload-record v-if="activateTabPaneName=='5'" :xm-task="editForm" ></xm-task-workload-record>
+						 <xm-workload-record v-if="activateTabPaneName=='5'" :xm-task="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="预算金额" name="6"> 
 						<el-form-item label="自研工时单价" prop="uniInnerPrice">
@@ -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
 		},

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

@@ -653,13 +653,13 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <xm-task-workload-edit 
+      <xm-workload-edit 
         :xm-task="editForm"
         :visible="taskWorkloadVisible" 
         op-type="add"
         @cancel="taskWorkloadVisible=false"
         @submit="onTaskWorkloadSubmit"
-      ></xm-task-workload-edit>
+      ></xm-workload-edit>
     </el-dialog>
 
     <!-- 新增 XmTask xm_task界面-->
@@ -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,
     //在下面添加其它组件
   },

src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@@ -156,13 +156,13 @@
 				append-to-body
 				:close-on-click-modal="false"
 				>
-				<xm-task-workload-edit 
+				<xm-workload-edit 
 					:xm-task="xmTask"
 					:visible="taskWorkloadVisible" 
 					op-type="add"
 					@cancel="taskWorkloadVisible=false"
 					@submit="onTaskWorkloadSubmit"
-				></xm-task-workload-edit>
+				></xm-workload-edit>
 			</el-dialog>
 		</el-row>
 	</section>
@@ -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() {

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){
           }

src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue

@@ -211,7 +211,7 @@
 		top="20px"
 		width="80%"
 		>
-		<xm-task-workload-simple-list-for-biz-date
+		<xm-workload-simple-list-for-biz-date
 			:visible="popoverConfig.workloadDialogVisible"
 			:task-id="popoverConfig.taskId"
 			:project-id="popoverConfig.projectId"
@@ -220,7 +220,7 @@
 			:wstatus="popoverConfig.wstatus"
 			:sstatus="popoverConfig.sstatus"   
 			:userid="popoverConfig.userid"
-		></xm-task-workload-simple-list-for-biz-date>
+		></xm-workload-simple-list-for-biz-date>
 		</el-dialog>
 		
 		<el-dialog
@@ -233,12 +233,12 @@
 		width="80%"
 		@close="searchXmTaskSbillDetails()"
 		>
-		<xm-task-workload-simple-list-for-biz-date
+		<xm-workload-simple-list-for-biz-date
 			:visible="popoverPlusConfig.workloadDialogVisible" 
 			:project-id="popoverPlusConfig.projectId" 
 			:wstatus="popoverPlusConfig.wstatus"
 			:sstatus="popoverPlusConfig.sstatus"    
-		></xm-task-workload-simple-list-for-biz-date>
+		></xm-workload-simple-list-for-biz-date>
 		</el-dialog>
 	</section>
 </template>
@@ -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: {

src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue

@@ -122,7 +122,7 @@
         @edit-fields="onEditXmTaskSomeFields"
       ></xm-task-edit>
     </el-dialog>  
-      <xm-task-workload-record-dialog ref="workloadRecordDialog" @submi="afterWorkloadSubmit" @edit-xm-task-some-fields="onEditXmTaskSomeFields" @submit="onWorkloadSubmit"></xm-task-workload-record-dialog>
+      <xm-workload-record-dialog ref="workloadRecordDialog" @submi="afterWorkloadSubmit" @edit-xm-task-some-fields="onEditXmTaskSomeFields" @submit="onWorkloadSubmit"></xm-workload-record-dialog>
     </el-row> 
 </template>
 
@@ -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();

src/views/xm/rpt/project/projectWorkloadSetDayList.vue

@@ -40,7 +40,7 @@
 	import { mapGetters } from 'vuex'	 
 	
 	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//新增界面
-	import { listProjectWorkloadSetDay } from '@/api/xm/core/xmTaskWorkload';
+	import { listProjectWorkloadSetDay } from '@/api/xm/core/xmWorkload';
 	export default { 
         
 		components: {  

src/views/xm/rpt/project/projectWorkloadSetMonthList.vue

@@ -40,7 +40,7 @@
 	import { mapGetters } from 'vuex'	 
 	
 	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//新增界面
-	import { listProjectWorkloadSetMonth } from '@/api/xm/core/xmTaskWorkload';
+	import { listProjectWorkloadSetMonth } from '@/api/xm/core/xmWorkload';
 	export default { 
         
 		components: {