Skip to content

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

importimport

parent c511ba38
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1724 additions and 1549 deletions
components/page/dataGrid.vue
View file @ e4fed9fa
<template> <template>
<div class="table-content"> <div class="table-content">
<div class="table-tools" v-if="tool"> <div class="table-tools" v-if="tool">
<div class="table-search"> <div class="table-search">
<slot name="easySearch" v-if="easy"> <slot name="easySearch" v-if="easy">
<Form inline> <Form inline>
<FormItem> <FormItem>
<Input <Input search enter-button :placeholder="placeholder" @on-search="easySearch" v-width="300" v-model="keys" />
search
enter-button
:placeholder="placeholder"
@on-search="easySearch"
v-width="300"
v-model="keys"
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button v-if="high" @click="modalSearch=true" type="text"> <Button v-if="high" @click="modalSearch=true" type="text">
...@@ -40,38 +33,11 @@ ...@@ -40,38 +33,11 @@
</slot> </slot>
</Col> </Col>
</Row> </Row>
<Table <Table v-else :border="border" :columns="columnsNow" :data="list" :height="tableHeight" :draggable="draggable" ref="table" class="tableCommon" @on-expand="expand" @on-drag-drop="onDragDrop" @on-selection-change="selectionChange" @on-select="onSelect" :row-key="rowKey"></Table>
v-else
:border="border"
:columns="columnsNow"
:data="list"
:height="tableHeight"
:draggable="draggable"
ref="table"
class="tableCommon"
@on-expand="expand"
@on-drag-drop="onDragDrop"
@on-selection-change="selectionChange"
@on-select="onSelect"
:row-key="rowKey"
></Table>
</div> </div>
<div class="table-footer"> <div class="table-footer">
<slot name="footer"></slot> <slot name="footer"></slot>
<Page <Page v-if="page" :total="search.total" :current="search.page" class="fr" show-total size="small" show-elevator show-sizer :page-size="search.pageSize" :page-size-opts="pageSizeOpts" @on-change="pageChange" @on-page-size-change="pageSizeChange" />
v-if="page"
:total="search.total"
:current="search.page"
class="fr"
show-total
size="small"
show-elevator
show-sizer
:page-size="search.pageSize"
:page-size-opts="pageSizeOpts"
@on-change="pageChange"
@on-page-size-change="pageSizeChange"
/>
</div> </div>
<Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search"> <Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search">
<slot name="searchForm"></slot> <slot name="searchForm"></slot>
...@@ -80,14 +46,7 @@ ...@@ -80,14 +46,7 @@
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button> <Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div> </div>
</Modal> </Modal>
<Drawer <Drawer title="列设置" v-if="set" v-model="config" :scrollable="true" placement="left" :mask="false">
title="列设置"
v-if="set"
v-model="config"
:scrollable="true"
placement="left"
:mask="false"
>
<div slot="header"> <div slot="header">
列设置 列设置
<a @click="undoConfig" class="ml50"> <a @click="undoConfig" class="ml50">
...@@ -95,11 +54,7 @@ ...@@ -95,11 +54,7 @@
</a> </a>
</div> </div>
<ul class="table-columns"> <ul class="table-columns">
<li <li v-for="(li,index) in columnsCur" :key="index" v-dragging="{ item: li, list: columnsCur, group: 'li' }">
v-for="(li,index) in columnsCur"
:key="index"
v-dragging="{ item: li, list: columnsCur, group: 'li' }"
>
<label @click="columnChange(li,index)" :class="{dis:li.hide}"> <label @click="columnChange(li,index)" :class="{dis:li.hide}">
<Icon :type="li.hide?'md-eye-off':'md-eye'" size="16" class="mr10" /> <Icon :type="li.hide?'md-eye-off':'md-eye'" size="16" class="mr10" />
<span>{{li.title}}</span> <span>{{li.title}}</span>
...@@ -113,7 +68,7 @@ ...@@ -113,7 +68,7 @@
<slot name="batch"></slot> <slot name="batch"></slot>
<Button @click="cancelBatch">取消</Button> <Button @click="cancelBatch">取消</Button>
</FooterToolbar> </FooterToolbar>
</div> </div>
</template> </template>
<script> <script>
...@@ -226,7 +181,11 @@ export default { ...@@ -226,7 +181,11 @@ export default {
type: Object, type: Object,
default: function () { default: function () {
return { return {
keys: { op: "name", value: "", default: true }, keys: {
op: "name",
value: "",
default: true
},
}; };
}, },
}, },
...@@ -342,8 +301,7 @@ export default { ...@@ -342,8 +301,7 @@ export default {
}, },
loadUserConfig() { loadUserConfig() {
var query = { var query = {
conditions: [ conditions: [{
{
fieldName: "creatorUserId", fieldName: "creatorUserId",
fieldValue: this.userId, fieldValue: this.userId,
conditionalType: "Equal", conditionalType: "Equal",
...@@ -561,13 +519,13 @@ export default { ...@@ -561,13 +519,13 @@ export default {
}, },
}, },
watch: { watch: {
"data.length"() { "data"() {
this.list = this.data; this.list = this.data;
}, },
height() { height() {
this.tableHeight = this.height; this.tableHeight = this.height;
}, },
"columns.length"() { "columns"() {
this.columns.forEach((u) => { this.columns.forEach((u) => {
if (!u.hide) { if (!u.hide) {
u.hide = false; u.hide = false;
...@@ -585,16 +543,20 @@ export default { ...@@ -585,16 +543,20 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.tip { .tip {
display: inline; display: inline;
} }
form { form {
display: inline-block; display: inline-block;
.ivu-form-item { .ivu-form-item {
margin: 0; margin: 0;
vertical-align: middle; vertical-align: middle;
} }
} }
.table-main { .table-main {
width: 100%; width: 100%;
text-align: left; text-align: left;
...@@ -602,66 +564,83 @@ export default { ...@@ -602,66 +564,83 @@ export default {
display: block; display: block;
overflow-y: auto; overflow-y: auto;
flex-grow: 1; flex-grow: 1;
tr td .ivu-table-cell { tr td .ivu-table-cell {
padding: 0 5px; padding: 0 5px;
} }
overflow-x: hidden; overflow-x: hidden;
} }
.table-tools { .table-tools {
display: flex; display: flex;
line-height: 50px; line-height: 50px;
.table-search { .table-search {
flex-grow: 1; flex-grow: 1;
} }
.btns { .btns {
min-width: 200px; min-width: 200px;
text-align: right; text-align: right;
} }
} }
.table-footer { .table-footer {
line-height: 45px; line-height: 45px;
} }
.ivu-footer-toolbar { .ivu-footer-toolbar {
text-align: left; text-align: left;
background: rgba(0, 0, 0, 0.7); background: rgba(0, 0, 0, 0.7);
color: #fff; color: #fff;
} }
} }
.table-columns { .table-columns {
max-height: calc(100% - 50px); max-height: calc(100% - 50px);
overflow: auto; overflow: auto;
li { li {
list-style: none; list-style: none;
line-height: 40px; line-height: 40px;
cursor: move; cursor: move;
border-bottom: 1px dotted #249e91; border-bottom: 1px dotted #249e91;
color: #249e91; color: #249e91;
span { span {
cursor: pointer; cursor: pointer;
} }
.mr10 { .mr10 {
cursor: pointer; cursor: pointer;
} }
.move { .move {
float: right; float: right;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
cursor: move; cursor: move;
} }
.dis { .dis {
color: #aaa; color: #aaa;
} }
} }
} }
.searchBack { .searchBack {
display: inline; display: inline;
margin-left: 20px; margin-left: 20px;
button { button {
margin-left: 10px; margin-left: 10px;
} }
a { a {
margin-left: 20px; margin-left: 20px;
color: #2680eb; color: #2680eb;
} }
a:hover { a:hover {
color: #249e91; color: #249e91;
} }
......
pages/import/add.vue
View file @ e4fed9fa
<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">
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script>
<script>
import Api from "./api"; import Api from "./api";
import InputExcel from "@/components/page/inputExcel.vue"; import InputExcel from "@/components/page/inputExcel.vue";
export default { export default {
...@@ -35,17 +36,25 @@ export default { ...@@ -35,17 +36,25 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
parms: "app=import&eid="+this.$u.guid()+"&name=excel", parms: "app=import&eid=" + this.$u.guid() + "&name=excel",
imgName: "", imgName: "",
entity: { entity: {
name: "", name: "",
file: "", file: "",
filePath:"", path: "",
remark: "", remark: "",
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
file:[{ required: true, message: "请上传文件", trigger: "change" }] required: true,
message: "必填",
trigger: "blur"
}],
file: [{
required: true,
message: "请上传文件",
trigger: "change"
}]
}, },
}; };
}, },
...@@ -85,7 +94,9 @@ export default { ...@@ -85,7 +94,9 @@ export default {
this.$emit("on-close"); this.$emit("on-close");
}, },
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({
id: v
}).then((r) => {
this.entity = r.result; this.entity = r.result;
this.entity.id = 0; this.entity.id = 0;
}); });
...@@ -103,8 +114,8 @@ export default { ...@@ -103,8 +114,8 @@ export default {
watch: { watch: {
imgName(newName, oldName) { imgName(newName, oldName) {
const imgPathsArr = JSON.parse(newName); const imgPathsArr = JSON.parse(newName);
this.entity.file=imgPathsArr[0].fileName this.entity.file = imgPathsArr[0].fileName
this.entity.filePath=imgPathsArr[0].filePath this.entity.path = imgPathsArr[0].filePath
}, },
v() { v() {
this.entity = this.$u.clone(this.v); this.entity = this.$u.clone(this.v);
......
pages/import/api.js
View file @ e4fed9fa
...@@ -24,5 +24,8 @@ export default { ...@@ -24,5 +24,8 @@ export default {
deletes(params) { deletes(params) {
return Api.post(`${systemUrl}/importcenter/batchdelete`, params); return Api.post(`${systemUrl}/importcenter/batchdelete`, params);
}, },
openExcel(params) {//处理时打开以前上传的excel返回数据
return Api.post(`${systemUrl}/importcenter/open`, params);
},
} }
pages/import/detail.vue
View file @ e4fed9fa
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed> <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('file')"><a @click="downFile(entity.filePath)">{{entity.file}}</a></Filed> <Filed :span="12" :name="l('file')">
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed> <a @click="downFile(entity.path)">{{entity.file}}</a>
</Filed>
<Filed :span="12" :name="l('status')">
<state code="improt.im.status" :value="entity.status" type="text"></state>
</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</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')">
<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}}
<User :value="entity.lastModifierUserId"></User>
</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed> <Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> <Filed :span="12" :name="l('deleterUserId')">
{{entity.deleterUserId}}
<User :value="entity.deleterUserId"></User>
</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>
-->
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
...@@ -28,8 +42,16 @@ export default { ...@@ -28,8 +42,16 @@ export default {
downUrl: fileUrlDown, downUrl: fileUrlDown,
fileUrlPath: "", fileUrlPath: "",
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
code: [{ required: true, message: "必填", trigger: "blur" }], required: true,
message: "必填",
trigger: "blur",
}, ],
code: [{
required: true,
message: "必填",
trigger: "blur",
}, ],
}, },
}; };
}, },
...@@ -43,7 +65,9 @@ export default { ...@@ -43,7 +65,9 @@ export default {
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({
id: v,
}).then((r) => {
this.entity = r.result; this.entity = r.result;
this.$emit("on-load"); this.$emit("on-load");
}); });
...@@ -52,8 +76,8 @@ export default { ...@@ -52,8 +76,8 @@ export default {
this.$emit("on-close"); this.$emit("on-close");
}, },
downFile(path) { downFile(path) {
alert(path) //alert(path)
let truePath = path.trim(); let truePath = path;
if (truePath.length > 2) { if (truePath.length > 2) {
if ( if (
truePath.substring(0, 7).toLowerCase() == "http://" || truePath.substring(0, 7).toLowerCase() == "http://" ||
......
pages/import/index.vue
View file @ e4fed9fa
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
<Modal v-model="modal" :title="title" width="1200" :fullscreen="full" footer-hide> <Modal v-model="modal" :title="title" width="1200" :fullscreen="full" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import Search from "./search"; import Search from "./search";
...@@ -40,15 +41,17 @@ export default { ...@@ -40,15 +41,17 @@ export default {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "name", value: null }, keys: {
op: "name",
value: null
},
}, },
modal: false, modal: false,
full:false, full: false,
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
columns: [ columns: [{
{
key: "id", key: "id",
title: this.$t("id"), title: this.$t("id"),
hide: true, hide: true,
...@@ -73,7 +76,7 @@ export default { ...@@ -73,7 +76,7 @@ export default {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
align: "center", align: "center",
width:"180", width: "180",
high: true, high: true,
}, },
{ {
...@@ -81,59 +84,65 @@ export default { ...@@ -81,59 +84,65 @@ export default {
title: this.l("creatorUserId"), title: this.l("creatorUserId"),
align: "left", align: "left",
high: true, high: true,
type:"user", type: "user",
width:"180", width: "180",
}, },
{ // {
key: "lastModificationTime", // key: "lastModificationTime",
title: this.l("lastModificationTime"), // title: this.l("lastModificationTime"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "lastModifierUserId", // key: "lastModifierUserId",
title: this.l("lastModifierUserId"), // title: this.l("lastModifierUserId"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "isDeleted", // key: "isDeleted",
title: this.l("isDeleted"), // title: this.l("isDeleted"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "deletionTime", // key: "deletionTime",
title: this.l("deletionTime"), // title: this.l("deletionTime"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "deleterUserId", // key: "deleterUserId",
title: this.l("deleterUserId"), // title: this.l("deleterUserId"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ key: "creator", title: this.l("creator"), align: "left", high: true,hide: true, }, // {
{ // key: "creator",
key: "lastModifier", // title: this.l("creator"),
title: this.l("lastModifier"), // align: "left",
align: "left", // high: true,
high: true, // hide: true,
hide: true, // },
}, // {
// key: "lastModifier",
// title: this.l("lastModifier"),
// align: "left",
// high: true,
// hide: true,
// },
{ {
key: "status", key: "status",
title: this.l("status"), title: this.l("status"),
align: "center", align: "center",
high: true, high: true,
code: "mimprot.im.status", code: "improt.im.status",
width:"150", width: "150",
}, },
{ {
title: "操作", title: "操作",
...@@ -141,28 +150,39 @@ export default { ...@@ -141,28 +150,39 @@ export default {
width: 140, width: 140,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "detail" }, oprate: "detail"
on: { click: () => this.view(params.row.id) }, },
on: {
click: () => this.view(params.row.id)
},
}, },
"查看" "查看"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "delete" }, oprate: "delete"
on: { click: () => this.remove(params.row.id) }, },
on: {
click: () => this.remove(params.row.id)
},
}, },
"删除" "删除"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "edit" }, oprate: "edit"
on: { click: () => this.process(params.row) }, },
on: {
click: () => this.process(params.row)
},
}, },
"处理" "处理"
), ),
...@@ -175,7 +195,10 @@ export default { ...@@ -175,7 +195,10 @@ export default {
mounted() { mounted() {
console.log(this); console.log(this);
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -189,7 +212,7 @@ export default { ...@@ -189,7 +212,7 @@ export default {
}, },
add() { add() {
this.curId = 0; this.curId = 0;
this.full=false; this.full = false;
this.title = "新增"; this.title = "新增";
this.detail = () => import("./add"); this.detail = () => import("./add");
this.modal = true; this.modal = true;
...@@ -203,21 +226,21 @@ export default { ...@@ -203,21 +226,21 @@ export default {
view(id) { view(id) {
this.curId = id; this.curId = id;
this.title = "详情"; this.title = "详情";
this.full=false; this.full = false;
this.detail = () => import("./detail"); this.detail = () => import("./detail");
this.modal = true; this.modal = true;
}, },
edit(id) { edit(id) {
this.curId = id; this.curId = id;
this.title = "编辑"; this.title = "编辑";
this.full=false; this.full = false;
this.detail = () => import("./edit"); this.detail = () => import("./edit");
this.modal = true; this.modal = true;
}, },
process(row) { process(row) {
this.curId = row.id; this.curId = row.id;
this.title = "处理文件："+row.name; this.title = "处理文件：" + row.name;
this.full=true; this.full = true;
this.detail = () => import("./process"); this.detail = () => import("./process");
this.modal = true; this.modal = true;
}, },
...@@ -240,5 +263,6 @@ export default { ...@@ -240,5 +263,6 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
pages/import/process.vue
View file @ e4fed9fa
This diff is collapsed.
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