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

pages/produce/orderlist.vue

@@ -6,12 +6,12 @@
       ref="grid"
       :batch="false"
       :type="typeInfo"
-      :high="false"
       :span="6"
       :lazy="true"
       :conditions="easySearch"
       :action="action"
       :gutter="40"
+      :high="false"
     >
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
@@ -23,6 +23,9 @@
           </FormItem>
         </Form>
       </template>
+       <template slot="searchForm">
+          <Search />
+        </template>
       <template slot="buttons">
         <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
       </template>
@@ -111,8 +114,12 @@
 </template>
 <script>
 import Api from "./api";
+import Search from "./search";
 export default {
   name: "starOrder",
+   components: {
+    Search,
+  },
   data() {
     return {
       action: Api.index,

pages/produce/search.vue

+<template>
+  <Form ref="form" :model="condition" :label-width="100">
+    <Row>
+      <Col :span="12" v-if="condition.id.show">
+        <FormItem :label="l('id')" prop="id">
+          <Input v-model="condition.id.value"></Input>
+        </FormItem>
+      </Col>
+    
+      <Col :span="12" v-if="condition.mesCode.show">
+        <FormItem :label="l('mesCode')" prop="mesCode">
+          <Input v-model="condition.mesCode.value"></Input>
+        </FormItem>
+      </Col>
+       <Col :span="12" v-if="condition.productName.show">
+        <FormItem :label="l('productName')" prop="productName">
+          <Input v-model="condition.productName.value"></Input>
+        </FormItem>
+      </Col>
+       <Col :span="12" v-if="condition.drawnNumber.show">
+        <FormItem :label="l('drawnNumber')" prop="drawnNumber">
+          <Input v-model="condition.drawnNumber.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" v-if="condition.quantity.show">
+        <FormItem :label="l('quantity')" prop="quantity">
+          <Input v-model="condition.quantity.value"></Input>
+        </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>
+        </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>
+        </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>
+        </FormItem>
+      </Col>
+    </Row>
+  </Form>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "Search",
+  data() {
+    return {
+      condition: {
+        id: { op: "Equal", value: null, show: false },
+        executeId: { op: "Equal", value: null, show: false },
+        drawnNumber: { op: "Equal", 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 },
+        routingHeaderId: { op: "Equal", value: null, show: false },
+        routingDetailId: { op: "Equal", value: null, show: false },
+        status: { op: "Equal", value: null, show: false },
+        beginTime: { op: "Range", value: null, show: false },
+        endTime: { op: "Range", value: null, show: false },
+      }
+    };
+  },
+  methods: {
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      let vkey = "order_list" + "." + key;
+      return this.$t(vkey) || key;
+    }
+  }
+};
+</script>