Commit e9dbba02 authored by renjintao's avatar renjintao

search

parent 2a6c0ad6
...@@ -1442,6 +1442,7 @@ export default { ...@@ -1442,6 +1442,7 @@ export default {
order_list:{ order_list:{
mesCode:'订单编号', mesCode:'订单编号',
status:'工单状态', status:'工单状态',
statusOrder:'订单状态',
productName:'产品名称', productName:'产品名称',
drawnNumber:'图号', drawnNumber:'图号',
quantity:'生产数量', quantity:'生产数量',
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
:conditions="easySearch" :conditions="easySearch"
:action="action" :action="action"
:gutter="40" :gutter="40"
:high="false"
> >
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<Input v-model="condition.mesCode.value"></Input> <Input v-model="condition.mesCode.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.productName.show"> <Col :span="12" >
<FormItem :label="l('productName')" prop="productName"> <FormItem :label="l('productName')" prop="productName">
<Input v-model="condition.productName.value"></Input> <Input v-model="condition.productName.value"></Input>
</FormItem> </FormItem>
...@@ -24,18 +24,19 @@ ...@@ -24,18 +24,19 @@
</Col> </Col>
<Col :span="12" v-if="condition.quantity.show"> <Col :span="12" v-if="condition.quantity.show">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<Input v-model="condition.quantity.value"></Input> <InputNumber :min="1" v-model="condition.quantity.value"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.status.show"> <Col :span="12" v-if="condition.dispatchStatus.show">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="dispatchStatus">
<Dictionary code="taskList.status" v-model="condition.status.value"></Dictionary> <Dictionary code="taskList.status" v-model="condition.dispatchStatus.value"></Dictionary>
</FormItem>
</Col>
<Col :span="12" v-if="condition.status.show">
<FormItem :label="l('statusOrder')" prop="status">
<Dictionary code="plan.order.status" v-model="condition.status.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.beginTime.show"> <Col :span="12" v-if="condition.beginTime.show">
<FormItem :label="l('beginTime')" prop="beginTime"> <FormItem :label="l('beginTime')" prop="beginTime">
<DatePicker type="daterange" v-model="condition.beginTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.beginTime.value"></DatePicker>
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
</Col> </Col>
<Col :span="12" v-if="condition.endTime.show"> <Col :span="12" v-if="condition.endTime.show">
<FormItem :label="l('endTime')" prop="endTime"> <FormItem :label="l('endTime')" prop="endTime">
<DatePicker type="endTime" v-model="condition.endTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.endTime.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -58,17 +59,18 @@ export default { ...@@ -58,17 +59,18 @@ export default {
condition: { condition: {
id: { op: "Equal", value: null, show: false }, id: { op: "Equal", value: null, show: false },
executeId: { op: "Equal", value: null, show: false }, executeId: { op: "Equal", value: null, show: false },
drawnNumber: { op: "Equal", value: null, show: true }, drawnNumber: { op: "Like", value: null, show: true },
mesCode: { op: "Equal", value: null, show: true }, mesCode: { op: "Equal", value: null, show: true },
orderId: { op: "Equal", value: null, show: false }, orderId: { op: "Equal", value: null, show: false },
productId: { op: "Equal", value: null, show: false }, productId: { op: "Equal", value: null, show: false },
productName: { op: "Equal", value: null, show: true }, productName: { op: 'Like', value: null, show: true },
quantity: { op: "Equal", value: null, show: false }, quantity: { op: "Equal", value: null, show: true },
routingHeaderId: { op: "Equal", value: null, show: false }, routingHeaderId: { op: "Equal", value: null, show: false },
routingDetailId: { op: "Equal", value: null, show: false }, routingDetailId: { op: "Equal", value: null, show: false },
status: { op: "Equal", value: null, show: true }, dispatchStatus:{ op: "Equal", value: null, show: true },//工单状态
beginTime: { op: "Range", value: null, show: false }, status: { op: "Equal", value: null, show: true },//订单状态
endTime: { op: "Range", value: null, show: false }, beginTime: { op: "Range", value: null, show: true },
endTime: { op: "Range", value: null, show: true },
} }
}; };
}, },
......
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