Skip to content

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

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

parents b5e5fca5 4f5fe11f
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 107 deletions
pages/project/plan/index.vue
View file @ 3d6593b0
...@@ -96,12 +96,13 @@ export default { ...@@ -96,12 +96,13 @@ export default {
h( h(
"op", "op",
{ {
key: "type", attrs: { icon: "md-arrow-dropright-circle",
width: 90, type: "icon",
title: this.l("type"), title: "派发",
align: "left", oprate: "edit",
high: true, disable:params.row.status
code: "mes.project_plan.Type", },
on: { click: () => this.send(params.row.id) },
}, },
), ),
h( h(
...@@ -117,19 +118,15 @@ export default { ...@@ -117,19 +118,15 @@ export default {
h( h(
"op", "op",
{ {
key: "status", attrs: { icon: "md-create",
title: this.l("status"), type: "icon",
align: "left", title: "编辑",
high: true, oprate: "edit", },
code: "mes.project_plan.Status", on: { click: () => this.edit(params.row.id) },
}, }
{ ),
key: "startDate", h(
title: this.l("startDate"), "op",
align: "left",
high: true,
type: "date"
},
{ {
attrs: { icon: "ios-trash", attrs: { icon: "ios-trash",
type: "icon", type: "icon",
......
pages/project/project/detail.vue
View file @ 3d6593b0
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<span>|</span> <span>|</span>
</li> </li>
<li> <li>
<a @click="task"> <a @click="log">
<Icon type="md-create" />动态 <Icon type="md-create" />动态
</a> </a>
&nbsp; &nbsp;
...@@ -136,6 +136,10 @@ export default { ...@@ -136,6 +136,10 @@ export default {
group() { group() {
this.title = "项目成员"; this.title = "项目成员";
this.detail = () => import("../groupUser/index1"); this.detail = () => import("../groupUser/index1");
},
log() {
this.title = "项目动态";
this.detail = () => import("../record/index1");
}, },
l(key) { l(key) {
key = "project_main" + "." + key; key = "project_main" + "." + key;
......
pages/project/record/index.vue
View file @ 3d6593b0
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :action="action"><template slot="easySearch"> <DataGrid :columns="columns" ref="grid" :action="action" :easy="false"><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>
...@@ -32,6 +32,9 @@ export default { ...@@ -32,6 +32,9 @@ export default {
author: "henq", author: "henq",
description: "project_plan_record 10/20/2020 2:55:13 PM", description: "project_plan_record 10/20/2020 2:55:13 PM",
}, },
props: {
eid: String
},
data() { data() {
return { return {
action: Api.index, action: Api.index,
...@@ -46,79 +49,11 @@ export default { ...@@ -46,79 +49,11 @@ export default {
detail: null, detail: null,
curId: 0, curId: 0,
columns: [{ columns: [{
key: "id",
title: this.$t("id"),
hide: true,
align: "left",
high: true
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
high: true
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
high: true
},
{
key: "isDeleted",
title: this.l("isDeleted"),
align: "left",
high: true
},
{
key: "deletionTime",
title: this.l("deletionTime"),
align: "left",
high: true
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
align: "left",
high: true
},
{
key: "projectId",
title: this.l("projectId"),
align: "left",
high: true
},
{
key: "planId",
title: this.l("planId"),
align: "left",
high: true
},
{
key: "workHour", key: "workHour",
title: this.l("workHour"), title: this.l("workHour"),
align: "left", align: "left",
high: true high: true
}, },
{
key: "status",
title: this.l("status"),
align: "left",
high: true,
code: 'mes.project_plan_record.Status'
},
{ {
key: "title", key: "title",
title: this.l("title"), title: this.l("title"),
...@@ -126,24 +61,6 @@ export default { ...@@ -126,24 +61,6 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{
key: "note",
title: this.l("note"),
align: "left",
high: true
},
{
key: "attachment",
title: this.l("attachment"),
align: "left",
high: true
},
{
key: "taskId",
title: this.l("taskId"),
align: "left",
high: true
},
{ {
title: '操作', title: '操作',
key: 'action', key: 'action',
......
pages/project/task/index.vue
View file @ 3d6593b0
...@@ -198,6 +198,22 @@ export default { ...@@ -198,6 +198,22 @@ export default {
align: "center", align: "center",
high: true, high: true,
}, },
{
key: "endDate",
title: '工时',
align: "center",
high: true,
render: (h, params) => {
return h('a', {
attrs: {
oprate: 'detail'
},
on: {
click: () => this.viewWork(params.row.id)
}
}, params.row.title)
}
},
{ {
key: "note", key: "note",
title: this.l("note"), title: this.l("note"),
...@@ -441,6 +457,13 @@ export default { ...@@ -441,6 +457,13 @@ export default {
this.detail = () => import('./detail') this.detail = () => import('./detail')
this.modal = true; this.modal = true;
}, },
viewWork(id) {
this.curId = id;
this.title = "查看工时";
this.fullScreen = true;
this.detail = () => import('../record')
this.modal = true;
},
addRecord(id) { addRecord(id) {
this.curId = id; this.curId = id;
this.title = "新增记录"; this.title = "新增记录";
......
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