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

pages/store/index.vue

 <template>
   <div>
     <div class="mb10 pt5">
-      <Input v-model="searchValue" placeholder="请输入库位名称" clearable style="width: 240px" />
+      <Input
+        v-model="searchValue"
+        placeholder="请输入库位名称"
+        clearable
+        style="width: 240px"
+      />
       <Button type="primary" class @click="handleSearch">查询</Button>
       <div class="fr">
         <Button type="primary" @click="add()">新增库位</Button>
@@ -78,6 +83,12 @@ export default {
           title: "物料编号",
           align: "left",
         },
+        {
+          key: "materialType",
+          title: "物料类型",
+          align: "left",
+          code: "material.main.type",
+        },
         {
           key: "userName",
           title: this.l("userName"),