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

i18n/locale/zh-CN.js

@@ -1442,6 +1442,7 @@ export default {
   order_list:{
     mesCode:'订单编号',
     status:'工单状态',
+    statusOrder:'订单状态',
     productName:'产品名称',
     drawnNumber:'图号',
     quantity:'生产数量',

pages/produce/orderlist.vue

@@ -11,21 +11,25 @@
       :conditions="easySearch"
       :action="action"
       :gutter="40"
-      :high="false"
     >
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
-            <Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable/>
+            <Input
+              placeholder="请输入订单编号/产品名称/图号"
+              v-model="easySearch.keys.value"
+              v-width="260"
+              clearable
+            />
           </FormItem>
           <FormItem>
             <Button type="primary" @click="search">查询</Button>
           </FormItem>
         </Form>
       </template>
-       <template slot="searchForm">
-          <Search />
-        </template>
+      <template slot="searchForm">
+        <Search />
+      </template>
       <template slot="buttons">
         <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
       </template>
@@ -117,8 +121,8 @@ import Api from "./api";
 import Search from "./search";
 export default {
   name: "starOrder",
-   components: {
-    Search,
+  components: {
+    Search
   },
   data() {
     return {

pages/produce/search.vue

@@ -12,7 +12,7 @@
           <Input v-model="condition.mesCode.value"></Input>
         </FormItem>
       </Col>
-       <Col :span="12" v-if="condition.productName.show">
+       <Col :span="12" >
         <FormItem :label="l('productName')" prop="productName">
           <Input v-model="condition.productName.value"></Input>
         </FormItem>
@@ -24,26 +24,27 @@
       </Col>
       <Col :span="12" v-if="condition.quantity.show">
         <FormItem :label="l('quantity')" prop="quantity">
-          <Input v-model="condition.quantity.value"></Input>
+          <InputNumber  :min="1"  v-model="condition.quantity.value"></InputNumber> 
         </FormItem>
       </Col>
-       <Col :span="12" v-if="condition.status.show">
-        <FormItem :label="l('status')" prop="status">
-         <Dictionary code="taskList.status" v-model="condition.status.value"></Dictionary>
+       <Col :span="12" v-if="condition.dispatchStatus.show">
+        <FormItem :label="l('status')" prop="dispatchStatus">
+         <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>
       </Col>
-
-
-
-
         <Col :span="12" v-if="condition.beginTime.show">
         <FormItem :label="l('beginTime')" prop="beginTime">
-          <DatePicker type="daterange" v-model="condition.beginTime.value"></DatePicker>
+          <DatePicker type="daterange" v-model="condition.beginTime.value" v-width="284"></DatePicker>
         </FormItem>
       </Col>
        <Col :span="12" v-if="condition.endTime.show">
         <FormItem :label="l('endTime')" prop="endTime">
-          <DatePicker type="endTime" v-model="condition.endTime.value"></DatePicker>
+          <DatePicker type="daterange" v-model="condition.endTime.value" v-width="284"></DatePicker>
         </FormItem>
       </Col>
     </Row>
@@ -58,17 +59,18 @@ export default {
       condition: {
         id: { 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 },
         orderId: { op: "Equal", value: null, show: false },
         productId: { op: "Equal", value: null, show: false },
-        productName: { op: "Equal", value: null, show: true },
-        quantity: { op: "Equal", value: null, show: false },
+        productName: { op: 'Like', value: null, show: true },
+        quantity: { op: "Equal", value: null, show: true },
         routingHeaderId: { op: "Equal", value: null, show: false },
         routingDetailId: { op: "Equal", value: null, show: false },
-        status: { op: "Equal", value: null, show: true },
-        beginTime: { op: "Range", value: null, show: false },
-        endTime: { op: "Range", value: null, show: false },
+        dispatchStatus:{ op: "Equal", value: null, show: true },//工单状态
+         status: { op: "Equal", value: null, show: true },//订单状态
+        beginTime: { op: "Range", value: null, show: true },
+        endTime: { op: "Range", value: null, show: true },
       }
     };
   },