Skip to content

M
mes-ui
Commit 6aa70c58 authored by renjintao's avatar renjintao
Browse files
Options

recordTimeLinedetail task

parent f77606a9
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 43 deletions
pages/project/record/recordTimeLine.vue
View file @ 6aa70c58
...@@ -17,14 +17,13 @@ ...@@ -17,14 +17,13 @@
<p class="content"> <p class="content">
操作员：<User :value="item.creatorUserId"></User> 操作员：<User :value="item.creatorUserId"></User>
</p> </p>
<p class="content"> <p class="content" v-if="item.workHour&&item.workHour>0">
工时：{{item.workHour}} 工时：{{item.workHour}}
</p> </p>
<p class="content"> <p class="content">
标题：{{item.title}} 标题：{{item.title}}
</p> </p>
<p class="pl10" v-if="item.note"><a @click="view(item.id)">查看详细</a></p> <p class="pl10" v-if="item.note&&item.note.length>0"><a @click="view(item.id)">查看详细</a></p>
<p class="pl10" v-if="item.attachment"><a @click="viewFiles(item.attachment)">查看附件</a></p>
</TimelineItem> </TimelineItem>
</Timeline> </Timeline>
<p class="content" v-else>暂无数据</p> <p class="content" v-else>暂无数据</p>
......
pages/project/task/detail.vue
View file @ 6aa70c58
<template> <template>
<div class="detail" style="width:100%;overflow:auto"> <div style="width:100%;overflow:auto">
<div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left"> <div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left">
<Row style="height:284px"> <Form :model="bugForm" :label-width="5" ref="formValidate">
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> <Row>
<Filed :span="12" :name="l('level')"> <Col :span="8">
<state code="project.task.level" :value="entity.level" type="text"></state> <FormItem label>
</Filed> <span style="float:left">{{l('title')}}：&nbsp;</span>
<Filed :span="12" :name="l('status')"> {{entity.title}}
<state code="project.task.status" :value="entity.status" type="text"></state> </FormItem>
</Filed> </Col>
<Filed :span="12" :name="l('userId')"> <Col :span="8">
<User :value="parseInt(entity.userId)"></User> <FormItem label>
</Filed> <span style="float:left">{{l('level')}}：&nbsp;</span>
<Filed :span="12" name="计划起止日期"> <state code="project.task.level" :value="entity.level" type="text"></state>
<TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference> </FormItem>
</Filed> </Col>
<Filed :span="12" name="实际起止日期"> <Col :span="8">
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference> <FormItem label>
</Filed> <span style="float:left">{{l('status')}}：&nbsp;</span>
<state code="project.task.status" :value="entity.status" type="text"></state>
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">{{l('userId')}}：&nbsp;</span>
<User :value="parseInt(entity.userId)"></User>
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">计划起止日期：&nbsp;</span>
<TimeDifference :timeValue="timeValuePlan" :work="1"></TimeDifference>
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">实际起止日期：&nbsp;</span>
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
</FormItem>
</Col>
</Row>
<Row :gutter="24" index="">
<Col :span="24">
<FormItem label><span style="float:left">{{l('note')}}：&nbsp;</span>
<div style="height:200px;background:#fff;border:#c5c5c5 solid 1px;margin-left:50px;padding:10px;" v-html="entity.note" class="tex_in10"></div>
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">{{l('creationTime')}}：&nbsp;</span>
{{entity.creationTime}}
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">{{l('creatorUserId')}}：&nbsp;</span>
<User :value="entity.creatorUserId"></User>
</FormItem>
</Col>
</Row>
<Row :gutter="24">
<Col :span="8">
<FormItem label>
<span style="float:left">操作：&nbsp;</span>
<Dictionary code="project.task.status" v-model="entity.status" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem label>
<span style="float:left">工时：&nbsp;</span>
<InputNumber v-model="entity.workHour" :min="0"></InputNumber>
</FormItem>
</Col>
</Row>
</Form>
<Filed :span="24" :name="l('note')">
<div style="height:200px" v-html="entity.note" class="tex_in10"></div>
</Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
</Row>
</div> </div>
<div class="rightDiv" :style="{height:divHeight}"> <div class="rightDiv" :style="{height:divHeight}">
<component :is="detail" :eid="curId" /> <component :is="detail" :eid="curId" />
</div> </div>
<FooterToolbar class="ftball"> <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> <div class="tip"><Button type="primary" @click="updatepart(2)">确定</Button><Button @click="handleClose">取消</Button></div>
</FooterToolbar> </FooterToolbar>
</div> </div>
...@@ -94,16 +142,18 @@ export default { ...@@ -94,16 +142,18 @@ export default {
}).then(r => { }).then(r => {
this.entity = r.result; this.entity = r.result;
this.timeValue = { this.timeValue = {
startDate: r.result.startDate, startDate: r.result.startDate,
endDate: r.result.endDate, endDate: r.result.endDate,
}, };
this.timeValuePlan = { this.timeValuePlan = {
startDate: r.result.plansToStartDate, startDate: r.result.plansToStartDate,
endDate: r.result.plansToEndTime, endDate: r.result.plansToEndTime,
}, };
this.$emit('on-load') this.entity.status = 2;
this.curId = v this.entity.workHour = 0;
this.detail = () => import('../record/recordTimeLine') this.$emit('on-load');
this.curId = v;
this.detail = () => import('../record/recordTimeLine');
}) })
}, },
...@@ -151,7 +201,6 @@ export default { ...@@ -151,7 +201,6 @@ export default {
<style scoped> <style scoped>
.tex_in10 { .tex_in10 {
text-indent: 12px;
text-align: inherit !important; text-align: inherit !important;
} }
......
pages/project/task/index.vue
View file @ 6aa70c58
...@@ -274,11 +274,11 @@ export default { ...@@ -274,11 +274,11 @@ export default {
icon: "ios-alarm", icon: "ios-alarm",
type: "icon", type: "icon",
oprate: "edit", oprate: "edit",
title: "完成", title: "回报工作",
disable: params.row.status == 1 ? 0 : 1 disable: params.row.status == 1 ? 0 : 1
}, },
on: { on: {
click: () => this.updatepart(params.row.id, 2) click: () => this.viewRecord(params.row.id, params.row.status)
} }
}), }),
h('op', { h('op', {
......
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