diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue
index 74a90b6..e94e0a3 100644
--- a/src/views/inventorys/index.vue
+++ b/src/views/inventorys/index.vue
@@ -57,7 +57,7 @@
             </div>
             <div class="selector-item">
               <el-select clearable v-model="select.dengjifenlei" style="width:100%" placeholder="请选择等级分类">
-                <el-option v-for="item in paraOptions.dengjifenlei" :key="item.id" :label="item.value"
+                <el-option v-for="item in paraOptions.materials_level" :key="item.id" :label="item.value"
                   :value="item.id" />
               </el-select>
             </div>
@@ -161,6 +161,9 @@
   import {
     getparameteritemMore
   } from '@/api/system/dictionary.js'
+  import {
+    download
+  } from "@/utils/downloadRequest";
 
   export default {
     components: {
@@ -183,6 +186,7 @@
           'material_reserve': [],
           'materials_property': [],
           'materials_level': []
+
           // 'materials_fenlei':[],
         },
         select: {
@@ -573,36 +577,47 @@
             window.open('/admin/#/myprint?ids=' + this.printArr, '_blank')
           },
           async exportExcel(sheetName) {
-            const export_fields = {
-              'wuzibianma': '物资编码',
-              'wuzibianma_material_infos_wuzibianma_relation.fenlei_detail.name': '所属种类',
-              'zichanmingcheng': '物资名称',
-              'wuzileixing': '物资类型',
-              'guigexinghao': '物资型号',
-              'wuziguige': '物资规格',
-              'wuzibianma_material_infos_wuzibianma_relation.jiliangdanwei': '单位',
-              'rukupici': '入库批次',
-              'zaikushuliang': '在库数量',
-              'shunxuhao': '顺序号',
-              'wuzizhuangtai_detail.value': '物资状态',
-              'chubeifangshi_detail.value': '储备方式',
-              'materialstorages.cangkumingcheng': '所在仓库',
-              'shelfs.huojiamingcheng': '所在货架',
-              'huojiaceng': '所在货架层',
-              'dengjifenlei_detail.value': '等级分类',
-              'chanquanxinxi_detail.value': '产权信息',
-              'shifouweigudingzichan': '是否为固定资产',
-              'gudingzichanbianma': '固定资产编码',
-              'chubeinnianxian': '储备年限',
-              'cunfangyaoqiu': '存放要求',
-              'weihuyaoqiu': '维护要求',
-              'equipment_maintain_configs_id_relation.name': '保养频次',
-            }
-            const res = await index(Object.assign(this.select, {
+            
+            const params = {
               page: 1,
               page_size: 9999,
               table_name: 'inventorys',
               is_export: 1,
+              sort_type: 'DESC',
+              sort_name: 'wuzibianma',
+              fenlei:this.select.fenlei,
+              wuzizhuangtai:this.select.wuzizhuangtai,
+              chanquanxinxi:this.select.chanquanxinxi,
+              chubeifangshi:this.select.chubeifangshi,
+              suozaicangku:this.select.suozaicangku,
+              start_rukuriqi:this.select.rukuriqi?this.select.rukuriqi[0]:'',
+              end_rukuriqi:this.select.rukuriqi?this.select.rukuriqi[1]:'',
+              start_shengchanriqi:this.select.shengchanriqi?this.select.shengchanriqi[0]:'',
+              end_shengchanriqi:this.select.shengchanriqi?this.select.shengchanriqi[1]:'',
+              // shengchanriqi:this.select.shengchanriqi?this.select.shengchanriqi.join(","):'',
+              dengjifenlei:this.select.dengjifenlei,
+              filter: [
+                /* {
+                  'key': 'wuzibianma',
+                  'op': 'like',
+                  'value': this.select.wzbm
+                }, */
+                {
+                  'key': 'zichanmingcheng',
+                  'op': 'like',
+                  'value': this.select.keyword
+                },
+                // {
+                //   'key': 'rukushuliang',
+                //   'op': 'range',
+                //   'value': rmin + ',' + rmax
+                // },
+                // {
+                //   'key': 'zaikushuliang',
+                //   'op': 'range',
+                //   'value': min + ',' + max
+                // }
+              ],
               "export_fields[wuzibianma]": '物资编码',
               "export_fields[wuzibianma_material_infos_wuzibianma_relation.material_info_type]": '一级分类',
               "export_fields[wuzibianma_material_infos_wuzibianma_relation.material_info_type]": '二级分类',
@@ -628,8 +643,12 @@
               "export_fields[cunfangyaoqiu]": '存放要求',
               "export_fields[weihuyaoqiu]": '维护要求',
               "export_fields[equipment_maintain_configs_id_relation.name]": '保养频次',
-            }),true)
             
+            }
+            download(
+        '/api/admin/inventory/index',
+        'get', params,
+        `自管物资${sheetName}.xlsx`)
           },
           showCode(e, row) {
             console.log(e, row)
diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue
index 62d21bf..f7ec90e 100644
--- a/src/views/inventorys/stocktaking.vue
+++ b/src/views/inventorys/stocktaking.vue
@@ -417,7 +417,7 @@
             placeholder="请选择等级分类"
           >
             <el-option
-              v-for="item in paraOptions.dengjifenlei"
+              v-for="item in paraOptions.materials_level"
               :key="item.id"
               :label="item.value"
               :value="item.id"
@@ -954,7 +954,7 @@ export default {
         materials_status: [],
         material_reserve: [],
         materials_property: [],
-        dengjifenlei: []
+        materials_level: []
       },
       materialTable: [
         {
@@ -2524,7 +2524,7 @@ export default {
         'number[0]': 'materials_status', // 物资状态
         'number[1]': 'material_reserve', // 储备方式
         'number[2]': 'materials_property', // 产权信息
-        'number[3]': 'dengjifenlei' // 等级分类
+        'number[3]': 'materials_level' // 等级分类
       })
       for (var k in this.paraOptions) {
         res.map(item => {