Commit c9950444 authored by renjintao's avatar renjintao

zhcn record task

parent e39a3209
...@@ -1863,6 +1863,7 @@ export default { ...@@ -1863,6 +1863,7 @@ export default {
plansToEndTime: '计划结束时间', plansToEndTime: '计划结束时间',
completePercentage: '完成百分比', completePercentage: '完成百分比',
upTaskId: '上级任务Id', upTaskId: '上级任务Id',
workHour:'工时'
}, },
//工资记录 //工资记录
project_plan_record: { project_plan_record: {
......
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :data="recordList" :easy="false" :set="false"><template slot="easySearch"> <DataGrid :columns="columns" ref="grid" :data="recordList" :easy="false" :set="false" :height="400"><template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" /> </FormItem> <FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" /> </FormItem>
<FormItem><Button type="primary" @click="search">查询</Button></FormItem> <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
...@@ -51,8 +51,9 @@ export default { ...@@ -51,8 +51,9 @@ export default {
columns: [{ columns: [{
key: "workHour", key: "workHour",
title: this.l("workHour"), title: this.l("workHour"),
align: "left", align: "right",
high: true high: true,
width: 120,
}, },
{ {
key: "title", key: "title",
...@@ -61,6 +62,22 @@ export default { ...@@ -61,6 +62,22 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{
key: "attachment",
title: this.l("attachment"),
align: "center",
high: true,
render: (h, params) => {
return h(
"a", {
on: {
click: () => this.viewFiles(params.row)
},
},
"查看附件"
);
},
},
{ {
title: '操作', title: '操作',
key: 'action', key: 'action',
...@@ -171,6 +188,14 @@ export default { ...@@ -171,6 +188,14 @@ export default {
} }
}) })
}, },
viewFiles(row) {
if (row.attachment) {
this.parms.eid = row.attachment;
this.modal1 = true;
} else {
this.$Message.error("暂没上传附件");
}
},
cancel() { cancel() {
this.curId = 0; this.curId = 0;
this.modal = false this.modal = false
......
...@@ -201,8 +201,8 @@ export default { ...@@ -201,8 +201,8 @@ export default {
high: true, high: true,
}, },
{ {
key: "endDate", key: "workHour",
title: '工时', title: this.l("workHour"),
align: "center", align: "center",
high: true, high: true,
render: (h, params) => { render: (h, params) => {
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
on: { on: {
click: () => this.viewWork(params.row.id) click: () => this.viewWork(params.row.id)
} }
}, params.row.title) }, params.row.workHour)
} }
}, },
{ {
...@@ -465,7 +465,7 @@ export default { ...@@ -465,7 +465,7 @@ export default {
viewWork(id) { viewWork(id) {
this.curId = id; this.curId = id;
this.title = "查看工时"; this.title = "查看工时";
this.fullScreen = true; this.fullScreen = false;
this.detail = () => import('../record') this.detail = () => import('../record')
this.modal = true; this.modal = true;
}, },
......
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