diff --git a/src/common/js/treeTool.js b/src/common/js/treeTool.js index 27700662..3f53b26c 100644 --- a/src/common/js/treeTool.js +++ b/src/common/js/treeTool.js @@ -3,7 +3,7 @@ export default { reloadAllChildren: function(table,maps, rows,parentIdName,loadChildren,idMaps) { - debugger; + if(!rows||rows.length==0){ return; diff --git a/src/common/js/util.js b/src/common/js/util.js index cf5c00e9..76b7b868 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -46,7 +46,7 @@ export default { * @returns [{id:'',name:'',className:''}] */ formatDictsWithClass: function(dicts,itemCode,cellValue){ - debugger; + var classNames=['info','primary','success','warning','danger']; let key=itemCode; if(!cellValue){ @@ -270,7 +270,7 @@ export default { }, //type date/daterange - pickerOptions: function(type) { + getPickerOptions: function(type) { if (type != 'datarange') { var shortcuts = [{ text: '今天', diff --git a/src/components/dateRange/index.vue b/src/components/dateRange/index.vue index 50c58653..f2c41f68 100644 --- a/src/components/dateRange/index.vue +++ b/src/components/dateRange/index.vue @@ -80,7 +80,7 @@ export default { }, pickerOptions:{ typeof:Object, - default:function(){return util.pickerOptions('datarange')} + default:function(){return util.getPickerOptions('datarange')} }, autoDefault:{ type:Boolean, diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 2b7194b4..e359f6e4 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -178,16 +178,18 @@ export default { children: [ { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}}, /*{ path: 'xmTaskWorkload/XmTaskWorkloadMng', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadMng'), name: 'XmTaskWorkloadMng', meta: { title: '工时列表'}},*/ + { path: 'xmTaskWorkload/ToComfirmWorkload', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkload'), name: 'ToComfirmWorkload', meta: { title: '待确认工时(我)'}}, + { path: 'xmTaskWorkload/HadComfirmWorkload', component: _import('xm/core/xmTaskWorkload/HadComfirmWorkload'), name: 'HadComfirmWorkload', meta: { title: '已确认工时(我)'}}, { path: 'xmTaskWorkload/WaitWorkloadToSbill', component: _import('xm/core/xmTaskWorkload/WaitWorkloadToSbill'), name: 'WaitWorkloadToSbill', meta: { title: '待结算工时(我)'}}, { path: 'xmTaskWorkload/FinWorkloadToSbill', component: _import('xm/core/xmTaskWorkload/FinWorkloadToSbill'), name: 'FinWorkloadToSbill', meta: { title: '已结算工时(我)'}}, - { path: 'xmTaskWorkload/ToComfirmWorkload', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkload'), name: 'ToComfirmWorkload', 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/ToComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkloadAll'), name: 'ToComfirmWorkloadAll', meta: { title: '待确认工时'}}, + { path: 'xmTaskWorkload/HadComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/HadComfirmWorkloadAll'), name: 'HadComfirmWorkloadAll', meta: { title: '已确认工时'}}, { path: 'xmTaskWorkload/WaitWorkloadToSbillAll', component: _import('xm/core/xmTaskWorkload/WaitWorkloadToSbillAll'), name: 'WaitWorkloadToSbillAll', meta: { title: '待结算工时'}}, { path: 'xmTaskWorkload/FinWorkloadToSbillAll', component: _import('xm/core/xmTaskWorkload/FinWorkloadToSbillAll'), name: 'FinWorkloadToSbillAll', meta: { title: '已结算工时'}}, - { path: 'xmTaskWorkload/ToComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkloadAll'), name: 'ToComfirmWorkloadAll', 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: '工时月报表'}}, diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue index 06ee948b..d47c58ed 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue @@ -64,7 +64,7 @@ this.$router.back(-1); }, dataInit(){ - debugger; + this.$nextTick(()=>{ var key="ProcdefListForBizStart" if(this.$route.query && this.$route.query.params){ diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue index 13d1781f..c12422fa 100644 --- a/src/views/mdp/workflow/ru/task/TaskMng.vue +++ b/src/views/mdp/workflow/ru/task/TaskMng.vue @@ -264,7 +264,7 @@ } }, activated: function() { - debugger; + if (this.assigneeToMe !== false) { if (this.isClaim == undefined || this.isClaim === false) { this.filters.assignee = this.userInfo.userid; diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue index 9efdd6eb..192d1ee7 100644 --- a/src/views/xm/core/components/XmIterationSelect.vue +++ b/src/views/xm/core/components/XmIterationSelect.vue @@ -99,7 +99,7 @@ queryScope:'',//迭代查询范围 iterationId\branchId\compete\'' id:'',//迭代编号 }, - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), dateRangerOnline: [ ],//上线时间选择范围 xmIterations: [],//查询结果 diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue index d29256ae..f9f8c03b 100644 --- a/src/views/xm/core/components/XmProductSelect.vue +++ b/src/views/xm/core/components/XmProductSelect.vue @@ -140,7 +140,7 @@ selectFiltersPmUserVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), productVisible:false, moreVisible:false, hadInit:false, diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue index bfa6275f..b083e1fd 100644 --- a/src/views/xm/core/components/XmProjectSelect.vue +++ b/src/views/xm/core/components/XmProjectSelect.vue @@ -145,7 +145,7 @@ selectFiltersPmUserVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), projectVisible:false, moreVisible:false, hadInit:false, diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index e68efdcb..9dd24c2a 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -154,7 +154,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' queryScope:'',//迭代查询范围 iterationId\branchId\compete\'' id:'',//迭代编号 }, - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), dateRanger: [ ],//创建时间选择范围 dateRangerOnline: [ ],//上线时间选择范围 diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 72ef636f..acbe7bdb 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -525,7 +525,7 @@ selectFiltersMmUserVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), productVisible:false, tagSelectVisible:false, fieldTagVisible:false, diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index 5971227c..707a67bc 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -131,7 +131,7 @@ userSelectVisible:false, batchMmUserSelectVisible:false, maxTableHeight:300, - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), maps:new Map(), } diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 2c4cdc69..7061d2fb 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -283,7 +283,7 @@ maxTableHeight:300, dateRanger: [ ], tagSelectVisible:false, - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), /**end 自定义属性请在上面加 请加备注**/ } },//end data diff --git a/src/views/xm/core/xmPhase/XmPhaseAdd.vue b/src/views/xm/core/xmPhase/XmPhaseAdd.vue index b59446e7..8275fbbd 100644 --- a/src/views/xm/core/xmPhase/XmPhaseAdd.vue +++ b/src/views/xm/core/xmPhase/XmPhaseAdd.vue @@ -222,7 +222,7 @@ util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss") ], /**begin 在下面加自定义属性,记得补上面的一个逗号**/ - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), activeName:'', costVisible:false, /**end 在上面加自定义属性**/ diff --git a/src/views/xm/core/xmPhase/XmPhaseBatch.vue b/src/views/xm/core/xmPhase/XmPhaseBatch.vue index 0969f28a..aed54f27 100644 --- a/src/views/xm/core/xmPhase/XmPhaseBatch.vue +++ b/src/views/xm/core/xmPhase/XmPhaseBatch.vue @@ -520,7 +520,7 @@ export default { batchEditVisible: false, menuVisible: false, //由需求自动创建计划 tableHeight: 300, - pickerOptions: util.pickerOptions("date"), + pickerOptions: util.getPickerOptions("date"), gstcVisible: false, ganrrColumns: { children: "children", diff --git a/src/views/xm/core/xmPhase/XmPhaseEdit.vue b/src/views/xm/core/xmPhase/XmPhaseEdit.vue index 791c0391..ace33b24 100644 --- a/src/views/xm/core/xmPhase/XmPhaseEdit.vue +++ b/src/views/xm/core/xmPhase/XmPhaseEdit.vue @@ -229,7 +229,7 @@ dateRanger: [ ], /**begin 在下面加自定义属性,记得补上面的一个逗号**/ - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), activeName:'', costVisible:false, statusList:[ diff --git a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue index 9f684778..2fdda48d 100644 --- a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue +++ b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue @@ -303,7 +303,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; batchEditVisible:false, menuVisible:false,//由需求自动创建计划 tableHeight:200, - pickerOptions: util.pickerOptions('date'), + pickerOptions: util.getPickerOptions('date'), gstcVisible:false, groupUserSelectVisible:false,//选择负责人 ganrrColumns: { diff --git a/src/views/xm/core/xmPhase/XmPhaseMng.vue b/src/views/xm/core/xmPhase/XmPhaseMng.vue index 5a78fbd4..47b69840 100644 --- a/src/views/xm/core/xmPhase/XmPhaseMng.vue +++ b/src/views/xm/core/xmPhase/XmPhaseMng.vue @@ -335,7 +335,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; batchEditVisible:false, menuVisible:false,//由需求自动创建计划 tableHeight:200, - pickerOptions: util.pickerOptions('date'), + pickerOptions: util.getPickerOptions('date'), gstcVisible:false, groupUserSelectVisible:false,//选择负责人 ganrrColumns: { diff --git a/src/views/xm/core/xmPhase/XmPhaseSelect.vue b/src/views/xm/core/xmPhase/XmPhaseSelect.vue index 2a6cf7cc..6e209ee3 100644 --- a/src/views/xm/core/xmPhase/XmPhaseSelect.vue +++ b/src/views/xm/core/xmPhase/XmPhaseSelect.vue @@ -101,7 +101,7 @@ valueChangeRows:[], batchEditVisible:false, menuVisible:false,//由需求自动创建计划 - pickerOptions: util.pickerOptions('date'), + pickerOptions: util.getPickerOptions('date'), gstcVisible:false, tableHeight:300, ganrrColumns: { diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 8bcf0eb7..217f5591 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -382,7 +382,7 @@ maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), projectVisible:false, productSelectVisible:false, showType:false, diff --git a/src/views/xm/core/xmProduct/XmProductRecycle.vue b/src/views/xm/core/xmProduct/XmProductRecycle.vue index 0f82a55d..dd5153ee 100644 --- a/src/views/xm/core/xmProduct/XmProductRecycle.vue +++ b/src/views/xm/core/xmProduct/XmProductRecycle.vue @@ -193,7 +193,7 @@ selectFiltersPmUserVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), /**begin 自定义属性请在下面加 请加备注**/ diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue index dc7e4e46..d4d8fc69 100644 --- a/src/views/xm/core/xmProduct/XmProductTplMng.vue +++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue @@ -183,7 +183,7 @@ selectFiltersPmUserVisible:false, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), projectVisible:false, productSelectVisible:false, xmProductCopy:{ diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index f460381a..8ea1b1a9 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -479,7 +479,7 @@ /**begin 在下面加自定义属性,记得补上面的一个逗号**/ dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), activateName:'planWorkload', changeTips:[],//变化日志列表 maxTableHeight:300, diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 64ab86a7..da176e63 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -398,7 +398,7 @@ productSelectVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), xmProjectCopy:{ id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGroup:'1',copyGroupUser:'0' }, diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue index 8961873c..092df88f 100644 --- a/src/views/xm/core/xmProject/XmProjectTplMng.vue +++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue @@ -155,7 +155,7 @@ productSelectVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), xmProjectCopy:{ id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGroup:'1',copyGroupUser:'0' }, diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue index 56820905..b10598d0 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue @@ -287,7 +287,7 @@ /**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/ dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), /**end 在上面加自定义属性**/ }//end return },//end data diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue index 18113835..f54a039f 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue @@ -297,7 +297,7 @@ /**begin 在下面加自定义属性,记得补上面的一个逗号**/ dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), activateName:'planWorkload', /**end 在上面加自定义属性**/ }//end return diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 4deb2a77..c717ddce 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -394,7 +394,7 @@ dateRanger: [ ], ltimeRanger:[ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), userType:'',//createUser、handlerUser tagSelectVisible:false, /**end 自定义属性请在上面加 请加备注**/ diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 01b3e1dd..889a450c 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -394,7 +394,7 @@ ], actDateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), /**end 在上面加自定义属性**/ }//end return },//end data diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index f37f2d54..d8630f07 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -372,7 +372,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; ], actDateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), tagSelectVisible:false, subWorkItemNum:0, /**end 在上面加自定义属性**/ diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index c6fbf160..c765a8d1 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -173,7 +173,7 @@ projectPhase: null, tableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), maps:new Map(), /**end 自定义属性请在上面加 请加备注**/ } diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index aa02a2d5..1603ae2b 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -153,7 +153,7 @@ }, selkey: "all", - pickerOptions: util.pickerOptions(), + pickerOptions: util.getPickerOptions(), tableHeight:300, /**end 自定义属性请在上面加 请加备注**/ } diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 5b4ba2ae..b9531938 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1147,14 +1147,14 @@ export default { projectInfoVisible: false, menuVisible: false, menuDetailVisible: false, - pickerOptions: util.pickerOptions(), + pickerOptions: util.getPickerOptions(), displayType: "table", menuStory: false, //需求查询 showSkillSearchVisible: false, //按技能查询 tableHeight: 300, productSelectVisible: false, dateRanger: [], - pickerOptions: util.pickerOptions("datarange"), + pickerOptions: util.getPickerOptions("datarange"), budgetDateRanger: [], actDateRanger: [], diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue index 5182d178..5662b1c7 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue @@ -115,7 +115,7 @@ userSelectVisible: false, quoteDateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), /**end 在上面加自定义属性**/ }//end return },//end data diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue index f8d915ac..621f3c45 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue @@ -200,7 +200,7 @@ quoteDateRanger: [ ], execuserAddType:'add',//add为新增 join为当前登陆者加入 - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), tableHeight:300, /**end 自定义属性请在上面加 请加备注**/ } diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index d0508415..46547bc4 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -254,7 +254,7 @@ quoteDateRanger: [ ], execuserAddType:'add',//add为新增 join为当前登陆者加入 - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), tableHeight:300, taskWorkloadVisible:false, diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue index a4079ba5..f94f5c65 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue @@ -208,7 +208,7 @@ thisBillRow:{},//添加工时的结算单 projectId:'',//添加工时的项目编号 moreVisible:false, - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), dateRanger: [], selectFiltersPmUserVisible:false, selProjectId:'', diff --git a/src/views/xm/core/xmTaskWorkload/HadComfirmWorkload.vue b/src/views/xm/core/xmTaskWorkload/HadComfirmWorkload.vue new file mode 100644 index 00000000..e42838de --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/HadComfirmWorkload.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/HadComfirmWorkloadAll.vue b/src/views/xm/core/xmTaskWorkload/HadComfirmWorkloadAll.vue new file mode 100644 index 00000000..074bf850 --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/HadComfirmWorkloadAll.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue b/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue index 628ba656..43b26723 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue @@ -132,7 +132,7 @@ export default { selectFiltersPmUserVisible:false, maxTableHeight:300, dateRanger: [ ], - pickerOptions: util.pickerOptions('datarange'), + pickerOptions: util.getPickerOptions('datarange'), sbillVisible:false, moreVisible:false, hadInit:false, diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue index 31a4eb37..d785ad14 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue @@ -17,7 +17,12 @@ - 查询 + 查询 + + + + 移出结算单 + @@ -38,20 +43,16 @@ - - - 移出结算单 - - - - - + + + - - + + + + + - + + + + - + - + - + - + - + - + - - - - - - - - - + + - - - + + +