Skip to content

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

group

parent 4484b7e6
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 183 deletions
i18n/locale/zh-CN.js
View file @ 6c715b6b
...@@ -1893,6 +1893,7 @@ export default { ...@@ -1893,6 +1893,7 @@ export default {
projectId: '项目id', projectId: '项目id',
planId: '计划id', planId: '计划id',
title: '名称', title: '名称',
content:'备注信息'
}, },
project_group_user: { project_group_user: {
creationTime: '创建时间', creationTime: '创建时间',
......
pages/project/group/add.vue
View file @ 6c715b6b
...@@ -2,52 +2,11 @@ ...@@ -2,52 +2,11 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime"> <FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<InputNumber v-model="entity.isDeleted"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="24">
<FormItem :label="l('planId')" prop="planId"> <FormItem :label="l('content')" prop="content"> <Input v-model="entity.content"> </Input>
<InputNumber v-model="entity.planId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -58,7 +17,6 @@ ...@@ -58,7 +17,6 @@
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from './api'
export default { export default {
...@@ -74,12 +32,13 @@ export default { ...@@ -74,12 +32,13 @@ export default {
isDeleted: null, isDeleted: null,
deletionTime: null, deletionTime: null,
deleterUserId: null, deleterUserId: null,
projectId: null, projectId: '',
planId: null, planId: '',
title: "" title: "",
content: ''
}, },
rules: { rules: {
name: [{ title: [{
required: true, required: true,
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur'
...@@ -89,10 +48,10 @@ export default { ...@@ -89,10 +48,10 @@ export default {
}, },
props: { props: {
v: Object, v: Object,
eid: Number eid: String
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid != '' && this.eid != null) {
this.load(this.eid); this.load(this.eid);
} }
}, },
...@@ -138,7 +97,7 @@ export default { ...@@ -138,7 +97,7 @@ export default {
this.entity = this.$u.clone(this.v) this.entity = this.$u.clone(this.v)
}, },
eid(v) { eid(v) {
if (v > 0) { if (v != '') {
this.load(v); this.load(v);
} }
} }
......
pages/project/group/detail.vue
View file @ 6c715b6b
<template> <template>
<div class="detail"> <div class="detail" style="width:100%;">
<Row> <Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
<Filed :span="12" :name="l('projectId')">{{entity.projectId}}</Filed>
<Filed :span="12" :name="l('planId')">{{entity.planId}}</Filed>
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> <Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="12" :name="l('content')">{{entity.content}}</Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
</Row> </Row>
</div> </div>
...@@ -24,25 +19,13 @@ export default { ...@@ -24,25 +19,13 @@ export default {
data() { data() {
return { return {
entity: {}, entity: {},
rules: {
name: [{
required: true,
message: '必填',
trigger: 'blur'
}],
code: [{
required: true,
message: '必填',
trigger: 'blur'
}]
}
} }
}, },
props: { props: {
eid: Number eid: String
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid != '' && this.eid != null) {
this.load(this.eid); this.load(this.eid);
} }
}, },
...@@ -65,7 +48,7 @@ export default { ...@@ -65,7 +48,7 @@ export default {
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v > 0) { if (v != '' && v != null) {
this.load(v); this.load(v);
} }
} }
......
pages/project/group/edit.vue
View file @ 6c715b6b
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime"> <FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<InputNumber v-model="entity.isDeleted"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('planId')" prop="planId">
<InputNumber v-model="entity.planId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="24">
<FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input> <FormItem :label="l('content')" prop="content"> <Input v-model="entity.content"> </Input>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -67,7 +27,7 @@ export default { ...@@ -67,7 +27,7 @@ export default {
disabled: false, disabled: false,
entity: {}, entity: {},
rules: { rules: {
name: [{ title: [{
required: true, required: true,
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur'
...@@ -76,10 +36,10 @@ export default { ...@@ -76,10 +36,10 @@ export default {
} }
}, },
props: { props: {
eid: Number eid: String
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid != '' && this.eid != null) {
this.load(this.eid); this.load(this.eid);
} }
}, },
...@@ -121,7 +81,7 @@ export default { ...@@ -121,7 +81,7 @@ export default {
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != '' && v != null) {
this.load(v); this.load(v);
} }
} }
......
pages/project/group/index.vue
View file @ 6c715b6b
...@@ -46,72 +46,31 @@ export default { ...@@ -46,72 +46,31 @@ export default {
detail: null, detail: null,
curId: 0, curId: 0,
columns: [{ columns: [{
key: "id", key: "title",
title: this.$t("id"), title: this.l("title"),
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", align: "left",
easy: true,
high: true high: true
}, },
{ {
key: "projectId", key: "content",
title: this.l("projectId"), title: this.l("content"),
align: "left", align: "left",
easy: true,
high: true high: true
}, },
{ {
key: "planId", key: "creationTime",
title: this.l("planId"), title: this.l("creationTime"),
align: "left", align: "center",
high: true high: true
}, },
{ {
key: "title", key: "creatorUserId",
title: this.l("title"), title: this.l("creatorUserId"),
align: "left", align: "left",
easy: true, high: true,
high: true type: 'user'
}, },
{ {
title: '操作', title: '操作',
......
pages/project/groupUser/detail.vue
View file @ 6c715b6b
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<Row> <Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> <Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
......
pages/project/record/detail.vue
View file @ 6c715b6b
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<Row> <Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> <Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
......
pages/project/task/detail.vue
View file @ 6c715b6b
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div class="detail"> <div class="detail">
<Row style="height:180px"> <Row style="height:180px">
<Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="6" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="6" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
<Filed :span="6" :name="l('title')">{{entity.title}}</Filed> <Filed :span="6" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="6" :name="l('level')">{{entity.level}}</Filed> <Filed :span="6" :name="l('level')">{{entity.level}}</Filed>
<Filed :span="6" :name="l('status')">{{entity.status}}</Filed> <Filed :span="6" :name="l('status')">{{entity.status}}</Filed>
......
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