Commit d7db9f74 authored by 仇晓婷's avatar 仇晓婷

工艺设置添加图号查询

parent 85296545
...@@ -9,15 +9,27 @@ ...@@ -9,15 +9,27 @@
<Icon type="ios-arrow-forward" size="24" /> <Icon type="ios-arrow-forward" size="24" />
</a> </a>
</div> </div>
<Content :class="!showMenu?'con_bord':''"> <Content :class="!showMenu ? 'con_bord' : ''">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch"> <DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
>
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="productingpreparationpeople" style="width:200px"> <FormItem prop="productingpreparationpeople" style="width: 220px">
<departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect> <departmentSelect
v-model="easySearch.productingpreparationpeople.value"
:type="3"
></departmentSelect>
</FormItem> </FormItem>
<FormItem prop="keys"> <FormItem prop="keys" style="width: 220px">
<Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable /> <Input
placeholder="请输入订单编号/产品名称/图号"
v-model="easySearch.keys.value"
clearable
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -67,7 +79,7 @@ export default { ...@@ -67,7 +79,7 @@ export default {
detail: null, detail: null,
modal: false, modal: false,
easySearch: { easySearch: {
keys: { op: "mescode,productName", value: null }, keys: { op: "mescode,productName,drawnNumber", value: null },
productingpreparationpeople: { op: "Equal", value: null }, productingpreparationpeople: { op: "Equal", value: null },
}, },
columns: [ columns: [
...@@ -243,7 +255,7 @@ export default { ...@@ -243,7 +255,7 @@ export default {
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
padding-top: 3px; padding-top: 3px;
.ivu-layout-sider { .ivu-layout-sider {
background: @layout-content-bg-color; background: @layout-content-bg-color;
margin-right: 10px; margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15); box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 89vh; height: 89vh;
...@@ -251,7 +263,7 @@ export default { ...@@ -251,7 +263,7 @@ export default {
} }
.ivu-layout-content { .ivu-layout-content {
// margin-left: 5px; // margin-left: 5px;
background:@right-bg; background: @right-bg;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15); box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto; overflow: auto;
padding: 10px; padding: 10px;
......
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