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

i18n/locale/zh-CN.js

@@ -1489,6 +1489,7 @@ export default {
     description:'描述',
     levelNum:'编码分类层数',
     codeLength:'编码分类位数',
+    materialCodeLength:'物料编码位数'
     },
     //转续列表
     order_execute_handon:{

pages/materiel/codeRule/add.vue

@@ -36,6 +36,11 @@
           <InputNumber v-model="entity.codeLength" :max="5" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="12">
+        <FormItem :label="l('materialCodeLength')" prop="materialCodeLength">
+          <InputNumber v-model="entity.materialCodeLength" :max="10" :min="1"></InputNumber>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -64,7 +69,8 @@ export default {
         status: null,
         description: "",
         levelNum: null,
-        codeLength: null
+        codeLength: null,
+        materialCodeLength:null
       },
     //   formValidate:{
     //       name:'',type:'',status:'',levelNum:'',codeLength:''
@@ -74,7 +80,8 @@ export default {
         type: [{ required: true, message: "必填"}],
         status: [{ required: true, message: "必填"}],
         levelNum: [{ required: true, message: "必填"}],
-        codeLength: [{ required: true, message: "必填"}]
+        codeLength: [{ required: true, message: "必填"}],
+        materialCodeLength: [{ required: true, message: "必填"}]
       }
     };
   },

pages/materiel/codeRule/detail.vue

@@ -14,6 +14,7 @@
 <Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
 <Filed :span="12" :name="l('levelNum')">{{entity.levelNum}}</Filed>
 <Filed :span="12" :name="l('codeLength')">{{entity.codeLength}}</Filed>
+<Filed :span="12" :name="l('materialCodeLength')">{{entity.materialCodeLength}}</Filed>
         </Row>
        
     </div>

pages/materiel/codeRule/edit.vue

@@ -36,6 +36,11 @@
           <InputNumber v-model="entity.codeLength" disabled :max="5" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="12">
+        <FormItem :label="l('materialCodeLength')" prop="materialCodeLength">
+          <InputNumber v-model="entity.materialCodeLength" disabled :max="10" :min="1"></InputNumber>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -56,7 +61,8 @@ export default {
         type: [{ required: true, message: "必填" }],
         status: [{ required: true, message: "必填" }],
         levelNum: [{ required: true, message: "必填" }],
-        codeLength: [{ required: true, message: "必填" }]
+        codeLength: [{ required: true, message: "必填" }],
+         materialCodeLength: [{ required: true, message: "必填" }]
       }
     };
   },

pages/materiel/codeRule/index.vue

@@ -54,6 +54,7 @@ keys:{op:"code,name",value:null}
     { key:"description",title:this.l("description")   ,align:"center"    ,high:true },
     { key:"levelNum",title:this.l("levelNum")   ,align:"center"    ,high:true ,hide:true , },
     { key:"codeLength",title:this.l("codeLength")   ,align:"center"    ,high:true,hide:true ,  },
+     { key:"materialCodeLength",title:this.l("materialCodeLength")   ,align:"center"    ,high:true,hide:true ,  },
           {
               title: '操作',
               key: 'action',

pages/produce/orderlist.vue

@@ -6,23 +6,26 @@
       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>
           <FormItem prop="keys">
-            <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" v-width="260" />
+            <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="buttons">
         <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
       </template>
@@ -111,14 +114,18 @@
 </template>
 <script>
 import Api from "./api";
+import Search from "./search";
 export default {
   name: "starOrder",
+   components: {
+    Search,
+  },
   data() {
     return {
       action: Api.index,
       easySearch: {
         keys: {
-          op: "mesCode,productName",
+          op: "mesCode,productName,drawnNumber",
           value: null
         }
       },

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>