diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js
index 2a0347d..6931de1 100644
--- a/src/api/leger/toolinventoryrecord.js
+++ b/src/api/leger/toolinventoryrecord.js
@@ -47,4 +47,23 @@ export const update = (row) => {
     data: row
   })
 }
+export const auditing = (ids) => {
+  return request({
+    url: '/api/toolinventoryrecord/auditing',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const reject = (ids) => {
+  return request({
+    url: '/api/toolinventoryrecord/reject',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 4676d4a..33c5b26 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -84,7 +84,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           searchMenuSpan: 6,
           tip: false,
           border: true,
-          index: true,
+          index: false,
           viewBtn: true,
           selection: true,
           column: [
@@ -633,7 +633,8 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}`);
+          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
+          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}&${formStr}`);
         });
       },
       beforeOpen(done, type) {
diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue
index bcfc3b6..dd773d1 100644
--- a/src/views/leger/toolinventoryrecord.vue
+++ b/src/views/leger/toolinventoryrecord.vue
@@ -6,9 +6,10 @@
                :page="page"
                :permission="permissionList"
                :before-open="beforeOpen"
+               :search.sync="search"
+               :header-cell-class-name="headerClass"
                v-model="form"
                ref="crud"
-               @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
                @search-change="searchChange"
@@ -23,17 +24,43 @@
                    icon="el-icon-delete"
                    plain
                    v-if="permission.toolinventoryrecord_delete"
-                   @click="handleDelete">删 除
+                   @click="handleDelete">批量删除
         </el-button>
       </template>
+      <template slot="menuRight">
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleDetailAdd">新增
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleAuditing">批量审核
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleReject">批量驳回
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleExport">导出
+        </el-button>
+      </template>
+      <template #menu="{row,index,size}">
+        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
+        <el-button @click="rowDel(row)" type="text">删除</el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/leger/toolinventoryrecord";
+  import {getList, getDetail, add, remove, reject, auditing} from "@/api/leger/toolinventoryrecord";
   import {mapGetters} from "vuex";
-
+  import {getToken} from "@/util/auth";
   export default {
     data() {
       return {
@@ -53,153 +80,83 @@
           searchMenuSpan: 6,
           tip: false,
           border: true,
-          index: true,
+          index: false,
           viewBtn: true,
           selection: true,
           column: [
-            {
-              label: "主键",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入主键",
-                trigger: "blur"
-              }]
-            },
             {
               label: "工器具编码",
-              prop: "toolCode",
-              rules: [{
-                required: true,
-                message: "请输入工器具编码",
-                trigger: "blur"
-              }]
+              prop: "toolsCodeId",
+              search: true,
             },
             {
               label: "工器具名称",
               prop: "toolName",
-              rules: [{
-                required: true,
-                message: "请输入工器具名称",
-                trigger: "blur"
-              }]
+              search: true,
             },
             {
-              label: "规格型号",
-              prop: "modelSpecification",
-              rules: [{
-                required: true,
-                message: "请输入规格型号",
-                trigger: "blur"
-              }]
+              label: "工器具类别",
+              prop: "toolCategory",
             },
             {
-              label: "配置日期",
-              prop: "configurationDate",
-              rules: [{
-                required: true,
-                message: "请输入配置日期",
-                trigger: "blur"
-              }]
+              label: "工器具类别描述",
+              prop: "toolTypeDescription",
             },
             {
-              label: "责任班组",
-              prop: "responsibleTeam",
-              rules: [{
-                required: true,
-                message: "请输入责任班组",
-                trigger: "blur"
-              }]
+              label: "规格型号",
+              prop: "modelSpecification",
             },
             {
-              label: "场站",
-              prop: "stations",
-              rules: [{
-                required: true,
-                message: "请输入场站",
-                trigger: "blur"
-              }]
+              label: "工器具状态",
+              prop: "toolStatus",
+              search: true,
             },
             {
-              label: "工器具类别",
-              prop: "toolCategory",
-              rules: [{
-                required: true,
-                message: "请输入工器具类别",
-                trigger: "blur"
-              }]
+              label: "工器具状态描述",
+              prop: "toolStatusDescription",
             },
             {
-              label: "工器具状态",
-              prop: "toolStatus",
-              rules: [{
-                required: true,
-                message: "请输入工器具状态",
-                trigger: "blur"
-              }]
+              label: "配置日期",
+              prop: "configurationDate",
             },
             {
               label: "已用年限",
               prop: "yearsInUsed",
-              rules: [{
-                required: true,
-                message: "请输入已用年限",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "责任人",
-              prop: "responsiblPerson",
-              rules: [{
-                required: true,
-                message: "请输入责任人",
-                trigger: "blur"
-              }]
             },
             {
-              label: "工器具类别描述",
-              prop: "toolTypeDescription",
-              rules: [{
-                required: true,
-                message: "请输入工器具类别描述",
-                trigger: "blur"
-              }]
+              label: "出厂编号",
+              prop: "factoryNo",
             },
             {
-              label: "工器具状态描述",
-              prop: "toolStatusDescription",
-              rules: [{
-                required: true,
-                message: "请输入工器具状态描述",
-                trigger: "blur"
-              }]
+              label: "责任班组",
+              prop: "responsibleTeam",
             },
             {
-              label: "出厂编号",
-              prop: "factoryNo",
-              rules: [{
-                required: true,
-                message: "请输入出厂编号",
-                trigger: "blur"
-              }]
+              label: "责任人",
+              prop: "responsiblPerson",
             },
             {
               label: "是否检验周期内",
               prop: "isInspectionPeriod",
-              rules: [{
-                required: true,
-                message: "请输入是否检验周期内",
-                trigger: "blur"
-              }]
+              type: "select",
+              search: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
             },
             {
-              label: "审核状态",
-              prop: "checkStatus",
-              rules: [{
-                required: true,
-                message: "请输入审核状态",
-                trigger: "blur"
-              }]
+              label: "场站",
+              prop: "stations",
+              type: "select",
+              search: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=station",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+
             },
           ]
         },
@@ -209,14 +166,14 @@
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
-          this.option.column = this.option.column.filter(v => {
-              return this.permission['toolinventoryrecord_col_' + v.prop]
-          })
+          // this.option.column = this.option.column.filter(v => {
+          //     return this.permission['toolinventoryrecord_col_' + v.prop]
+          // })
         return {
-          addBtn: this.validData(this.permission.toolinventoryrecord_add, false),
-          viewBtn: this.validData(this.permission.toolinventoryrecord_view, false),
-          delBtn: this.validData(this.permission.toolinventoryrecord_delete, false),
-          editBtn: this.validData(this.permission.toolinventoryrecord_edit, false)
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          editBtn: false
         };
       },
       ids() {
@@ -241,19 +198,6 @@
           loading();
         });
       },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          done();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
@@ -271,6 +215,27 @@
             });
           });
       },
+      // 新增按钮处理
+      handleDetailAdd() {
+        this.$router.push({
+          path: "/leger/toolinventoryrecordDetail",
+          query: {
+            frameMode:"add"
+          },
+        });
+      },
+      // 查看操作处理
+      handleDetailSearch(row) {
+        debugger
+        this.$router.push({
+          path: "/leger/toolinventoryrecordDetail",
+          query: {
+            frameMode:"search",
+            id: row.id
+          },
+        });
+      },
+      // 批量删除按钮处理
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
@@ -293,6 +258,62 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      // 批量审核按钮处理
+      handleAuditing() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择数据审核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return auditing(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      // 批量驳回按钮处理
+      handleReject() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择数据审核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return reject(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      // 导出按钮处理
+      handleExport() {
+        this.$confirm("是否导出数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}`);
+        });
+      },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
@@ -333,10 +354,17 @@
           this.loading = false;
           this.selectionClear();
         });
+      },
+      headerClass() {
+        return 'header-class'
       }
     }
   };
 </script>
 
 <style>
+.header-class{
+  background-color: #3366cc !important;
+  color: #FFFFFF !important;
+}
 </style>