Skip to content

M
mes-ui
Commit c0f407af authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents 6cb51e63 b87acec3
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 28 deletions
pages/project/task/add.vue
View file @ c0f407af
......@@ -53,8 +53,8 @@ export default {
userIds: "",
userId: "",
note: "",
planstartdate: null,
planenddate: null,
plansToStartDate: null,
plansToEndTime: null,
},
rules: {
name: [{
......@@ -117,8 +117,8 @@ export default {
});
},
changeFormat(val) {
this.entity.planstartdate = val[0];
this.entity.planenddate = val[1];
this.entity.plansToStartDate = val[0];
this.entity.plansToEndTime = val[1];
},
handleImg(e) {
console.warn(e)
......
pages/project/task/detail.vue
View file @ c0f407af
......@@ -12,7 +12,7 @@
<User :value="parseInt(entity.userId)"></User>
</Filed>
<Filed :span="12" name="计划起止日期">
<TimeDifference :timeValue="timeValuePlan" :work="1"></TimeDifference>
<TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference>
</Filed>
<Filed :span="12" name="实际起止日期">
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
......@@ -42,8 +42,8 @@ export default {
endDate: "",
},
timeValuePlan: {
planStartDate: "",
planEndDate: "",
startDate: "",
endDate: "",
},
rules: {
name: [{
......@@ -80,8 +80,8 @@ export default {
endDate: r.result.endDate,
},
this.timeValuePlan = {
planStartDate: r.result.planStartDate,
planEndDate: r.result.planEndDate,
startDate: r.result.plansToStartDate,
endDate: r.result.plansToEndTime,
},
this.$emit('on-load')
// this.curId = v
......
pages/project/task/index.vue
View file @ c0f407af
......@@ -198,10 +198,10 @@ export default {
return h('TimeDifference', {
props: {
timeValue: {
startDate: params.row.planstartdate,
endDate: params.row.planenddate,
startDate: params.row.plansToStartDate,
endDate: params.row.plansToEndTime,
},
work: 1
work: 0
}
})
}
......@@ -276,30 +276,18 @@ export default {
oprate: "edit",
title: params.row.status == 0 ? "开始" : params.row.status == 2 ? "继续" : '',
disable: params.row.status
//disable: (params.row.status == 0 || params.row.status == 2) ? false : true
},
on: {
click: () => this.updatepart(params.row.id, 1)
}
}),
// h('op', {
// attrs: {
// icon: "ios-pause",
// type: "icon",
// title: "暂停",
// //disable: params.row.status == 1 ? false : true
// },
// on: {
// click: () => this.updatepart(params.row.id, 2)
// }
// }),
h('op', {
attrs: {
icon: "ios-alarm",
type: "icon",
oprate: "edit",
title: "完成",
//disable: (params.row.status != 0 && params.row.status != 3) ? false : true
disable: params.row.status == 1 ? 0 : 1
},
on: {
click: () => this.updatepart(params.row.id, 2)
......@@ -312,7 +300,6 @@ export default {
oprate: "add",
title: "新增记录",
disable: params.row.status == 1 ? 0 : 1
// disable: (params.row.status != 3 && params.row.status != 4) ? false : true
},
on: {
click: () => this.addRecord(params.row.id)
......@@ -325,7 +312,6 @@ export default {
oprate: "edit",
title: "修改",
disable: params.row.status
//disable: (params.row.status == 0 || params.row.status == 2) ? false : true
},
on: {
click: () => this.edit(params.row.id)
......@@ -338,7 +324,6 @@ export default {
title: "删除",
oprate: 'delete',
disable: params.row.status
// disable: (params.row.status == 0 || params.row.status == 3) ? false : true
},
on: {
click: () => this.remove(params.row.id)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment