Skip to content

M
mes-ui
Commit 08dc673c authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

gongyi

parent b6f1c961
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 105 deletions
pages/produce/execute/ProcessCase/index.vue
View file @ 08dc673c
...@@ -116,6 +116,14 @@ export default { ...@@ -116,6 +116,14 @@ export default {
easySearch: { easySearch: {
keys: { op: "title", value: null }, keys: { op: "title", value: null },
type: { op: "Equal", value: 1 }, type: { op: "Equal", value: 1 },
// routingHeaderId: {
// op: "Equal",
// value: Number(this.$route.query.headid),
// },
// routingDetailId: {
// op: "Equal",
// value: Number(this.$route.query.routid),
// },
}, },
modal: false, modal: false,
deletelModal: false, deletelModal: false,
......
pages/produce/execute/ProcessCheck/guidance/index.vue
View file @ 08dc673c
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
:action="action" :action="action"
:conditions="easySearch" :conditions="easySearch"
type="card" type="card"
:span="6" :span="6"
:high="false" :high="false"
> >
<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" />
...@@ -20,39 +20,44 @@ ...@@ -20,39 +20,44 @@
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<template slot="buttons"> <!-- <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</template> </template>-->
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div class="card_body"> <div class="card_body">
<Row class="title_i"> <Row class="title_i">
<Col :span="21">工艺名称：{{row.title}}</Col> <Col :span="21">工艺名称：{{row.title}}</Col>
<Col :span="3" class="btn_click"> <Col :span="3" class="btn_click">
<!-- <a @click="edit(row.id)"> <!-- <a @click="edit(row.id)">
<Icon type="ios-create" @click="edit(row.id)" /> <Icon type="ios-create" @click="edit(row.id)" />
</a> --> </a>-->
<a @click="view(row.id)"> <!-- <a @click="view(row.id)">
<Icon type="ios-paper" /> <Icon type="ios-paper" />
</a> </a>
<a @click="remove(row.id)"> <a @click="remove(row.id)">
<Icon type="ios-trash" /> <Icon type="ios-trash" />
</a> </a>-->
</Col>
</Row>
<div class="down_text">
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
<Col span="18">
<p>创建时间：{{row.creationTime}}</p>
<p>创建人：{{row.creator}}</p>
<p>内容：{{row.content}}</p>
<p>
状态：
<state code="processCase.status" :value="row.status+''" type="text" />
</p>
</Col> </Col>
</Row> </Row>
<div class="down_text"> </div>
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
<Col span="18">
<p>{{row.creationTime}}</p>
<p>{{row.id}}{{row.creator}}</p>
</Col>
</Row>
</div>
</div> </div>
<!-- <div class="card_box" @click="changeCards(row)"> <!-- <div class="card_box" @click="changeCards(row)">
<Row :gutter="16"> <Row :gutter="16">
...@@ -70,15 +75,15 @@ ...@@ -70,15 +75,15 @@
<p>{{row.id}}{{row.creator}}</p> <p>{{row.id}}{{row.creator}}</p>
</Col> </Col>
</Row> </Row>
</div> --> </div>-->
</template> </template>
</DataGrid> </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" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </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> <p>确定删除？</p>
</Modal> </Modal>-->
</div> </div>
</template> </template>
<script> <script>
...@@ -87,7 +92,7 @@ import Search from "./search"; ...@@ -87,7 +92,7 @@ import Search from "./search";
export default { export default {
name: "list", name: "list",
components: { components: {
Search Search,
}, },
head: { head: {
title: "工艺提醒", title: "工艺提醒",
...@@ -99,7 +104,15 @@ export default { ...@@ -99,7 +104,15 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "title", value: null }, keys: { op: "title", value: null },
type: { op: "Equal", value: 2 } type: { op: "Equal", value: 2 },
routingHeaderId: {
op: "Equal",
value: Number(this.$route.query.headid),
},
routingDetailId: {
op: "Equal",
value: Number(this.$route.query.routid),
},
}, },
modal: false, modal: false,
deletelModal: false, deletelModal: false,
...@@ -112,89 +125,54 @@ export default { ...@@ -112,89 +125,54 @@ export default {
title: this.$t("id"), title: this.$t("id"),
hide: true, hide: true,
align: "left", align: "left",
high: true high: true,
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true
}, },
{ {
key: "creatorUserId", key: "routingDetail",
title: this.l("creatorUserId"), title: this.l("routingDetail"),
align: "left", align: "left",
high: true high: true,
}, tooltip: 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",
high: true
}, },
{ {
key: "title", key: "title",
title: this.l("title"), title: this.l("title"),
align: "left", align: "left",
easy: true,
high: true
}, },
{ key: "creator", title: this.l("creator"), align: "left", high: true },
{ {
key: "filePath", key: "creator",
title: this.l("filePath"), title: this.l("creator"),
align: "left", align: "left",
high: true type: "user",
}, },
{ {
key: "filePaths", key: "content",
title: this.l("filePaths"), title: this.l("content"),
align: "left", align: "left",
high: true
}, },
{ {
key: "dispatchId", key: "filePaths",
title: this.l("dispatchId"), title: this.l("filePath"),
align: "left",
high: true
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
align: "left", align: "left",
high: true easy: true,
render: (h, params) => {
return h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) },
},
"查看"
);
},
}, },
{ {
key: "routingHeaderId", key: "status",
title: this.l("routingHeaderId"), title: this.l("status"),
align: "left", align: "left",
high: true easy: true,
code: "process.status",
}, },
{ key: "type", title: this.l("type"), align: "left", high: true },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
...@@ -206,7 +184,7 @@ export default { ...@@ -206,7 +184,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) } on: { click: () => this.view(params.row.id) },
}, },
"查看" "查看"
), ),
...@@ -215,7 +193,7 @@ export default { ...@@ -215,7 +193,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) },
}, },
"编辑" "编辑"
), ),
...@@ -223,14 +201,14 @@ export default { ...@@ -223,14 +201,14 @@ export default {
"op", "op",
{ {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) },
}, },
"删除" "删除"
) ),
]); ]);
} },
} },
] ],
}; };
}, },
mounted() { mounted() {
...@@ -277,11 +255,11 @@ export default { ...@@ -277,11 +255,11 @@ export default {
}, },
remove(id) { remove(id) {
this.deletelModal = true; this.deletelModal = true;
this.curId = id; this.curId = id;
}, },
removeOk(){ removeOk() {
let id = this.curId; let id = this.curId;
Api.delete(id).then(r => { Api.delete(id).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.$Message.success("删除成功"); this.$Message.success("删除成功");
...@@ -314,10 +292,10 @@ export default { ...@@ -314,10 +292,10 @@ export default {
type:'类型（工艺案例还是工艺提醒）', type:'类型（工艺案例还是工艺提醒）',
} }
*/ */
let vkey = "process_case" + "." + key; let vkey = "remind" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
} },
} },
}; };
</script> </script>
<style lang="less"> <style lang="less">
......
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