Commit f6fd91ba authored by renjintao's avatar renjintao

import

parent 4a885c47
...@@ -1665,7 +1665,7 @@ export default { ...@@ -1665,7 +1665,7 @@ export default {
creatorUserId:'创建人', creatorUserId:'创建人',
lastModificationTime:'更新时间', lastModificationTime:'更新时间',
lastModifierUserId:'更新人', lastModifierUserId:'更新人',
isDeleted:'删除人', isDeleted:'是否删除',
deletionTime:'删除时间', deletionTime:'删除时间',
deleterUserId:'删除人', deleterUserId:'删除人',
creator:'上传人', creator:'上传人',
......
<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">
<FormItem :label="l('creationTime')" prop="creationTime">
<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('creator')" prop="creator">
<Input v-model="entity.creator"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifier')" prop="lastModifier">
<Input v-model="entity.lastModifier"></Input>
</FormItem>
</Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input> <Input v-model="entity.name"></Input>
...@@ -56,11 +12,6 @@ ...@@ -56,11 +12,6 @@
<Input v-model="entity.file" type="textarea" :rows="5"></Input> <Input v-model="entity.file" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="mes.import_center.Status" v-model="entity.status"></Dictionary>
</FormItem>
</Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('remark')" prop="remark"> <FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
...@@ -81,18 +32,8 @@ export default { ...@@ -81,18 +32,8 @@ export default {
return { return {
disabled: false, disabled: false,
entity: { entity: {
creationTime: null,
creatorUserId: null,
lastModificationTime: null,
lastModifierUserId: null,
isDeleted: null,
deletionTime: null,
deleterUserId: null,
creator: "",
lastModifier: "",
name: "", name: "",
file: "", file: "",
status: null,
remark: "", remark: "",
}, },
rules: { rules: {
......
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('file')">{{entity.file}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
<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')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
...@@ -10,10 +15,6 @@ ...@@ -10,10 +15,6 @@
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> <Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
<Filed :span="12" :name="l('creator')">{{entity.creator}}</Filed> <Filed :span="12" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('lastModifier')">{{entity.lastModifier}}</Filed> <Filed :span="12" :name="l('lastModifier')">{{entity.lastModifier}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="24" :name="l('file')">{{entity.file}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row> </Row>
</div> </div>
</template> </template>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" /> <Input placeholder="请输入名称查询" v-model="easySearch.keys.value" />
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -61,25 +61,27 @@ export default { ...@@ -61,25 +61,27 @@ export default {
easy: true, easy: true,
high: true, high: true,
}, },
{ {
key: "creationTime", key: "file",
title: this.l("creationTime"), title: this.l("file"),
align: "left", align: "left",
easy: true,
high: true, high: true,
}, },
{ {
key: "status", key: "creationTime",
title: this.l("status"), title: this.l("creationTime"),
align: "left", align: "center",
width:"180",
high: true, high: true,
code: "mes.import_center.Status",
}, },
{ {
key: "creatorUserId", key: "creatorUserId",
title: this.l("creatorUserId"), title: this.l("creatorUserId"),
align: "left", align: "left",
high: true, high: true,
type:"user" type:"user",
width:"180",
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
...@@ -124,6 +126,14 @@ export default { ...@@ -124,6 +126,14 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: "mes.import_center.Status",
width:"150",
},
{ {
title: "操作", title: "操作",
key: "action", key: "action",
......
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