From b9ae858bbd7bd1040541906c571d83c198bb840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 10 Apr 2022 06:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mdp/form/formData/FormDataMng.vue | 4 ++-- src/views/mdp/workflow/hi/procinst/ProcinstMng.vue | 4 ++-- src/views/mdp/workflow/ru/execution/ExecutionMng.vue | 6 +++--- .../ru/procinstParames/ProcinstParamesStartSet.vue | 4 ++-- src/views/mdp/workflow/ru/task/TaskMng.vue | 8 ++++---- src/views/xm/core/xmPhase/XmPhaseAdd.vue | 4 ++-- src/views/xm/core/xmPhase/XmPhaseBatch.vue | 12 ++++++------ src/views/xm/core/xmPhase/XmPhaseForProduct.vue | 12 ++++++------ src/views/xm/core/xmPhase/XmPhaseMng.vue | 12 ++++++------ src/views/xm/core/xmTask/XmTaskAdd.vue | 4 ++-- src/views/xm/core/xmTask/XmTaskEdit.vue | 4 ++-- src/views/xm/core/xmTask/XmTaskMng.vue | 6 +++--- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/views/mdp/form/formData/FormDataMng.vue b/src/views/mdp/form/formData/FormDataMng.vue index 83f13325..ef52970b 100644 --- a/src/views/mdp/form/formData/FormDataMng.vue +++ b/src/views/mdp/form/formData/FormDataMng.vue @@ -274,7 +274,7 @@ tags:[], users:null,//更新人 cusers:null,//创建人 - createTimeRanger:[util.formatDate.format(fromStartTime,'yyyy-MM-dd'),util.formatDate.format(toStartTime,'yyyy-MM-dd')], + createTimeRanger:[util.formatDate(fromStartTime,'yyyy-MM-dd'),util.formatDate(toStartTime,'yyyy-MM-dd')], flowState:'',//审核状态 0 未审核 1审核中 2 审核结束 }, pickerOptions: { @@ -942,7 +942,7 @@ var nullTimeDatas=[]; var tags=[]; var now=new Date(); - var dateStr=util.formatDate.format(now,'yyyy-MM-dd'); + var dateStr=util.formatDate(now,'yyyy-MM-dd'); datas.forEach(i=>{ var rowData=Object.assign({},i); diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue index 13f2b911..e9357268 100644 --- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue +++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue @@ -217,8 +217,8 @@ categoryTreeNodes: [], tags: [], startTimeRanger: [ - util.formatDate.format(fromStartTime, "yyyy-MM-dd"), - util.formatDate.format(toStartTime, "yyyy-MM-dd") + util.formatDate(fromStartTime, "yyyy-MM-dd"), + util.formatDate(toStartTime, "yyyy-MM-dd") ], planFinishTimeRanger: [], endTimeRanger: [], diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue index 2c7be3d3..5c011037 100644 --- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue +++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue @@ -328,11 +328,11 @@ procCategory: '', categoryTreeNodes: [], tags: [], - startTimeRanger: [util.formatDate.format(fromStartTime, 'yyyy-MM-dd'), util.formatDate.format(toStartTime, + startTimeRanger: [util.formatDate(fromStartTime, 'yyyy-MM-dd'), util.formatDate(toStartTime, 'yyyy-MM-dd')], planFinishTimeRanger: [], assignee: null, //已选中人员 - calendarDate: util.formatDate.format(toStartTime, 'yyyy-MM-dd'), + calendarDate: util.formatDate(toStartTime, 'yyyy-MM-dd'), filterType: '', suspensionState: '', //1/2 激活、挂起 }, @@ -988,7 +988,7 @@ var delayTasks = []; var tags = []; var now = new Date(); - var dateStr = util.formatDate.format(now, 'yyyy-MM-dd'); + var dateStr = util.formatDate(now, 'yyyy-MM-dd'); if (dateStr == data.day) { data.isSelected = true; diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue index 0ed9bf46..5b912462 100644 --- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue +++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue @@ -333,7 +333,7 @@ }, //新增界面数据 流程实例参数设置表 addForm: { - id:seq.sn(),isRefForm:'',monitors:'',sponsors:'',procInstId:'',formId:'',formDataId:'',procDefId:'',userid:'',startDate:util.formatDate.format(new Date(),'yyyy-MM-dd hh:mm:ss'),planFinishTime:'',mainQx:'',isTemplate:'',mainContext:'',mainTitle:'',deptid:'',categoryId:'' + id:seq.sn(),isRefForm:'',monitors:'',sponsors:'',procInstId:'',formId:'',formDataId:'',procDefId:'',userid:'',startDate:util.formatDate(new Date(),'yyyy-MM-dd hh:mm:ss'),planFinishTime:'',mainQx:'',isTemplate:'',mainContext:'',mainTitle:'',deptid:'',categoryId:'' }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ procdefParamesForm: { @@ -603,7 +603,7 @@ this.addForm.sponsors=(this.procdef.sponsors!=null && this.procdef.sponsors!='')?this.procdef.sponsors:this.userInfo.userid; var planFinishTime = new Date(); planFinishTime.setTime(planFinishTime.getTime() + 3600 * 1000 * 24 * 7); - this.addForm.planFinishTime=util.formatDate.format(planFinishTime,'yyyy-MM-dd hh:mm:ss') + this.addForm.planFinishTime=util.formatDate(planFinishTime,'yyyy-MM-dd hh:mm:ss') this.addForm.tagIds=this.procdef.tagIds; this.addForm.tagNames=this.procdef.tagNames; this.addForm.mainQx=this.procdef.mainQx; diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue index b346ee26..13d1781f 100644 --- a/src/views/mdp/workflow/ru/task/TaskMng.vue +++ b/src/views/mdp/workflow/ru/task/TaskMng.vue @@ -292,11 +292,11 @@ categoryTreeNodes: [], tags: [], startTimeRanger: [ - util.formatDate.format(fromStartTime, "yyyy-MM-dd"), - util.formatDate.format(toStartTime, "yyyy-MM-dd") + util.formatDate(fromStartTime, "yyyy-MM-dd"), + util.formatDate(toStartTime, "yyyy-MM-dd") ], planFinishTimeRanger: [], - calendarDate: util.formatDate.format(toStartTime, 'yyyy-MM-dd'), + calendarDate: util.formatDate(toStartTime, 'yyyy-MM-dd'), }, pickerOptions: { shortcuts: [{ @@ -1153,7 +1153,7 @@ var tags = []; var now = new Date(); - var dateStr = util.formatDate.format(now, "yyyy-MM-dd"); + var dateStr = util.formatDate(now, "yyyy-MM-dd"); if (dateStr == data.day) { data.isSelected = true; } diff --git a/src/views/xm/core/xmPhase/XmPhaseAdd.vue b/src/views/xm/core/xmPhase/XmPhaseAdd.vue index f481f1fb..b59446e7 100644 --- a/src/views/xm/core/xmPhase/XmPhaseAdd.vue +++ b/src/views/xm/core/xmPhase/XmPhaseAdd.vue @@ -218,8 +218,8 @@ id:'',name:'',remark:'',parentPhaseId:'',branchId:'',taskType:'kf',planType:'m1',projectId:'',beginDate:'',endDate:'',budgetHours:'',budgetStaffNu:'',ctime:'',budgetNouserAt:'',budgetIuserAt:'',budgetOuserAt:'',baselineId:'',bizProcInstId:'',bizFlowState:'',budgetWorkload:'',totalActWorkload:'',totalActNouserAt:'',totalActInerUserAt:'',totalActOuserAt:'',planType:'',taskType:'',seqNo:'1',budgetIuserCnt:'',budgetOuserCnt:'',budgetIuserPrice:80,budgetOuserPrice:100,budgetIuserWorkload:0,budgetOuserWorkload:0,ntype:'0' }, dateRanger: [ - util.formatDate.format(beginDate, "yyyy-MM-dd HH:mm:ss"), - util.formatDate.format(endDate, "yyyy-MM-dd HH:mm:ss") + util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"), + util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss") ], /**begin 在下面加自定义属性,记得补上面的一个逗号**/ pickerOptions: util.pickerOptions('datarange'), diff --git a/src/views/xm/core/xmPhase/XmPhaseBatch.vue b/src/views/xm/core/xmPhase/XmPhaseBatch.vue index f541b982..0969f28a 100644 --- a/src/views/xm/core/xmPhase/XmPhaseBatch.vue +++ b/src/views/xm/core/xmPhase/XmPhaseBatch.vue @@ -781,9 +781,9 @@ export default { var beginDate = new Date(); const endDate = new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 * 4); //两周后 - i.ctime = util.formatDate.format(ctime, "yyyy-MM-dd HH:mm:ss"); - i.beginDate = util.formatDate.format(beginDate, "yyyy-MM-dd HH:mm:ss"); - i.endDate = util.formatDate.format(endDate, "yyyy-MM-dd HH:mm:ss"); + i.ctime = util.formatDate(ctime, "yyyy-MM-dd HH:mm:ss"); + i.beginDate = util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"); + i.endDate = util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss"); }); batchImportFromTemplate(phaseTemplates2) .then((res) => { @@ -1669,12 +1669,12 @@ export default { var beginDate = new Date(); const endDate = new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 * 4); //两周后 - subRow.ctime = util.formatDate.format(ctime, "yyyy-MM-dd HH:mm:ss"); - subRow.beginDate = util.formatDate.format( + subRow.ctime = util.formatDate(ctime, "yyyy-MM-dd HH:mm:ss"); + subRow.beginDate = util.formatDate( beginDate, "yyyy-MM-dd HH:mm:ss" ); - subRow.endDate = util.formatDate.format(endDate, "yyyy-MM-dd HH:mm:ss"); + subRow.endDate = util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss"); this.fieldChange(subRow, "seqNo"); this.xmPhases.unshift(subRow); diff --git a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue index 519120ee..9f684778 100644 --- a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue +++ b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue @@ -538,9 +538,9 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; var beginDate=new Date(); const endDate=new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 *4);//两周后 - i.ctime=util.formatDate.format(ctime,'yyyy-MM-dd HH:mm:ss') - i.beginDate=util.formatDate.format(beginDate,'yyyy-MM-dd HH:mm:ss') - i.endDate=util.formatDate.format(endDate,'yyyy-MM-dd HH:mm:ss') + i.ctime=util.formatDate(ctime,'yyyy-MM-dd HH:mm:ss') + i.beginDate=util.formatDate(beginDate,'yyyy-MM-dd HH:mm:ss') + i.endDate=util.formatDate(endDate,'yyyy-MM-dd HH:mm:ss') }); batchImportFromTemplate(phaseTemplates2).then(res=>{ this.phaseTemplateVisible=false; @@ -1182,9 +1182,9 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; var beginDate=new Date(); const endDate=new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 *4);//两周后 - subRow.ctime=util.formatDate.format(ctime,'yyyy-MM-dd HH:mm:ss') - subRow.beginDate=util.formatDate.format(beginDate,'yyyy-MM-dd HH:mm:ss') - subRow.endDate=util.formatDate.format(endDate,'yyyy-MM-dd HH:mm:ss') + subRow.ctime=util.formatDate(ctime,'yyyy-MM-dd HH:mm:ss') + subRow.beginDate=util.formatDate(beginDate,'yyyy-MM-dd HH:mm:ss') + subRow.endDate=util.formatDate(endDate,'yyyy-MM-dd HH:mm:ss') this.fieldChange(subRow,'seqNo'); this.xmPhases.unshift(subRow); diff --git a/src/views/xm/core/xmPhase/XmPhaseMng.vue b/src/views/xm/core/xmPhase/XmPhaseMng.vue index 258f9f44..5a78fbd4 100644 --- a/src/views/xm/core/xmPhase/XmPhaseMng.vue +++ b/src/views/xm/core/xmPhase/XmPhaseMng.vue @@ -573,9 +573,9 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; var beginDate=new Date(); const endDate=new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 *4);//两周后 - i.ctime=util.formatDate.format(ctime,'yyyy-MM-dd HH:mm:ss') - i.beginDate=util.formatDate.format(beginDate,'yyyy-MM-dd HH:mm:ss') - i.endDate=util.formatDate.format(endDate,'yyyy-MM-dd HH:mm:ss') + i.ctime=util.formatDate(ctime,'yyyy-MM-dd HH:mm:ss') + i.beginDate=util.formatDate(beginDate,'yyyy-MM-dd HH:mm:ss') + i.endDate=util.formatDate(endDate,'yyyy-MM-dd HH:mm:ss') }); batchImportFromTemplate(phaseTemplates2).then(res=>{ this.phaseTemplateVisible=false; @@ -1217,9 +1217,9 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; var beginDate=new Date(); const endDate=new Date(); endDate.setTime(ctime.getTime() + 3600 * 1000 * 24 * 7 *4);//两周后 - subRow.ctime=util.formatDate.format(ctime,'yyyy-MM-dd HH:mm:ss') - subRow.beginDate=util.formatDate.format(beginDate,'yyyy-MM-dd HH:mm:ss') - subRow.endDate=util.formatDate.format(endDate,'yyyy-MM-dd HH:mm:ss') + subRow.ctime=util.formatDate(ctime,'yyyy-MM-dd HH:mm:ss') + subRow.beginDate=util.formatDate(beginDate,'yyyy-MM-dd HH:mm:ss') + subRow.endDate=util.formatDate(endDate,'yyyy-MM-dd HH:mm:ss') this.fieldChange(subRow,'seqNo'); this.xmPhases.unshift(subRow); diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 67ab499a..bf17bdd4 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -377,8 +377,8 @@ groupUserSelectVisible:false, execGroupUserSelectVisible:false, budgetDateRanger: [ - util.formatDate.format(beginDate, "yyyy-MM-dd HH:mm:ss"), - util.formatDate.format(endDate, "yyyy-MM-dd HH:mm:ss") + util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"), + util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss") ], actDateRanger: [ ], diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index bbb04686..3d410c18 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -357,8 +357,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; groupUserSelectVisible:false, execGroupUserSelectVisible:false, budgetDateRanger: [ - util.formatDate.format(beginDate, "yyyy-MM-dd HH:mm:ss"), - util.formatDate.format(endDate, "yyyy-MM-dd HH:mm:ss") + util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"), + util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss") ], actDateRanger: [ ], diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 4aa68477..5b4ba2ae 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1754,12 +1754,12 @@ export default { var startTime = new Date(); const endTime = new Date(); endTime.setTime(startTime.getTime() + 3600 * 1000 * 24 * 7 * 2); //两周后 - i.createTime = util.formatDate.format( + i.createTime = util.formatDate( createTime, "yyyy-MM-dd HH:mm:ss" ); - i.startTime = util.formatDate.format(startTime, "yyyy-MM-dd HH:mm:ss"); - i.endTime = util.formatDate.format(endTime, "yyyy-MM-dd HH:mm:ss"); + i.startTime = util.formatDate(startTime, "yyyy-MM-dd HH:mm:ss"); + i.endTime = util.formatDate(endTime, "yyyy-MM-dd HH:mm:ss"); }); var params={ xmTasks:taskTemplates2,