diff --git a/src/views/app-update/index.vue b/src/views/app-update/index.vue
index 9b93d14..241f1b4 100644
--- a/src/views/app-update/index.vue
+++ b/src/views/app-update/index.vue
@@ -128,6 +128,7 @@ import {getToken} from '@/utils/auth'
 
 const defaultForm = {id: null, name: '', versionCode: '', versionName: '', modifyContent: ''}
 export default {
+  name: 'SysAppUpdate',
   components: {pagination, crudOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/src/views/base-data/baseZcjxb/zcjxb/index.vue b/src/views/base-data/baseZcjxb/zcjxb/index.vue
index 2c5a48c..dd703f6 100644
--- a/src/views/base-data/baseZcjxb/zcjxb/index.vue
+++ b/src/views/base-data/baseZcjxb/zcjxb/index.vue
@@ -200,6 +200,7 @@ const defaultForm = {
   readValue: null, errorTxt: null
 }
 export default {
+  name: 'ZcJxb',
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/src/views/base-data/box/smallLine.vue b/src/views/base-data/box/smallLine.vue
index c8c23e4..d99fcc2 100644
--- a/src/views/base-data/box/smallLine.vue
+++ b/src/views/base-data/box/smallLine.vue
@@ -201,7 +201,7 @@ const defaultForm = {
   lampCode: null
 }
 export default {
-  name: 'Box',
+  name: 'SmallLine',
   components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['base_staus', 'lamp_status', 'lamp_code'],
diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index 34497b4..8465e49 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -220,6 +220,7 @@ export default {
       crud.toQuery()
     },
     handleErr(err, file, fileList) {
+      console.log(err)
       this.crud.notify(err.toString(), CRUD.NOTIFICATION_TYPE.ERROR)
     },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 85b18a6..ae973ca 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -306,7 +306,6 @@ export default {
   },
   methods: {
     handleSuccess(response, file, fileList, crud) {
-      let myError = response.toString()//转字符串
       this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS)
       crud.toQuery()
     },
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index af8fb15..fe58b90 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -159,7 +159,7 @@ const defaultForm = {
   updateTime: null
 }
 export default {
-  name: 'asnTask',
+  name: 'AsnTask',
   components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['task_status'],
diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index a8b0d3f..f214fd5 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -3,17 +3,6 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle" type="flex">
-        <label class="el-form-item-label" v-show="false">物料编码</label>
-        <el-select v-show="false" v-model="query.itemCode" @focus="getItem" value-key="id" filterable multiple
-                   placeholder="请选择物料" style="width: 150px;" class="filter-item"
-                   @keyup.enter.native="crud.toQuery">
-          <el-option
-            v-for="item in items"
-            :key="item.id"
-            :label="item.code"
-            :value="item.code"
-          />
-        </el-select>
 
         <label class="el-form-item-label">物料编码</label>
         <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
@@ -30,6 +19,10 @@
         <el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;"
                   class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
+        <label class="el-form-item-label">箱号</label>
+        <el-input v-model="query.orderNumber" clearable placeholder="请输入箱号" style="width: 150px;"
+                  class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
 
         <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
@@ -47,9 +40,24 @@
 
         </div>
       </div>
-
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
+      <crudOperation :permission="permission" :tableKey="this.$options.name">
+        <el-upload
+          class="upload-demo"
+          slot="right"
+          style="float: right;padding-left: 5px"
+          :action="baseApi+'/api/inventory/import_inventory'"
+          :file-list="fileList"
+          :on-error="handleErr"
+          :on-success=" (response, file, fileList) => {
+          return handleSuccess(response, file, fileList,crud);}"
+          :headers="headers"
+          :show-file-list="true"
+        >
+          <el-button size="mini" type="success" v-if="this.radio3=='大件'" icon="el-icon-upload2">大件批量入库
+          </el-button>
+        </el-upload>
+      </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="500px">
@@ -166,6 +174,8 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import {mapGetters} from "vuex";
+import {getToken} from "@/utils/auth";
 
 const defaultForm = {
   id: null,
@@ -199,7 +209,8 @@ export default {
   cruds() {
     return CRUD({
       query: {
-        quantity: 0
+        quantity: 0,
+        areaName: '小件存储区'
       },
       title: '库存信息',
       url: 'api/inventory',
@@ -215,8 +226,15 @@ export default {
       }
     })
   },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
   data() {
     return {
+      headers: {'Authorization': getToken()},
+      fileList: [],
       radio3: '小件',
       points: [],
       stocks: [],
@@ -230,6 +248,16 @@ export default {
     }
   },
   methods: {
+    handleSuccess(response, file, fileList, crud) {
+      this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS)
+      crud.toQuery()
+    },
+    handleErr(err, file, fileList) {
+      let myError = err.toString()//转字符串
+      myError = myError.replace('Error: ', '') // 去掉前面的" Error: "
+      myError = JSON.parse(myError)//转对象
+      this.crud.notify(myError['message'], CRUD.NOTIFICATION_TYPE.ERROR)
+    },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
@@ -244,7 +272,8 @@ export default {
         })
       })
     },
-    deleteDataM(id) {//删除数据的方法
+    //删除数据的方法
+    deleteDataM(id) {
       let ids = [];
       ids.push(id);
       crudInventory.del(ids).then(res => {
@@ -288,7 +317,7 @@ export default {
     },
     clickChange(lab) {
       if (lab === '全部') {
-        this.query.status = ''
+        this.query.areaName = ''
         this.crud.toQuery()
       } else if (lab === '小件') {
         this.query.areaName = '小件存储区'
@@ -300,10 +329,11 @@ export default {
         this.query.areaName = ['小件翻包区', '大件翻包区']
         this.crud.toQuery()
       } else if (lab === '叫料') {
-        this.query.areaName = ['小件翻包存储区', '小件翻包存储区']
+        this.query.areaName = ['小件翻包存储区', '大件翻包存储区']
         this.crud.toQuery()
       }
     }
+
   }
 
 }
diff --git a/src/views/business-data/inventoryLog/index.vue b/src/views/business-data/inventoryLog/index.vue
index d989b59..b3301f5 100644
--- a/src/views/business-data/inventoryLog/index.vue
+++ b/src/views/business-data/inventoryLog/index.vue
@@ -2,45 +2,51 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!--      <el-input v-model="query.itemCode" clearable placeholder="物料代码" style="width: 140px;" class="filter-item"-->
-      <!--                @keyup.enter.native="crud.toQuery"/>-->
-      <el-select v-model="query.itemCode" placeholder="物料代码" filterable clearable style="width: 140px;" class="filter-item">
-        <el-option
-          @keyup.enter.native="crud.toQuery"
-          v-for="item in this.items"
-          :key="item.code"
-          :label="item.code"
-          :value="item.code">
-          <span style="float: left">{{ item.code }}</span>
-          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
-        </el-option>
-      </el-select>
-      <el-input v-model="query.itemName" clearable placeholder="物料名称" style="width: 140px;" class="filter-item"
-                @keyup.enter.native="crud.toQuery"/>
-      <el-select v-model="query.logType" clearable placeholder="操作类型" class="filter-item"
-                 @keyup.enter.native="crud.toQuery">
-        <el-option
-          v-for="logtype in dict.inv_log_type"
-          :key="logtype.id"
-          :label="logtype.label"
-          :value="logtype.value"
-          @change="crud.toQuery"
-        />
-      </el-select>
-      <el-select v-model="query.incDec" clearable placeholder="增加/减少" class="filter-item"
-                 @keyup.enter.native="crud.toQuery">
-        <el-option
-          v-for="incdec in dict.inc_dec"
-          :key="incdec.id"
-          :label="incdec.label"
-          :value="incdec.value"
-          @change="crud.toQuery"
-        />
-      </el-select>
-      <el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 140px;" class="filter-item"
-                @keyup.enter.native="crud.toQuery"/>
-      <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
-      <rrOperation :crud="crud"/>
+      <div v-if="crud.props.searchToggle" type="flex">
+        <label class="el-form-item-label">物料</label>
+        <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
+                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">物料名称</label>
+        <el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 150px;"
+                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
+        <label class="el-form-item-label">操作类型</label>
+        <el-select v-model="query.logType" clearable placeholder="操作类型" style="width: 150px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery">
+          <el-option
+            v-for="logtype in dict.inv_log_type"
+            :key="logtype.id"
+            :label="logtype.label"
+            :value="logtype.value"
+            @change="crud.toQuery"
+          />
+        </el-select>
+        <label class="el-form-item-label">增减类型</label>
+        <el-select v-model="query.incDec" clearable placeholder="增加/减少" style="width: 150px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery">
+          <el-option
+            v-for="incdec in dict.inc_dec"
+            :key="incdec.id"
+            :label="incdec.label"
+            :value="incdec.value"
+            @change="crud.toQuery"
+          />
+        </el-select>
+        <label class="el-form-item-label">批次号</label>
+        <el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 150px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+        <div>
+          <label class="el-form-item-label">箱号</label>
+          <el-input v-model="query.orderNumber" clearable placeholder="请输入箱号" style="width: 150px;"
+                    class="filter-item"
+                    @keyup.enter.native="crud.toQuery"/>
+          <label class="el-form-item-label">发生日期</label>
+          <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
+          <rrOperation :crud="crud"/>
+        </div>
+
+      </div>
+
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
@@ -70,6 +76,11 @@
             <div>{{ scope.row.itemKey.propC1 }}</div>
           </template>
         </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="orderNumber" label="箱号">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.orderNumber }}</div>
+          </template>
+        </el-table-column>
         <el-table-column prop="logType" label="操作类型">
           <template slot-scope="scope">
             {{ dict.label.inv_log_type[scope.row.logType] }}