Skip to content

M
mes-ui
Commit 476b1917 authored by renjintao's avatar renjintao
Browse files
Options

recordtimeline task

parent b87acec3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 52 deletions
pages/project/record/recordTimeLine.vue 0 → 100644
View file @ 476b1917
This diff is collapsed.
pages/project/task/add.vue
View file @ 476b1917
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="计划开始结束时间" prop="date"> <FormItem label="计划起止日期" prop="date">
<DatePicker type="datetimerange" format="yyyy-MM-dd" v-model="date" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker> <DatePicker type="datetimerange" format="yyyy-MM-dd" v-model="date" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
......
pages/project/task/detail.vue
View file @ 476b1917
<template> <template>
<div class="detail" style="width:100%"> <div class="detail" style="width:100%;overflow:auto">
<Row style="height:284px"> <div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left">
<Filed :span="6" :name="l('title')">{{entity.title}}</Filed> <Row style="height:284px">
<Filed :span="6" :name="l('level')"> <Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
<state code="project.task.level" :value="entity.level" type="text"></state> <Filed :span="12" :name="l('level')">
</Filed> <state code="project.task.level" :value="entity.level" type="text"></state>
<Filed :span="6" :name="l('status')"> </Filed>
<state code="project.task.status" :value="entity.status" type="text"></state> <Filed :span="12" :name="l('status')">
</Filed> <state code="project.task.status" :value="entity.status" type="text"></state>
<Filed :span="6" :name="l('userId')"> </Filed>
<User :value="parseInt(entity.userId)"></User> <Filed :span="12" :name="l('userId')">
</Filed> <User :value="parseInt(entity.userId)"></User>
<Filed :span="12" name="计划起止日期"> </Filed>
<TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference> <Filed :span="12" name="计划起止日期">
</Filed> <TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference>
<Filed :span="12" name="实际起止日期"> </Filed>
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference> <Filed :span="12" name="实际起止日期">
</Filed> <TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
</Filed>
<Filed :span="24" :name="l('note')"> <Filed :span="24" :name="l('note')">
<div style="height:200px" v-html="entity.note" class="tex_in10"></div> <div style="height:200px" v-html="entity.note" class="tex_in10"></div>
</Filed> </Filed>
<Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="6" :name="l('creatorUserId')"> <Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User> <User :value="entity.creatorUserId"></User>
</Filed> </Filed>
</Row> </Row>
<component :is="detail" :eid="curId" v-if="false" /> </div>
<div class="rightDiv" :style="{height:divHeight}">
<component :is="detail" :eid="curId" />
</div>
<FooterToolbar class="ftball">
<div class="tip"><Button type="primary" @click="updatepart(2)">完成</Button><Button type="primary" @click="updatepart(3)">冻结</Button><Button @click="handleClose">取消</Button></div>
</FooterToolbar>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from './api'
import ApiTask from '../task/api'
export default { export default {
name: 'Add', name: 'Add',
data() { data() {
...@@ -45,6 +54,7 @@ export default { ...@@ -45,6 +54,7 @@ export default {
startDate: "", startDate: "",
endDate: "", endDate: "",
}, },
divHeight: '200px',
rules: { rules: {
name: [{ name: [{
required: true, required: true,
...@@ -64,10 +74,18 @@ export default { ...@@ -64,10 +74,18 @@ export default {
props: { props: {
eid: String eid: String
}, },
created() {
this.divHeight = window.innerHeight - 150 + 'px'
},
mounted() { mounted() {
if (this.eid != '' && this.eid != null) { if (this.eid != '' && this.eid != null) {
this.load(this.eid); this.load(this.eid);
} }
window.onresize = () => {
return (() => {
this.divHeight = window.innerHeight - 150 + 'px'
})()
}
}, },
methods: { methods: {
load(v) { load(v) {
...@@ -84,11 +102,35 @@ export default { ...@@ -84,11 +102,35 @@ export default {
endDate: r.result.plansToEndTime, endDate: r.result.plansToEndTime,
}, },
this.$emit('on-load') this.$emit('on-load')
// this.curId = v this.curId = v
//this.detail = () => import('../record/index1') this.detail = () => import('../record/recordTimeLine')
}) })
}, },
updatepart(valStatus) {
let params = {
id: this.eid,
status: valStatus
}
if (valStatus == 1) {
params.startDate = ''
}
if (valStatus == 2) {
params.endDate = ''
}
ApiTask.updatepart(params).then(r => {
if (r.success) {
this.$Message.success('操作成功')
this.$emit('on-ok')
} else {
this.$Message.error('操作失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('操作失败')
console.warn(err)
})
},
handleClose() { handleClose() {
this.$emit('on-close') this.$emit('on-close')
}, },
...@@ -112,4 +154,11 @@ export default { ...@@ -112,4 +154,11 @@ export default {
text-indent: 12px; text-indent: 12px;
text-align: inherit !important; text-align: inherit !important;
} }
.rightDiv {
width: 18%;
float: left;
padding-left: 50px;
}
</style> </style>
pages/project/task/index.vue
View file @ 476b1917
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
oprate: 'detail' oprate: 'detail'
}, },
on: { on: {
click: () => this.viewRecord(params.row.id) click: () => this.viewRecord(params.row.id, params.row.status)
} }
}, params.row.title) }, params.row.title)
} }
...@@ -155,29 +155,15 @@ export default { ...@@ -155,29 +155,15 @@ export default {
title: this.l("level"), title: this.l("level"),
align: "center", align: "center",
high: true, high: true,
width: 80,
code: 'project.task.level' code: 'project.task.level'
}, },
{
key: "projectTitle",
title: this.l("projectTitle"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "planTitle",
title: this.l("planTitle"),
align: "left",
easy: true,
high: true,
hide: true,
},
{ {
key: "status", key: "status",
title: this.l("status"), title: this.l("status"),
align: "center", align: "center",
high: true, high: true,
width: 120,
code: 'project.task.status' code: 'project.task.status'
}, },
...@@ -193,7 +179,7 @@ export default { ...@@ -193,7 +179,7 @@ export default {
title: '计划起止日期', title: '计划起止日期',
align: "center", align: "center",
high: true, high: true,
width: 400, width: 200,
render: (h, params) => { render: (h, params) => {
return h('TimeDifference', { return h('TimeDifference', {
props: { props: {
...@@ -211,7 +197,7 @@ export default { ...@@ -211,7 +197,7 @@ export default {
title: '实际起止日期', title: '实际起止日期',
align: "center", align: "center",
high: true, high: true,
width: 400, width: 200,
render: (h, params) => { render: (h, params) => {
return h('TimeDifference', { return h('TimeDifference', {
props: { props: {
...@@ -227,8 +213,9 @@ export default { ...@@ -227,8 +213,9 @@ export default {
{ {
key: "workHour", key: "workHour",
title: this.l("workHour"), title: this.l("workHour"),
align: "center", align: "right",
high: true, high: true,
width: 80,
render: (h, params) => { render: (h, params) => {
return h('a', { return h('a', {
attrs: { attrs: {
...@@ -257,8 +244,9 @@ export default { ...@@ -257,8 +244,9 @@ export default {
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
align: "left", align: "center",
high: true, high: true,
width: 150,
}, },
{ {
title: '操作', title: '操作',
...@@ -472,8 +460,9 @@ export default { ...@@ -472,8 +460,9 @@ export default {
onSelect(val) { onSelect(val) {
this.$refs.grid.reload(this.easySearch) this.$refs.grid.reload(this.easySearch)
}, },
viewRecord(id) { viewRecord(id, status) {
this.curId = id; this.curId = id;
this.tastkStatus = status;
this.title = "查看记录"; this.title = "查看记录";
this.fullScreen = true; this.fullScreen = true;
this.detail = () => import('./detail') this.detail = () => import('./detail')
......
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