end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 4 years ago
parent
555d43cd77
commit
b9ae858bbd
12 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/mdp/form/formData/FormDataMng.vue
  2. 4
      src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
  3. 6
      src/views/mdp/workflow/ru/execution/ExecutionMng.vue
  4. 4
      src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
  5. 8
      src/views/mdp/workflow/ru/task/TaskMng.vue
  6. 4
      src/views/xm/core/xmPhase/XmPhaseAdd.vue
  7. 12
      src/views/xm/core/xmPhase/XmPhaseBatch.vue
  8. 12
      src/views/xm/core/xmPhase/XmPhaseForProduct.vue
  9. 12
      src/views/xm/core/xmPhase/XmPhaseMng.vue
  10. 4
      src/views/xm/core/xmTask/XmTaskAdd.vue
  11. 4
      src/views/xm/core/xmTask/XmTaskEdit.vue
  12. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

4
src/views/mdp/form/formData/FormDataMng.vue
View File

@ -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);

4
src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
View File

@ -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: [],

6
src/views/mdp/workflow/ru/execution/ExecutionMng.vue
View File

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

4
src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
View File

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

8
src/views/mdp/workflow/ru/task/TaskMng.vue
View File

@ -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;
}

4
src/views/xm/core/xmPhase/XmPhaseAdd.vue
View File

@ -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'),

12
src/views/xm/core/xmPhase/XmPhaseBatch.vue
View File

@ -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);

12
src/views/xm/core/xmPhase/XmPhaseForProduct.vue
View File

@ -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);

12
src/views/xm/core/xmPhase/XmPhaseMng.vue
View File

@ -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);

4
src/views/xm/core/xmTask/XmTaskAdd.vue
View File

@ -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: [
],

4
src/views/xm/core/xmTask/XmTaskEdit.vue
View File

@ -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: [
],

6
src/views/xm/core/xmTask/XmTaskMng.vue
View File

@ -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,

Write Preview
Loading…
Cancel
Save