Commit 13c49b8f authored by renjintao's avatar renjintao

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

parents d6583fc2 2395cf89
......@@ -13,7 +13,10 @@
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" />
<Input
placeholder="请输入关键字名称"
v-model="easySearch.keys.value"
/>
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
......@@ -23,20 +26,20 @@
<!-- <template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>-->
<template slot="card" slot-scope="{row}">
<template slot="card" slot-scope="{ row }">
<div class="card_body">
<Row class="title_i">
<Col :span="21">工艺名称:{{row.title}}</Col>
<Col :span="21">工艺名称:{{ row.title }}</Col>
<Col :span="3" class="btn_click">
<!-- <a @click="edit(row.id)">
<Icon type="ios-create" @click="edit(row.id)" />
</a>-->
<!-- <a @click="view(row.id)">
<Icon type="ios-paper" />
</a>
<a @click="remove(row.id)">
<a @click="view(row.id)">
<Icon type="ios-paper" />
</a>
<!-- <a @click="remove(row.id)">
<Icon type="ios-trash" />
</a>-->
</a> -->
</Col>
</Row>
<div class="down_text">
......@@ -48,12 +51,16 @@
</div>
</Col>
<Col span="18">
<p>创建时间:{{row.creationTime}}</p>
<p>创建人:{{row.creator}}</p>
<p>内容:{{row.content}}</p>
<p>创建时间:{{ row.creationTime }}</p>
<p>创建人:{{ row.creator }}</p>
<p>内容:{{ row.content }}</p>
<p>
状态:
<state code="processCase.status" :value="row.status+''" type="text" />
<state
code="processCase.status"
:value="row.status + ''"
type="text"
/>
</p>
</Col>
</Row>
......@@ -78,12 +85,12 @@
</div>-->
</template>
</DataGrid>
<!-- <Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
<Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
<!-- <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
<p>确定删除?</p>
</Modal>-->
</Modal> -->
</div>
</template>
<script>
......
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