Commit 260f5b82 authored by 仇晓婷's avatar 仇晓婷

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

parents 71e8893c 4350e010
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<DataGrid <DataGrid
:columns="columns" :columns="columns"
ref="grid" style="height:auto" ref="grid" style="height:auto"
:action="action"
type="card" type="card"
:high="false" :high="false"
:span="6" :span="6"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</Form> </Form>
</template> --> </template> -->
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary">新增</Button>
</template> </template>
<!--<template slot="card" slot-scope="{row}"> <!--<template slot="card" slot-scope="{row}">
<!-- v-for="(item,index) in cardlist" :label="item.id" :key="index" <!-- v-for="(item,index) in cardlist" :label="item.id" :key="index"
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
keys: { op: "name", value: null }, keys: { op: "name", value: null },
customerId: { op: "Equal", value: null } customerId: { op: "Equal", value: null }
}, },
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }], columns: [],
cardlist:[ cardlist:[
{ {
name:'工艺文档名称', name:'工艺文档名称',
......
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