diff --git a/src/api/ma/person-setting.js b/src/api/ma/person-setting.js
new file mode 100644
index 00000000..755355f3
--- /dev/null
+++ b/src/api/ma/person-setting.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 获取人员配置列表
+export function getPersonSettingListApi(query) {
+  return request({
+    url: '/material/ma_type_repair/getTypeManageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 人员管理--绑定
+export function bindPersonSettingApi(data) {
+  return request({
+    url: '/material/ma_type_repair/addTypeManage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 人员管理--解绑
+export function unBindPersonSettingApi(data) {
+  return request({
+    url: '/material/ma_type_repair/unbindTypeManage',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue
index 44ddbc0d..15fc4ff3 100644
--- a/src/views/business-examine/direct-rotation-apply/index.vue
+++ b/src/views/business-examine/direct-rotation-apply/index.vue
@@ -123,9 +123,10 @@ export default {
             },
             // 状态
             statusOptions: [
-                { label: '待审核', value: '1' },
-                { label: '审核中', value: '2' },
-                { label: '已完成', value: '3' }
+                { label: '待审核', value: '0' },
+                { label: '审核中', value: '1' },
+                { label: '已完成', value: '2' },
+                { label: '已驳回', value: '3' }
             ],
             total: 0, // 总条数
             // 表头
diff --git a/src/views/business/businessHandlingRecord/directApplyRecord.vue b/src/views/business/businessHandlingRecord/directApplyRecord.vue
index da48cb81..17c4ecd3 100644
--- a/src/views/business/businessHandlingRecord/directApplyRecord.vue
+++ b/src/views/business/businessHandlingRecord/directApplyRecord.vue
@@ -72,6 +72,9 @@
           <el-tag v-else-if="scope.row.status == '2'" type="success" size="mini" style="margin-right: 5px">
             已完成
           </el-tag>
+          <el-tag v-else-if="scope.row.status == '3'" type="danger" size="mini" style="margin-right: 5px">
+            已驳回
+          </el-tag>
         </template>
       </el-table-column>
       <!-- 操作 -->
@@ -129,15 +132,16 @@ export default {
       },
       // 考勤状态
       statusOptions: [
-        { label: '待审核', value: '1' },
-        { label: '审核中', value: '2' },
-        { label: '已完成', value: '3' }
+        { label: '待审核', value: '0' },
+        { label: '审核中', value: '1' },
+        { label: '已完成', value: '2' },
+        { label: '已驳回', value: '3' }
       ],
       total: 0, // 总条数
       // 表头
       tableColumns: [
         { label: '申请时间', prop: 'createTime' },
-        { label: '申请人', prop: 'leaseMan' },
+        { label: '申请人', prop: 'createName' },
         { label: '转出单位', prop: 'backUnitName' },
         { label: '转出工程', prop: 'backProName' },
         { label: '转入单位', prop: 'leaseUnitName' },
diff --git a/src/views/business/reliefRecord/index.vue b/src/views/business/reliefRecord/index.vue
index bda9dd5a..e3b4f14b 100644
--- a/src/views/business/reliefRecord/index.vue
+++ b/src/views/business/reliefRecord/index.vue
@@ -33,6 +33,7 @@
                     <el-option label="待审核" value="0"></el-option>
                     <el-option label="审核中" value="1"></el-option>
                     <el-option label="已审核" value="2"></el-option>
+                    <el-option label="已驳回" value="3"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -445,7 +446,7 @@ export default {
             uploadUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传的图片服务器地址
             upload: {
                 // 设置上传的请求头部
-                headers: { Authorization: 'Bearer ' + getToken() }, 
+                headers: { Authorization: 'Bearer ' + getToken() },
             },
 
             delBusinessFileIdList: [], // 删除的图片id
@@ -584,7 +585,7 @@ export default {
             this.title = '查看'
             this.uploadKey = Date.now()
             // 清空附件列表
-            this.dialogAppy.decreaseFile = [] 
+            this.dialogAppy.decreaseFile = []
 
             getDiscountViewList(row.id).then(async response => {
                 if (response.code == 200) {
@@ -614,7 +615,7 @@ export default {
             this.title = '修改'
             this.uploadKey = Date.now()
             // 清空附件列表
-            this.dialogAppy.decreaseFile = [] 
+            this.dialogAppy.decreaseFile = []
 
             getDiscountViewList(row.id).then(async response => {
                 if (response.code == 200) {
diff --git a/src/views/material/ma/person-setting/index.vue b/src/views/material/ma/person-setting/index.vue
new file mode 100644
index 00000000..df84045d
--- /dev/null
+++ b/src/views/material/ma/person-setting/index.vue
@@ -0,0 +1,875 @@
+<template>
+  <!-- 类型管理 -->
+  <div class="app-container" id="toolsType">
+    <el-row :gutter="20">
+      <!--树数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="peopleName"
+            placeholder="请输入人员名称"
+            clearable
+            maxlength="50"
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container" style>
+          <div class="grid-content bg-purple-dark" align="left">组织人员树</div>
+          <el-tree
+            style="height: 700px; overflow: scroll"
+            :data="treeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            :render-content="renderConent"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          ></el-tree>
+        </div>
+      </el-col>
+      <!--树数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="typeName"
+            placeholder="请输入类型名称"
+            clearable
+            maxlength="50"
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container" style>
+          <div class="grid-content bg-purple-dark" align="left">物资类型树</div>
+          <el-tree
+            style="height: 700px; overflow: scroll"
+            :data="treeOptionsTwo"
+            :props="defaultPropsTwo"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNodeTwo"
+            ref="treeTwo"
+            node-key="id"
+            :default-expand-all="false"
+            highlight-current
+            @node-click="handleNodeClickTwo"
+          ></el-tree>
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="16" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="关键字" prop="keyword">
+            <el-input
+              v-model="queryParams.keyword"
+              placeholder="请输入关键字"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleBind"
+              v-hasPermi="['ma:manage:add']"
+            >
+              绑定
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-minus"
+              size="mini"
+              @click="handleNoBind"
+              v-hasPermi="['ma:manage:remove']"
+            >
+              解绑
+            </el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              >导出
+            </el-button>
+          </el-col> -->
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="typeList"
+          ref="multipleTable"
+          row-key="typeId"
+          default-expand-all
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          @selection-change="handleSelectionChange"
+          @select="handlerSelect"
+          @select-all="handlerSelectAll"
+        >
+          <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
+          <el-table-column width="60" align="center" label="序号" type="index">
+            <template slot-scope="scope">
+              <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="施工类型" align="center" show-overflow-tooltip prop="typeName"></el-table-column>
+          <!-- <el-table-column
+            label="物资类型"
+            align="center"
+            show-overflow-tooltip
+            width="100"
+            prop="materialType"
+          ></el-table-column>
+          <el-table-column label="物资名称" align="center" show-overflow-tooltip prop="materialName"></el-table-column>
+          <el-table-column label="规格型号" align="center" show-overflow-tooltip prop="typeName"></el-table-column> -->
+          <el-table-column label="人员" align="center" prop="keeperNickName" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div v-if="scope.row.keeperUserName == null" style="color: red">
+                {{ '请绑定' }}
+              </div>
+              <div v-else>
+                {{ scope.row.keeperUserName }}
+              </div>
+              <!-- <div v-else style="color: red;"></div> -->
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="130">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="warning"
+                icon="el-icon-user-solid"
+                @click="handleUpdateKeep(scope.row)"
+                v-if="scope.row.keeperUserName != null"
+              >
+                库管解绑
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+          :page-sizes="[100]"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+import { getUserByRoleList, getMaUserList } from '@/api/system/user'
+import { getMaTypeList, queryKeeperDataApi, queryKeeperProApi, getListByMaType } from '@/api/ma/base'
+import { bindKeeper, noBindKeeper, getKeeperIds } from '@/api/ma/typeConfigKeeper'
+import { getPersonSettingListApi, bindPersonSettingApi, unBindPersonSettingApi } from '@/api/ma/person-setting'
+import { getUserList } from '@/api/basic/basic'
+import { getInfo } from '@/api/login'
+import { downloadFile } from '@/utils/download'
+export default {
+  name: 'TypeConfigKeeper',
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      totalTemp: 0,
+      countTemp: 1,
+      totalAll: 0,
+      // 库管员用户数据
+      keeperList: null,
+      keeperDataRange: [],
+      keeperProRange: [],
+      keeperMatRange: [],
+      keeperNameRange: [],
+      //维修员用户数据
+      repairUserList: null,
+      //资产类型数据
+      propList: null,
+      // 类型名称
+      typeName: undefined,
+      // 人员名称
+      peopleName: undefined,
+      // 树选项
+      treeOptions: undefined,
+      // 树选项
+      treeOptionsTwo: undefined,
+      //列表数据
+      typeList: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 弹出层标题
+      title: '',
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      chosenTypeId: '',
+      leasePrice: '',
+
+      fileList: [],
+
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      defaultPropsTwo: {
+        children: 'children',
+        label: 'label'
+      },
+      roleIdsTemp: [],
+      userList: [],
+      userNoList: [],
+      userIdTemp: -1,
+      typeIdTemp: -1,
+      maxLength: 100, //已选列表上限，防止数据过多请求报错
+      // 查询参数
+      queryParams: {
+        typeName: '',
+        level: 0,
+        pageNum: 1,
+        pageSize: 1000,
+        displayBindRelationship: true,
+        houseId: '',
+        keyword: ''
+        // phonenumber: undefined,
+        // status: undefined,
+        // typeId: undefined
+      },
+
+      configOpen: false,
+      cform: {
+        price: '',
+        afterPrice: '',
+        useDate: ''
+      },
+      isAllSelect: false,
+      selectionRows: []
+    }
+  },
+  // mounted(){
+  //   this.selectFirstNode();
+  // },
+  watch: {
+    // 根据名称筛选部门树
+    typeName(val) {
+      this.$refs.treeTwo.filter(val)
+    },
+    // 根据名称筛选人员树
+    peopleName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    // this.getInfo()
+    this.getTreeData()
+    this.getTreeDataTwo()
+    // this.getKeeperDataList();
+    // setTimeout(()=>{
+    //     this.getList();
+    // },200)
+  },
+  methods: {
+    // getInfo() {
+    //     getInfo().then((res) => {
+    //         console.log(res, 'companyId----')
+    //         this.companyId = res.user.companyId
+    //     })
+    // },
+    selectFirstNode() {
+      const firstNode = this.$refs.treeTwo.getNode(1)
+      if (firstNode) {
+        this.queryParams.typeId = firstNode.id
+        this.queryParams.level = 0
+        this.queryParams.houseId = firstNode.id
+        this.$refs.treeTwo.setChecked(firstNode, true)
+      }
+    },
+
+    renderConent(h, { node }) {
+      let iconClass = ''
+      // 根据 node 的类型判断图标
+      if (node.data.level == 99) {
+        iconClass = 'el-icon-user-solid'
+      }
+      // else if (node.type === 'file') {
+      //   iconClass = 'el-icon-document';
+      // }
+
+      return (
+        <span>
+          <i class={iconClass}></i> {node.label}
+        </span>
+      )
+    },
+
+    /** 查询物资类型 */
+    async getKeeperDataList(data) {
+      let keepdataRes = await queryKeeperDataApi({
+        // typeId:data.keeperData
+      })
+      this.keeperDataRange = keepdataRes.data.map(item => {
+        return {
+          label: item.houseName,
+          value: item.houseId
+        }
+      })
+      this.form.keeperData = this.keeperDataRange.value
+    },
+
+    async getKeeperDataListTemp(data) {
+      let keepdataRes = await queryKeeperDataApi({
+        // typeId:data.keeperData
+      })
+      this.keeperDataRange = keepdataRes.data.map(item => {
+        return {
+          label: item.houseName,
+          value: item.houseId
+        }
+      })
+      // this.form.keeperData = this.keeperDataRange.value
+
+      let keepproRes = await queryKeeperProApi({
+        houseId: data.keeperDataPro
+      })
+      this.keeperProRange = keepproRes.data.map(item => {
+        return {
+          label: item.typeName,
+          value: item.typeId
+        }
+      })
+      this.form.keeperDataPro = this.keeperProRange.value
+    },
+    /** 查询新增页面-上级类型下拉树结构 */
+    async getTreeData() {
+      const itemName = 'ku_guan_role_ids'
+      await getKeeperIds(itemName).then(response => {
+        console.log(response)
+        const roleIds = response.rows[response.rows.length - 1].itemValue.split(',').map(item => Number(item))
+        this.roleIdsTemp = roleIds
+      })
+      await getUserList({ roleIds: this.roleIdsTemp }).then(response => {
+        this.treeOptions = response.data
+      })
+    },
+    /** 查询新增页面-上级类型下拉树结构 */
+    async getTreeDataTwo() {
+      getMaTypeList().then(response => {
+        // this.treeOptionsTwo = response.data
+        this.treeOptionsTwo = response.data.map(item => this.filterTreeData(item))
+        if (this.treeOptionsTwo.length > 0 && this.treeOptionsTwo[0].children.length > 0) {
+          const firstNode = this.treeOptionsTwo[0].children[0]
+          this.queryParams.typeId = firstNode.id
+          this.queryParams.level = 1
+          this.queryParams.houseId = firstNode.houseId
+          this.getList()
+        }
+      })
+    },
+
+    filterTreeData(data, maxLevel = 1, currentLevel = 1) {
+      if (currentLevel > maxLevel) {
+        return { ...data, children: undefined } // 移除子级
+      }
+      return {
+        ...data,
+        children: data.children?.map(child => this.filterTreeData(child, maxLevel, currentLevel + 1))
+      }
+    },
+    /** 查询列表 */
+    async getList() {
+      this.loading = true
+      this.queryParams.displayBindRelationship = 'true'
+      console.log('queryParams1', this.queryParams)
+      await getPersonSettingListApi(this.queryParams).then(response => {
+        console.log('response', response)
+        this.typeList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 筛选节点 - 左侧树
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件 - 左侧树
+    handleNodeClick(data, node) {
+      // this.queryParams.level = data.level
+      // this.handleQuery();
+      this.$refs.multipleTable.clearSelection()
+      this.userIdTemp = data.id
+      this.queryParams.userId = data.id
+      this.handleQuery()
+    },
+    // 筛选节点 - 左侧树
+    filterNodeTwo(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件 - 左侧树
+    async handleNodeClickTwo(data, node) {
+      if (data.level == 0) {
+        this.queryParams.typeId = data.id
+        this.queryParams.level = data.level
+        this.queryParams.houseId = data.id
+      } else {
+        this.queryParams.typeId = data.id
+        this.queryParams.level = data.level
+        this.queryParams.houseId = data.houseId
+      }
+      this.handleQuery()
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        photoUrl: '',
+        photoName: '',
+        documentUrl: '',
+        documentName: '',
+        parentId: ''
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    async handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.$refs.multipleTable.clearSelection()
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.typeId = undefined
+      this.queryParams.userId = undefined
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 1000
+      this.queryParams.level = 1
+      this.$refs.tree.setCurrentKey(null)
+      this.$refs.treeTwo.setCurrentKey(null)
+      if (this.treeOptionsTwo.length > 0 && this.treeOptionsTwo[0].children.length > 0) {
+        const firstNode = this.treeOptionsTwo[0].children[0]
+        this.queryParams.typeId = firstNode.id
+        this.queryParams.level = 1
+        this.queryParams.houseId = firstNode.houseId
+        this.getList()
+      }
+      this.handleQuery()
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userList = []
+      this.userNoList = []
+      ;(this.selectionRows = selection), (this.ids = selection.map(item => item.typeId))
+
+      selection.forEach(item => {
+        this.userList.push({ typeId: item.typeId, userId: this.userIdTemp })
+      })
+      selection.forEach(item => {
+        if (item.keeperUserId != null) {
+          this.userNoList.push({
+            typeId: item.typeId,
+            userId: item.keeperUserId
+          })
+        }
+      })
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+    },
+
+    //单选操作-跨页
+    handlerSelect(val, row) {
+      const index = this.userList.findIndex(item => item.typeId === row.typeId)
+      if (this.ids.indexOf(row.typeId) === -1) {
+        this.userList.push({ typeId: row.typeId, userId: this.userIdTemp })
+      } else if (index !== -1) {
+        this.userList.splice(index, 1)
+      }
+      const indexNo = this.userNoList.findIndex(item => item.typeId === row.typeId)
+      if (this.ids.indexOf(row.typeId) === -1) {
+        this.userNoList.push({ typeId: row.typeId, userId: row.keeperUserId })
+      } else if (indexNo !== -1) {
+        this.userNoList.splice(indexNo, 1)
+      }
+    },
+
+    //全选操作-跨页
+    handlerSelectAll(val) {
+      if (val.length) {
+        // 进来此处说明:
+        // 1 当前页的全选 2 其他页有数据然后当前页的取消全选
+        // 比较全选或者取消全选与当前页的数据，得到差集
+        // 如果tableData中的数据在val中不存在，则说明是取消全选，需要从currentSelection中移除
+        // 如果tableData中所有的数据都在val中存在，则说明是全选，需要将差集添加到currentSelection中
+        const isAllSelect = this.tableData.every(item => val.some(valItem => valItem.typeId === item.typeId))
+        if (isAllSelect) {
+          // 全选中新增的差集
+          const diff = val.filter(item => !this.userList.some(user => user.typeId === item.typeId))
+          if (this.userList.length + diff.length > this.maxLength) {
+            const spaceLeft = this.maxLength - this.userList.length
+            const toAdd = diff.slice(0, spaceLeft)
+            this.userList = this.userList.concat(
+              toAdd.map(item => ({
+                typeId: item.typeId,
+                userId: this.userIdTemp
+              }))
+            )
+            diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
+          } else {
+            this.userList = this.userList.concat(
+              diff.map(item => ({
+                typeId: item.typeId,
+                userId: this.userIdTemp
+              }))
+            )
+          }
+
+          // 全选中新增的差集
+          const diffNo = val.filter(item => !this.userNoList.some(user => user.typeId === item.typeId))
+          if (this.userNoList.length + diff.length > this.maxLength) {
+            const spaceLeft = this.maxLength - this.userNoList.length
+            const toAdd = diff.slice(0, spaceLeft)
+            this.userNoList = this.userNoList.concat(
+              toAdd.map(item => ({
+                typeId: item.typeId,
+                userId: item.userId
+              }))
+            )
+            diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
+          } else {
+            this.userNoList = this.userNoList.concat(
+              diff.map(item => ({
+                typeId: item.typeId,
+                userId: item.userId
+              }))
+            )
+          }
+        } else {
+          this.userList = this.userList.filter(user => !this.tableData.some(item => item.typeId === user.typeId))
+          this.userNoList = this.userNoList.filter(user => !this.tableData.some(item => item.typeId === user.typeId))
+        }
+      } else {
+        // 进来此处说明:
+        // 其他页并无勾选数据，且当前页取消勾选
+        this.userList = []
+        this.userNoList = []
+      }
+    },
+    // handleSelect(selection, row) {
+    //   this.toggleSelection(selection, row);
+    // },
+    // handleSelectAll(selection) {
+    //   this.isAllSelect = !this.isAllSelect;
+    //   let data = this.typeList;
+    //   this.toggleSelect(data,this.isAllSelect,'all');
+
+    // },
+
+    // //选择某行
+    //   selectTr(selection,row){
+    //       this.$set(row,'isChecked',!row.isChecked);
+    //       this.$nextTick(()=>{
+    //           this.isAllSelect = row.isChecked;
+    //           this.toggleSelect(row,row.isChecked,'tr');
+    //       });
+    //  },
+
+    // //递归子级
+    //   toggleSelect(data,flag,type){
+    //       if(type === 'all'){
+    //           if(data.length > 0){
+    //               data.forEach(item=>{
+    //                   this.toggleSelection(item, flag);
+    //                   if(item.children && item.children.length > 0){
+    //                       this.toggleSelect(item.children,flag,type)
+    //                   }
+    //               })
+    //           }
+    //       }else {
+    //           if(data.children && data.children.length > 0){
+    //               data.children.forEach(item =>{
+    //                   item.isChecked = !item.isChecked;
+    //                   this.$refs.multipleTable.toggleRowSelection(item, flag);
+    //                   this.toggleSelect(item,flag,type);
+    //               })
+    //           }
+    //       }
+    //   },
+
+    //   //改变选中
+    //   toggleSelection(row, flag) {
+    //       this.$set(row,'isChecked',flag);
+    //       this.$nextTick(()=>{
+    //           if (flag) {
+    //               this.$refs.multipleTable.toggleRowSelection(row, flag);
+    //           } else {
+    //               this.$refs.multipleTable.clearSelection();
+    //           }
+    //       });
+    //   },
+
+    /** 绑定按钮操作 */
+    handleBind() {
+      console.log('ids----', this.ids)
+      if (this.userIdTemp == -1) {
+        this.$alert('未勾选绑定人，无法绑定', '提示', {
+          type: 'warning',
+          confirmButtonText: '确定'
+        })
+        return
+      }
+      if (this.ids.length == 0) {
+        this.$alert('未进行勾选相关物资，无法绑定', '提示', {
+          type: 'warning',
+          confirmButtonText: '确定'
+        })
+        return
+      } else {
+        const ids = this.ids.join(',')
+      }
+      console.log('userList', this.userList)
+      //   bindKeeper(this.userList).then(response => {
+      //     this.$modal.msgSuccess('绑定成功')
+      //     this.ids = null
+      //     this.userList = null
+      //     this.userIdTemp = -1
+      //     this.getTreeData()
+      //     this.getList()
+      //     this.$refs.multipleTable.clearSelection()
+      //   })
+      bindPersonSettingApi(this.userList).then(response => {
+        this.$modal.msgSuccess('绑定成功')
+        this.ids = null
+        this.userList = null
+        this.userIdTemp = -1
+        this.getTreeData()
+        this.getList()
+        this.$refs.multipleTable.clearSelection()
+      })
+    },
+
+    /** 解绑按钮操作 */
+    handleNoBind() {
+      if (this.ids.length == 0) {
+        this.$alert('未进行勾选，无法解绑', '提示', {
+          type: 'warning',
+          confirmButtonText: '确定'
+        })
+        return
+      } else {
+        unBindPersonSettingApi(this.userNoList).then(response => {
+          this.$modal.msgSuccess('解绑成功')
+          this.ids = null
+          this.userList = null
+          this.userNoList = null
+          this.getTreeData()
+          this.getList()
+          this.$refs.multipleTable.clearSelection()
+        })
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const typeId = row.typeId
+      const userId = row.repairUserId
+      bindRepair({
+        typeId: typeId,
+        userId: userId
+      }).then(response => {
+        this.$modal.msgSuccess('解绑成功')
+        this.getList()
+      })
+    },
+
+    handleUpdateKeep(row) {
+      const typeId = row.typeId
+      const userId = row.keeperUserId
+      const userTwo = []
+      userTwo.push({
+        typeId: typeId,
+        userId: userId
+      })
+      unBindPersonSettingApi(userTwo).then(response => {
+        this.$modal.msgSuccess('解绑成功')
+        this.getList()
+      })
+    },
+
+    /** 提交按钮 */
+    // submitForm: function () {
+    //   console.log(this.form, "提交参数---");
+    //   this.$refs["form"].validate((valid) => {
+    //     if (valid) {
+    //       if (this.form.typeId != undefined) {
+    //         updateMaType(this.form).then((response) => {
+    //           this.$modal.msgSuccess("修改成功");
+    //           this.open = false;
+    //           this.getList();
+    //           this.getTreeData();
+    //         });
+    //       } else {
+    //         // this.form.companyId = this.companyId
+    //         addMaType(this.form).then((response) => {
+    //           this.$modal.msgSuccess("新增成功");
+    //           this.open = false;
+    //           this.getList();
+    //           this.getTreeData();
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const typeIds = row.typeId;
+    //   this.$modal
+    //     .confirm("是否确认删除数据项？")
+    //     .then(function () {
+    //       return delMaType(typeIds);
+    //     })
+    //     .then(() => {
+    //       this.$modal.msgSuccess("删除成功");
+    //       this.getList();
+    //       this.getTreeData();
+    //     })
+    //     .catch(() => {});
+    // },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      const formatTime = date => {
+        const year = date.getFullYear()
+        const month = String(date.getMonth() + 1).padStart(2, '0')
+        const day = String(date.getDate()).padStart(2, '0')
+        const hours = String(date.getHours()).padStart(2, '0')
+        const minutes = String(date.getMinutes()).padStart(2, '0')
+        const seconds = String(date.getSeconds()).padStart(2, '0')
+        return `${year}${month}${day}_${hours}${minutes}${seconds}`
+      }
+
+      const currentTime = formatTime(new Date())
+      let queryTemp = this.queryParams
+      // queryTemp.level = 0;
+      this.download(
+        '/material/ma_type/export4Keeper',
+        {
+          ...queryTemp
+        },
+        `物资类型信息_${currentTime}.xlsx`
+      )
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+
+::v-deep .btn-items .el-button + .el-button {
+  margin-left: 6px;
+}
+
+.btn-items {
+  margin-left: 4px;
+
+  .el-button--text {
+    font-size: 16px;
+  }
+}
+.grid-content {
+  border-radius: 4px;
+  min-height: 24px;
+}
+.bg-purple-dark {
+  background: #e5e9f2;
+}
+
+::v-deep .el-tree .el-tree-node__expand-icon.expanded {
+  -webkit-transform: rotate(0deg);
+  transform: rotate(0deg);
+}
+
+::v-deep .el-tree .el-icon-caret-right:before {
+  content: '\e783';
+  font-size: 16px;
+}
+
+::v-deep .el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+  content: '\e781';
+  font-size: 16px;
+  color: #1890ff;
+}
+
+::v-deep .el-tree-node__content > .el-tree-node__expand-icon {
+  color: #1890ff !important;
+}
+
+::v-deep .el-tree-node__expand-icon.is-leaf {
+  color: transparent !important;
+}
+
+::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  background-color: #8decf1;
+}
+</style>
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index 987f8bb3..a8aec5cb 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -201,12 +201,12 @@
         <el-col :span="1.5">
             <el-button type="primary" size="mini" @click="codeQuery">查询</el-button>
         </el-col>
-        <el-col :span="1.5" v-if="!isView">
+        <!-- <el-col :span="1.5" v-if="!isView">
             <el-button type="danger" size="mini"  @click="codeUnBind">解绑</el-button>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-table border max-height="600px" :data="viewCodeList" row-key="id" @selection-change="codeSelection">
-        <el-table-column type="selection" width="55" align="center" v-if="!isView" :selectable="selectable"/>
+        <!-- <el-table-column type="selection" width="55" align="center" v-if="!isView" :selectable="selectable"/> -->
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column align="center" label="类型名称" prop="maTypeName" />
         <el-table-column align="center" label="规格型号" prop="typeName" />
diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
index d49b7f44..eeac41ae 100644
--- a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
+++ b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
@@ -324,8 +324,9 @@ export default {
       uploadUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传的图片服务器地址
       upload: {
         // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
-      }
+        headers: { Authorization: 'Bearer ' + getToken() }
+      },
+      equipmentListTemp: []
     }
   },
   computed: {
@@ -438,10 +439,13 @@ export default {
         } else {
           const newItem = {
             ...typeData,
-            scrapNum: 0
+            scrapNum: 0,
+            isNew: true
           }
+
           // 将新项添加到数组开头，实现倒序
           this.equipmentList.unshift(newItem)
+
           this.deviceType.push(lastSelected)
           this.$message({
             message: `已添加 ${typeData.typeName}`,
@@ -451,6 +455,8 @@ export default {
           this.getDeviceCodeOptions(newItem).then(options => {
             this.$set(newItem, 'deviceCodeOptions', options)
           })
+
+          console.log('this.equipmentList', this.equipmentList)
         }
       }
 
@@ -489,6 +495,7 @@ export default {
             deviceCodeOptions: [] // 初始化设备编码选项
           }
         })
+
         // 为每个设备项获取设备编码选项
         for (let i = 0; i < this.equipmentList.length; i++) {
           if (this.equipmentList[i].manageType == '0') {
@@ -511,6 +518,10 @@ export default {
       // }
     },
 
+    getEquipmentListTemp() {
+      return this.equipmentList
+    },
+
     /** 保存按钮操作 */
     handleSave() {
       // console.log(this.equipmentList)
@@ -765,17 +776,17 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const formatTime = (date) => {
-        const year = date.getFullYear();
-        const month = String(date.getMonth() + 1).padStart(2, '0');
-        const day = String(date.getDate()).padStart(2, '0');
-        const hours = String(date.getHours()).padStart(2, '0');
-        const minutes = String(date.getMinutes()).padStart(2, '0');
-        const seconds = String(date.getSeconds()).padStart(2, '0');
-        return `${year}${month}${day}_${hours}${minutes}${seconds}`;
-      };
+      const formatTime = date => {
+        const year = date.getFullYear()
+        const month = String(date.getMonth() + 1).padStart(2, '0')
+        const day = String(date.getDate()).padStart(2, '0')
+        const hours = String(date.getHours()).padStart(2, '0')
+        const minutes = String(date.getMinutes()).padStart(2, '0')
+        const seconds = String(date.getSeconds()).padStart(2, '0')
+        return `${year}${month}${day}_${hours}${minutes}${seconds}`
+      }
 
-      const currentTime = formatTime(new Date());
+      const currentTime = formatTime(new Date())
       this.download(
         '/material/purchase_check_info/exportDetails',
         { taskId: this.taskId },
diff --git a/src/views/material/repair/inventoryScrap/index.vue b/src/views/material/repair/inventoryScrap/index.vue
index 6f497a36..2df40097 100644
--- a/src/views/material/repair/inventoryScrap/index.vue
+++ b/src/views/material/repair/inventoryScrap/index.vue
@@ -1,11 +1,7 @@
 <template>
   <!-- 盘点报废管理 -->
   <div class="app-container">
-    <PageHeaderApply
-      v-if="isShowComponent != 'Home'"
-      :pageContent="pageContent"
-      @goBack="goBack"
-    />
+    <PageHeaderApply v-if="isShowComponent != 'Home'" :pageContent="pageContent" @goBack="goBack" />
     <component
       :is="isShowComponent"
       :isEdit="isEdit"
@@ -19,70 +15,80 @@
       @editTools="editTools"
       @addToolsSuccess="addToolsSuccess"
       @queryTools="queryTools"
+      :ref="`${isShowComponent}Ref`"
     />
   </div>
 </template>
-  
+
 <script>
-import PageHeaderApply from "@/components/pageHeaderApply";
-import Home from "./component/homeApply.vue"; // 主列表
-import AddTools from "./component/addToolsApply.vue"; // 新增机具 和 修改机具
-import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
+import PageHeaderApply from '@/components/pageHeaderApply'
+import Home from './component/homeApply.vue' // 主列表
+import AddTools from './component/addToolsApply.vue' // 新增机具 和 修改机具
+import QueryTools from './component/queryToolsApply.vue' // 查询机具 和 验收机具
 export default {
-  name: "InventoryScrap",
+  name: 'InventoryScrap',
   components: {
     Home,
     PageHeaderApply,
     AddTools,
-    QueryTools,
+    QueryTools
   },
   data() {
     return {
-      isShowComponent: "Home",
-      pageContent: "盘点报废申请",
+      isShowComponent: 'Home',
+      pageContent: '盘点报废申请',
       isEdit: false,
-      editTaskId: "",
-      editId: "",
-      queryId: "",
-      queryTaskId: "",
+      editTaskId: '',
+      editId: '',
+      queryId: '',
+      queryTaskId: '',
       isView: false,
-      codingTaskId: "",
-    };
+      codingTaskId: ''
+    }
   },
 
   methods: {
     /* 新增工机具 */
     addTools() {
-      this.isEdit = false;
-      this.editTaskId = "";
-      this.queryTaskId = "";
-      this.pageContent = "报废新增";
-      this.isShowComponent = "AddTools";
+      this.isEdit = false
+      this.editTaskId = ''
+      this.queryTaskId = ''
+      this.pageContent = '报废新增'
+      this.isShowComponent = 'AddTools'
     },
     /* 新增成功 */
     addToolsSuccess() {
-      this.isShowComponent = "Home";
+      this.isShowComponent = 'Home'
     },
     /* 编辑工机具 */
     editTools(taskId, id) {
-      this.isEdit = true;
-      this.pageContent = "报废编辑";
-      this.editTaskId = taskId;
-      this.editId = id;
-      this.isShowComponent = "AddTools";
+      this.isEdit = true
+      this.pageContent = '报废编辑'
+      this.editTaskId = taskId
+      this.editId = id
+      this.isShowComponent = 'AddTools'
     },
     /* 查询工机具 */
     queryTools(taskId, id) {
-      this.isView = true;
-      this.pageContent = "详情信息";
-      this.queryTaskId = taskId;
-      this.queryId = id;
-      this.isShowComponent = "QueryTools";
+      this.isView = true
+      this.pageContent = '详情信息'
+      this.queryTaskId = taskId
+      this.queryId = id
+      this.isShowComponent = 'QueryTools'
     },
     /* 返回按钮 */
     goBack() {
-      this.isShowComponent = "Home";
-    },
-  },
-};
-</script>
\ No newline at end of file
+      if (this.isShowComponent === 'AddTools') {
+        const equipmentListTemp = this.$refs[`${this.isShowComponent}Ref`].getEquipmentListTemp()
+        const isNew = equipmentListTemp.some(item => item.isNew)
+        if (equipmentListTemp.length === 0 || isNew) {
+          this.$message.error('当前页面有未保存的报废信息，请先保存！')
+          return
+        }
+      } else {
+        this.isShowComponent = 'Home'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 520ab763..06658083 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -84,7 +84,7 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
           <el-table-column type="selection" width="50" align="center"/>
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="false"/>
+          <el-table-column label="序号" align="center" type="index" :index="index => (queryParams.pageNum - 1) * queryParams.pageSize + index + 1" v-if="columns[0].visible"/>
           <el-table-column label="登录名" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                            :show-overflow-tooltip="true"
           />
@@ -404,7 +404,7 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
+        { key: 0, label: `序号`, visible: true },
         { key: 1, label: `登录名`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },