优化

2025-11-28 17:12:21 +08:00 · 2025-11-28 17:12:21 +08:00 · 55fe44c055
parent 972d6f829a
commit 55fe44c055
57 changed files with 234 additions and 156 deletions
--- a/src/views/business-examine/direct-rotation-apply/index.vue
+++ b/src/views/business-examine/direct-rotation-apply/index.vue
@ -49,7 +49,7 @@
            </el-form-item>
        </el-form>

-        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
            <!-- 多选 -->
            <!-- <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" /> -->
            <el-table-column
@ -119,6 +119,7 @@ export default {
    name: 'Direct-rotation-apply',
    data() {
        return {
+            loading: false,
            userId: '',
            timeRange: [],
            // 表格数据
@ -193,6 +194,7 @@ export default {
        // 获取列表
        async getList() {
            try {
+                this.loading = true
                const params = {
                    ...this.queryParams,
                    // startTime: this.timeRange ? this.timeRange[0] : '',
@ -204,6 +206,8 @@ export default {
            } catch (error) {
                this.tableList = []
                this.total = 0
+            } finally {
+                this.loading = false
            }
        },
        // 多选
--- a/src/views/business-examine/lose-apply/index.vue
+++ b/src/views/business-examine/lose-apply/index.vue
@ -49,7 +49,7 @@
            </el-form-item>
        </el-form>

-        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
            <!-- 多选 -->
            <!-- <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" /> -->
            <el-table-column
@ -119,6 +119,7 @@ export default {
    name: 'Lose-apply',
    data() {
        return {
+            loading: false,
            userId: '',
            timeRange: [],
            // 表格数据
@ -191,6 +192,7 @@ export default {
        // 获取列表
        async getList() {
            try {
+                this.loading = true
                const params = {
                    ...this.queryParams,
                    // startTime: this.timeRange ? this.timeRange[0] : '',
@ -203,6 +205,8 @@ export default {
            } catch (error) {
                this.tableList = []
                this.total = 0
+            } finally {
+                this.loading = false
            }
        },
        // 多选
--- a/src/views/business-examine/receive-apply/index.vue
+++ b/src/views/business-examine/receive-apply/index.vue
@ -49,7 +49,7 @@
            </el-form-item>
        </el-form>

-        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+        <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
            <!-- <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" /> -->
            <el-table-column
                width="55"
@ -118,6 +118,7 @@ export default {
    name: 'Receive-apply',
    data() {
        return {
+            loading: false,
            total: 0, // 总条数
            userId: '',
            // 表格数据
@ -244,6 +245,7 @@ export default {
        // 获取列表
        async getList() {
            try {
+                this.loading = true
                const params = {
                    ...this.queryParams,
                    // startTime: this.timeRange ? this.timeRange[0] : '',
@ -255,6 +257,8 @@ export default {
            } catch (error) {
                this.tableList = []
                this.total = 0
+            } finally {
+                this.loading = false
            }
        },
        // 多选
--- a/src/views/business/businessHandling/directApply.vue
+++ b/src/views/business/businessHandling/directApply.vue
@ -271,7 +271,7 @@
            </el-row>
            <el-row :gutter="10" class="mb8">
                <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
-                    <el-form-item label="物资类型" prop="maId">
+                    <el-form-item label="物资名称" prop="maId">
                        <treeselect
                            v-model="queryParams.maId"
                            :options="materialTypeOpts"
@ -282,7 +282,7 @@
                            noChildrenText="没有数据了"
                            noOptionsText="没有数据"
                            noResultsText="没有搜索结果"
-                            placeholder="请选择物资类型"
+                            placeholder="请选择物资名称"
                            @select="selectMaType"
                        />
                    </el-form-item>
@ -474,7 +474,7 @@ export default {
            //租赁工程
            projectList: [],
            leaseProjectList: [],
-            // 物资类型
+            // 物资名称
            materialTypeOpts: [],
            // 类型规格
            typeModelNameOpts: [],
@ -483,7 +483,7 @@ export default {
            // 表头
            tableColumns: [
                { label: '直转数量', prop: 'directNum' },
-                { label: '类型名称', prop: 'typeName' },
+                { label: '物资名称', prop: 'typeName' },
                { label: '规格型号', prop: 'typeModelName' },
                { label: '设备编码', prop: 'maCode' },
                { label: '计量单位', prop: 'unitName' },
@ -505,7 +505,7 @@ export default {
            queryParams: {
                pageNum: 1, // 当前页码
                pageSize: 20, // 每页显示数量
-                maId: undefined, // 物资类型
+                maId: undefined, // 物资名称
                typeId: '', // 类型规格
                keyWord: ''
            },
@ -995,7 +995,7 @@ export default {
                this.loading = false
            }
        },
-        // 获取物资类型
+        // 获取物资名称
        async getMaTypeOpt() {
            try {
                const params = {
--- a/src/views/business/businessHandling/groundDirect.vue
+++ b/src/views/business/businessHandling/groundDirect.vue
@ -185,7 +185,7 @@
            </el-row>
            <el-row :gutter="10" class="mb8">
                <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
-                    <el-form-item label="物资类型" prop="maId">
+                    <el-form-item label="物资名称" prop="maId">
                        <treeselect
                            v-model="queryParams.maId"
                            :options="materialTypeOpts"
@ -196,7 +196,7 @@
                            noChildrenText="没有数据了"
                            noOptionsText="没有数据"
                            noResultsText="没有搜索结果"
-                            placeholder="请选择物资类型"
+                            placeholder="请选择物资名称"
                            @select="selectMaType"
                        />
                    </el-form-item>
@ -381,7 +381,7 @@ export default {
            //租赁工程
            projectList: [],
            leaseProjectList: [],
-            // 物资类型
+            // 物资名称
            materialTypeOpts: [],
            // 类型规格
            typeModelNameOpts: [],
@ -390,7 +390,7 @@ export default {
            // 表头
            tableColumns: [
                { label: '直转数量', prop: 'directNum' },
-                { label: '类型名称', prop: 'typeName' },
+                { label: '物资名称', prop: 'typeName' },
                { label: '规格型号', prop: 'typeModelName' },
                { label: '设备编码', prop: 'maCode' },
                { label: '计量单位', prop: 'unitName' },
@ -412,7 +412,7 @@ export default {
            queryParams: {
                pageNum: 1, // 当前页码
                pageSize: 20, // 每页显示数量
-                maId: undefined, // 物资类型
+                maId: undefined, // 物资名称
                typeId: '', // 类型规格
                keyWord: ''
            },
@ -698,7 +698,7 @@ export default {
                this.loading = false
            }
        },
-        // 获取物资类型
+        // 获取物资名称
        async getMaTypeOpt() {
            try {
                const params = {
--- a/src/views/business/businessHandling/index.vue
+++ b/src/views/business/businessHandling/index.vue
@ -292,12 +292,12 @@
        <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange" :max-height="600">
          <!-- <el-table-column type="selection" width="55" align="center" /> -->
          <el-table-column align="center" label="序号" type="index" width="55" />
-          <el-table-column align="center" label="类型名称" prop="maTypeName" show-overflow-tooltip>
+          <el-table-column align="center" label="物资名称" prop="maTypeName" show-overflow-tooltip>
            <template v-slot="scope">
              <el-cascader
                v-if="scope.row.isManual == 1"
                v-model="scope.row.maTypeIds"
-                placeholder="请选择类型名称"
+                placeholder="请选择物资名称"
                :options="maTypeList"
                :props="{ label: 'typeName', value: 'typeId' }"
                filterable
@ -600,7 +600,7 @@ export default {
        ],
        deviceType: [{ required: true, message: '请选择类型规格', trigger: 'blur' }]
      },
-      maTypeList: [], // 类型名称
+      maTypeList: [], // 物资名称
      // 规格型号
      typeList: [],
      dialogVisible: false, // 弹框
@ -608,7 +608,7 @@ export default {
      dialogForm: {},
      // 弹框表头
      dialogColumns: [
-        { label: '类型名称', prop: 'maTypeName' },
+        { label: '物资名称', prop: 'maTypeName' },
        { label: '规格型号', prop: 'typeName' },
        { label: '计量单位', prop: 'unitName' },
        { label: '预领数量', prop: 'preNum' },
@ -744,7 +744,7 @@ export default {
    // this.projectInfoList() //单位工程下拉选
    this.equipmentType() //机具类型下拉选
    this.getStandardConfigList() // 标准配置下拉选
-    this.getMaTypeNameOpt() // 类型名称下拉选
+    this.getMaTypeNameOpt() // 物资名称下拉选
    // if (this.isEdit || this.isDetail) {
    //   console.log('isEdit', this.isEdit)
    //   this.getTaskInfo()
@ -847,7 +847,7 @@ export default {
      clearTimeout(this.tooltipTimeout)
      this.currentTooltipItem = null
    },
-    // 获取类型名称-tree
+    // 获取物资名称-tree
    async getMaTypeNameOpt() {
      try {
        const res = await getEquipmentThreeTypeThree()
@ -872,7 +872,7 @@ export default {
    // async getTypeList(row, typeIds) {
    //   console.log('🚀 ~ getTypeList ~ row:', row)
    //   console.log('🚀 ~ getTypeList ~ typeId:', typeIds[typeIds.length - 1])
-    //   // 递归循环 获取类型名称
+    //   // 递归循环 获取物资名称
    //   const filterData = data => {
    //     data.forEach(item => {
    //       if (item.typeId === typeIds[typeIds.length - 1]) {
@ -898,7 +898,7 @@ export default {
    // },
    async getTypeList(row, typeIds, index) {
      console.log('🚀 ~ getTypeList ~ row:', row)
-      // 递归循环 获取类型名称
+      // 递归循环 获取物资名称
      const filterData = data => {
        data.forEach(item => {
          if (item.typeId === typeIds[typeIds.length - 1]) {
--- a/src/views/business/businessHandlingRecord/directApplyRecord.vue
+++ b/src/views/business/businessHandlingRecord/directApplyRecord.vue
@ -54,7 +54,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

-    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
      <!-- 多选 -->
      <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
      <el-table-column
@ -132,6 +132,7 @@ export default {
  name: 'DirectApplyRecord',
  data() {
    return {
+      loading: false,
      showSearch: true,
      queryParams: {
        pageNum: 1,
@ -184,6 +185,7 @@ export default {
    async getList() {
      console.log('列表-查询', this.queryParams)
      try {
+        this.loading = true
        const params = {
          ...this.queryParams,
          // startTime: this.queryParams.timeRange[0] || '',
@ -197,6 +199,8 @@ export default {
        console.log('🚀 ~ 获取列表 ~ error:', error)
        this.tableList = []
        this.total = 0
+      } finally {
+        this.loading = false
      }
    },
    // 多选
--- a/src/views/business/businessHandlingRecord/index.vue
+++ b/src/views/business/businessHandlingRecord/index.vue
@ -59,7 +59,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

-    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
      <!-- 多选 -->
      <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
      <el-table-column
@ -303,6 +303,7 @@ export default {
  dicts: ['lease_apply_task_status'],
  data() {
    return {
+      loading: false,
      showSearch: true,
      queryParams: {
        pageNum: 1,
@ -373,6 +374,7 @@ export default {
    async getList() {
      console.log('列表-查询', this.queryParams)
      try {
+        this.loading = true
        const params = {
          ...this.queryParams,
          // startTime: this.queryParams.timeRange[0] || '',
@ -386,6 +388,8 @@ export default {
        console.log('🚀 ~ 获取列表 ~ error:', error)
        this.tableList = []
        this.total = 0
+      } finally {
+        this.loading = false
      }
    },
    // 多选
--- a/src/views/business/businessHandlingRecord/loseHandlingRecord.vue
+++ b/src/views/business/businessHandlingRecord/loseHandlingRecord.vue
@ -54,7 +54,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

-    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650">
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
      <!-- 多选 -->
      <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
      <el-table-column
@ -132,6 +132,7 @@ export default {
  name: 'LoseHandlingRecord',
  data() {
    return {
+      loading: false,
      showSearch: true,
      queryParams: {
        pageNum: 1,
@ -183,6 +184,7 @@ export default {
    async getList() {
      console.log('列表-查询', this.queryParams)
      try {
+        this.loading = true
        const params = {
          ...this.queryParams,
          // startTime: this.queryParams.timeRange[0] || '',
@ -196,6 +198,8 @@ export default {
        console.log('🚀 ~ 获取列表 ~ error:', error)
        this.tableList = []
        this.total = 0
+      } finally {
+        this.loading = false
      }
    },
    // 多选
--- a/src/views/business/exitPermit/index.vue
+++ b/src/views/business/exitPermit/index.vue
@ -194,7 +194,7 @@ import { formatTime } from '@/utils/bonus'

 export default {
  components: { vueEasyPrint },
-  name: 'IdCardUploadComponent',
+  name: 'ExitPermit',
  data() {
    const validateCodeList = (rule, value, callback) => {
      if ((!value || value.length === 0) && !this.form.remark) {
--- a/src/views/business/handlingOrder/index.vue
+++ b/src/views/business/handlingOrder/index.vue
@ -239,7 +239,7 @@ import printJS from "print-js";
 import {delType} from "@/api/system/dict/type";
 export default {
  components: { vueEasyPrint },
-  name: 'IdCardUploadComponent',
+  name: 'HandlingOrder',
  data() {
    return {
      // 非单个禁用
--- a/src/views/business/leasePublish/component/homeApply.vue
+++ b/src/views/business/leasePublish/component/homeApply.vue
@ -82,7 +82,7 @@
      <el-table-column label="实施单位" align="center" prop="impUnitName" width="120px" :show-overflow-tooltip="true"/>
      <el-table-column label="申请项目部" align="center" prop="leaseUnit" width="150px"/>
      <el-table-column label="申请工程" align="center" prop="leaseProject" width="150px"/>
-      <el-table-column label="领料物资类型" align="center" prop="maTypeNames" width="150px" :show-overflow-tooltip="true"/>
+      <el-table-column label="类型名称" align="center" prop="maTypeNames" width="150px" :show-overflow-tooltip="true"/>
      <!-- <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true"/> -->
      <el-table-column label="申请人"   align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
      <el-table-column label="申请人电话" align="center" prop="phone" width="100px" :show-overflow-tooltip="true">
--- a/src/views/material/cost/component/leaseCostRangeReportHome.vue
+++ b/src/views/material/cost/component/leaseCostRangeReportHome.vue
@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="leaseCostRangeReportList">
+    <div class="" id="leaseCostRangeReportList">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
            <el-form-item label="查询时间范围" prop="startDate">
                <el-date-picker
--- a/src/views/material/cost/component/lostReportHome.vue
+++ b/src/views/material/cost/component/lostReportHome.vue
@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="lostReportList">
+    <div class="" id="lostReportList">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
            <el-form-item prop="unitIds">
                <treeselect
--- a/src/views/material/cost/component/repairReportHome.vue
+++ b/src/views/material/cost/component/repairReportHome.vue
@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="repairReportList">
+    <div class="" id="repairReportList">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
            <el-form-item prop="unitIds">
                <treeselect
--- a/src/views/material/cost/component/scrapReportHome.vue
+++ b/src/views/material/cost/component/scrapReportHome.vue
@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="scrapReportList">
+    <div class="" id="scrapReportList">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
            <el-form-item prop="unitIds">
                <treeselect
--- a/src/views/material/countersign/process/index.vue
+++ b/src/views/material/countersign/process/index.vue
@ -62,7 +62,7 @@
        </template>
      </el-table-column>
      <el-table-column
-        label="会签流程"
+        label="流程名称"
        align="center"
        prop="processName"
        sortable
--- a/src/views/material/ma/device/index.vue
+++ b/src/views/material/ma/device/index.vue
@ -1,13 +1,14 @@
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item prop="keyWord">
+      <el-form-item label="关键字" prop="keyWord">
        <el-input
          v-model="queryParams.keyWord"
          placeholder="请输入关键词"
          clearable
          @keyup.enter.native="handleQuery"
          maxlength="20"
+          style="width: 240px"
        />
      </el-form-item>
      <el-form-item label="施工类型" prop="lineTypes">
@ -102,8 +103,8 @@
 <!--        </el-select>-->
 <!--      </el-form-item>-->

-      <el-form-item prop="isAssets">
-        <el-select v-model="queryParams.isAssets" placeholder="是否固定资产" clearable>
+      <el-form-item label="固定资产" prop="isAssets">
+        <el-select v-model="queryParams.isAssets" placeholder="是否固定资产" clearable style="width: 240px">
          <el-option label="是" value="0"></el-option>
          <el-option label="否" value="1"></el-option>
        </el-select>
@ -138,8 +139,8 @@
 <!--        </el-select>-->
 <!--      </el-form-item>-->

-      <el-form-item prop="maStatus">
-        <el-select v-model="queryParams.maStatus" placeholder="请选择设备状态" clearable filterable>
+      <el-form-item label="设备状态" prop="maStatus">
+        <el-select v-model="queryParams.maStatus" placeholder="请选择设备状态" clearable filterable style="width: 240px">
          <el-option
            :key="dict.value"
            :label="dict.label"
--- a/src/views/material/ma/partType/index.vue
+++ b/src/views/material/ma/partType/index.vue
@ -178,7 +178,7 @@
            show-overflow-tooltip
          />
          <el-table-column
-            label="备注信息"
+            label="备注"
            align="center"
            prop="remark"
            show-overflow-tooltip
@ -254,10 +254,10 @@

        <el-row :gutter="24">
          <el-col :span="20">
-            <el-form-item label="名称" prop="paName">
+            <el-form-item label="规格型号" prop="paName">
              <el-input
                v-model="form.paName"
-                placeholder="请输入名称"
+                placeholder="请输入规格型号"
                maxlength="20"
              >
              </el-input>
--- a/src/views/material/materialStation/authorize/index.vue
+++ b/src/views/material/materialStation/authorize/index.vue
@ -80,7 +80,7 @@
      <el-table-column label="申请人" align="center" prop="createBy" show-overflow-tooltip />
      <el-table-column label="领用单位" align="center" prop="leaseUnit" width="200" />
      <el-table-column label="领用工程" align="center" prop="leaseProject" width="200" />
-      <el-table-column label="领用物资类型" align="center" prop="maTypeNames" show-overflow-tooltip />
+      <el-table-column label="物资名称" align="center" prop="maTypeNames" show-overflow-tooltip />
      <el-table-column label="业务单号" align="center" prop="code" show-overflow-tooltip />
      <el-table-column label="领料人" align="center" prop="leasePerson" show-overflow-tooltip />
      <el-table-column label="领料人电话" align="center" prop="phone" width="110" />
@ -596,7 +596,7 @@ import vueEasyPrint from 'vue-easy-print'
 import {getLeaseTask} from "@/api/business";
 export default {
  components: { vueEasyPrint },
-  name: 'IdCardUploadComponent',
+  name: 'Authorize',
  data() {
    return {
      // 非单个禁用
--- a/src/views/material/part/partAccept/detail.vue
+++ b/src/views/material/part/partAccept/detail.vue
@ -359,8 +359,9 @@ export default {
    // },
    // 返回列表页
    jumpList() {
-      const obj = { path: "/part/partAccept" };
-      this.$tab.closeOpenPage(obj);
+      this.$router.push({ name: 'PartAccept' }).then(() => {
+        this.$tab.closePage({ path: '/part/partAcceptDetail' })
+      })
    },
    getPartType() {
      getPartType({ level: 3 }).then((response) => {
--- a/src/views/material/part/partAccept/index.vue
+++ b/src/views/material/part/partAccept/index.vue
@ -358,7 +358,7 @@ import { getToken } from '@/utils/auth'
        handleUpdate(row){
            console.log(row)
            let query = { Id:row.id,taskId: row.taskId,isView:"false" }
-            this.$tab.closeOpenPage({
+            this.$router.push({
                path: '/part/partAcceptDetail',
                query,
            })
@ -367,7 +367,7 @@ import { getToken } from '@/utils/auth'
        handleView(row){
            console.log(row)
            let query = { Id:row.id,taskId: row.taskId,isView:"true" }
-            this.$tab.closeOpenPage({
+            this.$router.push({
                path: '/part/partAcceptDetail',
                query,
            })
--- a/src/views/material/part/partAcceptTwo/detail.vue
+++ b/src/views/material/part/partAcceptTwo/detail.vue
@ -42,7 +42,7 @@

        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
-            <el-button type="primary" size="mini" icon="el-icon-back" @click="jumpList">配件验收</el-button>
+            <el-button type="primary" size="mini" icon="el-icon-back" @click="jumpList(false)">配件验收</el-button>
          </el-col>
          <!-- <el-col :span="1.5">
            <el-button
@ -399,9 +399,11 @@ export default {
      }
    },
    // 返回列表页
-    jumpList() {
-      const obj = { path: '/part/partAcceptTwo' }
-      this.$tab.closeOpenPage(obj)
+    jumpList(isReset) {
+      const params = isReset ? { isReset: true } : {}
+      this.$router.push({ name: 'PartAcceptTwo', params }).then(() => {
+        this.$tab.closePage({ path: '/part/partAcceptDetailTwo' })
+      })
    },
    getPartType() {
      getPartType({ level: 3 }).then(response => {
@ -550,7 +552,7 @@ export default {
          this.getList()
          this.$refs.multipleTable.clearSelection()
          // 返回
-          this.jumpList()
+          this.jumpList(true)
        }
      })
    },
--- a/src/views/material/part/partAcceptTwo/index.vue
+++ b/src/views/material/part/partAcceptTwo/index.vue
@ -315,6 +315,13 @@ import { getToken } from '@/utils/auth'
        }
      };
    },
+    // 激活
+    activated() {
+      console.log('🚀 ~ this.$route.params:', this.$route.params)
+      if (this.$route.params.isReset) {
+        this.resetQuery()
+      }
+    },
    created() {
      this.getList();
    },
@ -370,7 +377,7 @@ import { getToken } from '@/utils/auth'
        handleUpdate(row){
            console.log(row)
            let query = { Id:row.id,taskId: row.taskId,isView:"false" }
-            this.$tab.closeOpenPage({
+            this.$router.push({
                path: '/part/partAcceptDetailTwo',
                query,
            })
@ -379,7 +386,7 @@ import { getToken } from '@/utils/auth'
        handleView(row){
            console.log(row)
            let query = { Id:row.id,taskId: row.taskId,isView:"true" }
-            this.$tab.closeOpenPage({
+            this.$router.push({
                path: '/part/partAcceptDetailTwo',
                query,
            })
--- a/src/views/material/part/partArrived/index.vue
+++ b/src/views/material/part/partArrived/index.vue
@ -6,20 +6,23 @@
      :pageContent="pageContent"
      @goBack="goBack"
    />
-    <component 
-            :is="isShowComponent" 
-            :isEdit="isEdit"
-            :editTaskId="editTaskId"
-            :editId="editId"
-            :queryTaskId="queryTaskId"
-            :queryId="queryId"
-            :isView="isView"
-            :codingTaskId="codingTaskId"
-            @addTools="addTools"
-            @editTools="editTools"
-            @addToolsSuccess="addToolsSuccess"
-            @queryTools="queryTools"
-    />
+    <keep-alive include="Home">
+      <component 
+        ref="componentRef"
+        :is="isShowComponent" 
+        :isEdit="isEdit"
+        :editTaskId="editTaskId"
+        :editId="editId"
+        :queryTaskId="queryTaskId"
+        :queryId="queryId"
+        :isView="isView"
+        :codingTaskId="codingTaskId"
+        @addTools="addTools"
+        @editTools="editTools"
+        @addToolsSuccess="addToolsSuccess"
+        @queryTools="queryTools"
+      />
+    </keep-alive>
  </div>
 </template>
  
@ -62,6 +65,9 @@ export default {
      /* 新增成功 */
      addToolsSuccess() {
          this.isShowComponent = 'Home'
+          this.$nextTick(() => {
+            this.$refs.componentRef.resetQuery()
+          })
      },
      /* 编辑配件新购 */
      editTools(taskId,id) {
--- a/src/views/material/part/partInventory/index.vue
+++ b/src/views/material/part/partInventory/index.vue
@ -54,7 +54,7 @@
  import {getPartPersonNumApi} from '@/api/part/partArrived';
 import vueEasyPrint from "vue-easy-print";
  export default {
-    name: "PartAccept",
+    name: "PartInventory",
    dicts: ['part_task_status'],
    components: { vueEasyPrint },
    data() {
--- a/src/views/material/part/partLease/component/addToolsApply.vue
+++ b/src/views/material/part/partLease/component/addToolsApply.vue
@ -233,6 +233,11 @@ export default {
        .then(() => {
          this.getTaskInfo();
          this.$modal.msgSuccess("通过成功");
+          setTimeout(() => {
+            if (this.equipmentList.every((item) => item.status != 0)) {
+              this.$emit('isReset')
+            }
+          }, 200)
        })
        .catch(() => {});
    },
@ -251,6 +256,11 @@ export default {
        .then(() => {
          this.getTaskInfo();
          this.$modal.msgSuccess("驳回成功");
+          setTimeout(() => {
+            if (this.equipmentList.every((item) => item.status != 0)) {
+              this.$emit('isReset')
+            }
+          }, 200)
        })
        .catch(() => {});
    },
@ -273,6 +283,7 @@ export default {
            this.$modal.msgSuccess("通过成功");
          }
          this.getTaskInfo();
+          this.$emit('isReset')
        });
      }
    },
--- a/src/views/material/part/partLease/index.vue
+++ b/src/views/material/part/partLease/index.vue
@ -6,19 +6,23 @@
      :pageContent="pageContent"
      @goBack="goBack"
    />
-    <component
-      :is="isShowComponent"
-      :isEdit="isEdit"
-      :editTaskId="editTaskId"
-      :editId="editId"
-      :queryTaskId="queryTaskId"
-      :queryId="queryId"
-      :param="param"
-      :isView="isView"
-      :codingTaskId="codingTaskId"
-      @addTools="addTools" 
-      @queryTools="queryTools"
-    />
+    <keep-alive include="Home">
+      <component
+        ref="componentRef"
+        :is="isShowComponent"
+        :isEdit="isEdit"
+        :editTaskId="editTaskId"
+        :editId="editId"
+        :queryTaskId="queryTaskId"
+        :queryId="queryId"
+        :param="param"
+        :isView="isView"
+        :codingTaskId="codingTaskId"
+        @addTools="addTools" 
+        @queryTools="queryTools"
+        @isReset="isReset"
+      />
+    </keep-alive>
  </div>
 </template>

@ -73,6 +77,12 @@ export default {
    goBack() {
      this.isShowComponent = "Home";
    },
+    isReset() {
+      this.isShowComponent = "Home"
+      this.$nextTick(() => {
+        this.$refs.componentRef.resetQuery()
+      })
+    }
  },
 };
 </script>
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@ -85,7 +85,7 @@
        </el-table-column>
        <el-table-column label="到货时间" align="center" prop="arrivalTime" width="90" :show-overflow-tooltip="true"/>
        <el-table-column label="采购单号" align="center" prop="code" width="130" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="140" :show-overflow-tooltip="true"/>
+        <el-table-column label="物资名称" align="center" prop="purchaseMaTypeName" min-width="140" :show-overflow-tooltip="true"/>
        <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="80" :show-overflow-tooltip="true"/>
        <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
        <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@ -95,9 +95,9 @@
    <el-table v-loading="loading" :data="typeList" border>
      <!-- <el-table-column type="selection" width="55" align="center" /> -->
      <el-table-column width="50" align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
-      <el-table-column align="center" width="110" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/>
+      <el-table-column align="center" width="110" label="到货日期" prop="arrivalTime" :show-overflow-tooltip="true"/>
      <el-table-column label="采购单号" width="150" align="center" prop="code" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购物资" align="center" width="180" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
+      <el-table-column label="物资名称" align="center" width="180" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
      <el-table-column label="采购数量" align="center" width="80" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
      <el-table-column label="采购价格(元含税)" align="center" width="100" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
      <el-table-column label="采购价格(元不含税)" align="center" width="100" prop="purchasePrice" :show-overflow-tooltip="true"/>
--- a/src/views/material/purchase/goodsBind/component/home.vue
+++ b/src/views/material/purchase/goodsBind/component/home.vue
@ -119,7 +119,7 @@
            <el-table-column align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
            <el-table-column
                align="center"
-                label="到货时间"
+                label="到货日期"
                prop="arrivalTime" width="180"
                show-overflow-tooltip
            />
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@ -79,7 +79,7 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="到货时间" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true" />
+      <el-table-column label="到货日期" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true" />
      <el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true" />
      <el-table-column
        label="采购物资"
--- a/src/views/material/repair/scrapManage/component/addToolsApply.vue
+++ b/src/views/material/repair/scrapManage/component/addToolsApply.vue
@ -374,6 +374,7 @@ export default {
              this.$modal.msgSuccess("通过成功");
            }
            this.getTaskInfo();
+            this.$emit('reset')
          })
        })
      }
@ -393,6 +394,7 @@ export default {
              this.$modal.msgSuccess("驳回成功");
            }
            this.getTaskInfo();
+            this.$emit('reset')
          })
        })
      }
--- a/src/views/material/repair/scrapManage/index.vue
+++ b/src/views/material/repair/scrapManage/index.vue
@ -6,20 +6,24 @@
      :pageContent="pageContent"
      @goBack="goBack"
    />
-    <component
-      :is="isShowComponent"
-      :isEdit="isEdit"
-      :editTaskId="editTaskId"
-      :editId="editId"
-      :queryTaskId="queryTaskId"
-      :queryId="queryId"
-      :agreementId="agreementId"
-      :param="param"
-      :isView="isView"
-      :codingTaskId="codingTaskId"
-      @addTools="addTools" 
-      @queryTools="queryTools"
-    />
+    <keep-alive include="Home">
+      <component
+        ref="componentRef"
+        :is="isShowComponent"
+        :isEdit="isEdit"
+        :editTaskId="editTaskId"
+        :editId="editId"
+        :queryTaskId="queryTaskId"
+        :queryId="queryId"
+        :agreementId="agreementId"
+        :param="param"
+        :isView="isView"
+        :codingTaskId="codingTaskId"
+        @addTools="addTools" 
+        @queryTools="queryTools"
+        @reset="reset"
+      />
+    </keep-alive>
  </div>
 </template>

@ -75,6 +79,12 @@ export default {
    goBack() {
      this.isShowComponent = "Home";
    },
+    reset() {
+      this.isShowComponent = "Home"
+      this.$nextTick(() => {
+        this.$refs.componentRef.resetQuery()
+      })
+    }
  },
 };
 </script>
--- a/src/views/material/report/leaseOutReport.vue
+++ b/src/views/material/report/leaseOutReport.vue
@ -116,7 +116,7 @@
            <el-table v-loading="loading" :data="dialogList" height="500px">
                <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                </el-table-column>
-                <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+                <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
                <el-table-column label="出库人员" align="center" prop="outPersonName" :show-overflow-tooltip="true"/>
--- a/src/views/material/report/reportQuery.vue
+++ b/src/views/material/report/reportQuery.vue
@ -239,7 +239,7 @@
            >
              <thead>
              <tr>
-                <th style="text-align: center">机具名称</th>
+                <th style="text-align: center">物资名称</th>
                <th style="text-align: center">规格型号</th>
                <th style="text-align: center">单位</th>
                <th style="text-align: center">数量</th>
@ -333,7 +333,7 @@ import QRCode from "qrcodejs2";
 import axios from 'axios'
 import {downloadFile} from "@/utils/download";
 export default {
-  name: "PartAccept",
+  name: "ReportQuery",
  dicts: ['part_task_status'],
  components: { vueEasyPrint },
  data() {
--- a/src/views/material/stquery/deviceComparisonStatistical.vue
+++ b/src/views/material/stquery/deviceComparisonStatistical.vue
@ -183,7 +183,7 @@
          :index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)"
        ></el-table-column>
        <el-table-column label="工程名称" align="center" prop="proName" width="200" />
-        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
        <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
      </el-table>
--- a/src/views/material/stquery/deviceStatusRecord.vue
+++ b/src/views/material/stquery/deviceStatusRecord.vue
@ -1,7 +1,7 @@
 <template>
    <div class="app-container" id="">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item prop="keyWord">
+        <el-form-item label="关键字" prop="keyWord">
            <el-input
              v-model="queryParams.keyWord"
              placeholder="请输入关键字"
@ -296,7 +296,7 @@
        <el-table v-loading="loading" :data="dialogList">
          <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -346,7 +346,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -403,7 +403,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogRepairQuery.pageNum, dialogRepairQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -460,7 +460,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogPurchaseQuery.pageNum, dialogPurchaseQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="新购待入库数量" align="center" prop="inputNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -517,7 +517,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogTestedQuery.pageNum, dialogTestedQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="修试待入库数量" align="center" prop="repairInputNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -576,7 +576,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogToScrapQuery.pageNum, dialogToScrapQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
@ -628,7 +628,7 @@
          <el-table-column label="序号" align="center" width="80" type="index"
            :index="indexContinuation(dialogAuditedQuery.pageNum, dialogAuditedQuery.pageSize)">
          </el-table-column>
-          <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true"/>
          <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
--- a/src/views/materialsStation/equipment/equipmentRecord/index.vue
+++ b/src/views/materialsStation/equipment/equipmentRecord/index.vue
@ -326,7 +326,7 @@
          type="index"
          :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
        ></el-table-column>
-        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
          <template slot-scope="{ row }">
--- a/src/views/materialsStation/straight/straightTransfer/index.vue
+++ b/src/views/materialsStation/straight/straightTransfer/index.vue
@ -421,7 +421,7 @@ export default {
      // 表头
      tableColumns: [
        { label: '直转数量', prop: 'directNum' },
-        { label: '类型名称', prop: 'typeName' },
+        { label: '物资名称', prop: 'typeName' },
        { label: '规格型号', prop: 'typeModelName' },
        { label: '设备编码', prop: 'maCode' },
        { label: '计量单位', prop: 'unitName' },
--- a/src/views/materialsStation/straight/straightTransferReview/index.vue
+++ b/src/views/materialsStation/straight/straightTransferReview/index.vue
@ -170,7 +170,7 @@ export default {
        { label: '转出班组', prop: 'backTeamName', showToolTip: false },
        { label: '转入工程', prop: 'leaseProName', showToolTip: false },
        { label: '转入班组', prop: 'leaseTeamName', showToolTip: false },
-        { label: '物资类型', prop: 'typeName', showToolTip: true },
+        { label: '物资名称', prop: 'typeName', showToolTip: true },
        { label: '状态', prop: 'status', showToolTip: true, width: '80' }
      ]
    }
--- a/src/views/materialsStation/toolsBack/back/component/addReturn.vue
+++ b/src/views/materialsStation/toolsBack/back/component/addReturn.vue
@ -137,7 +137,7 @@
    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
      <el-table-column label="序号" type="index" align="center" min-width="80" />
-      <el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
      <el-table-column label="计量单位" align="center" prop="unitName" />
      <el-table-column label="当前在用量" align="center" prop="num"></el-table-column>
@ -205,7 +205,7 @@
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="序号" type="index" width="55" align="center" />
        <el-table-column
-          label="类型名称"
+          label="物资名称"
          prop="materialName"
          align="center"
          :show-overflow-tooltip="true"
--- a/src/views/materialsStation/toolsBack/back/component/home.vue
+++ b/src/views/materialsStation/toolsBack/back/component/home.vue
@ -116,10 +116,10 @@
        </el-select>
      </el-form-item>

-      <el-form-item label="工器具类型" prop="typeName">
+      <el-form-item label="物资名称" prop="typeName">
        <el-select
          v-model="queryParams.typeName"
-          placeholder="请选择领料工器具类型"
+          placeholder="请选择领料物资名称"
          clearable
          filterable
          style="width: 240px"
@ -188,7 +188,7 @@
      <el-table-column label="退料班组" align="center" prop="teamName" width="200" />
      <el-table-column label="工程名称" align="center" prop="proName" width="200" />
      <el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="工器具类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200" />
+      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" width="200" />
      <el-table-column label="班组长" align="center" prop="backPerson" :show-overflow-tooltip="true" width="100" />
      <el-table-column label="班组长电话" align="center" prop="phone" :show-overflow-tooltip="true" width="120" />
      <el-table-column label="创建时间" align="center" prop="createTime" width="100" />
@ -351,7 +351,7 @@ export default {
        subUnitName:'',//分包单位
        teamName:'',//班组
        proName:'',//工程
-        typeName:''//工器具类型
+        typeName:''//物资名称
      },
      selectTreeProps: {
        children: 'children',
@ -696,7 +696,7 @@ export default {
        subUnitName:'',//分包单位
        teamName:'',//班组
        proName:'',//工程
-        typeName:''//工器具类型
+        typeName:''//物资名称
      }
      this.$store.commit('clzBack/clzBackQueryParams', this.queryParams)
      this.getImpUnitOptions()
--- a/src/views/materialsStation/toolsBack/back/component/queryReturn.vue
+++ b/src/views/materialsStation/toolsBack/back/component/queryReturn.vue
@ -66,7 +66,7 @@
    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
     
      <el-table-column label="序号" type="index" align="center" min-width="80" />
-      <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
      <el-table-column label="规格型号" align="center" prop="typeModel" :show-overflow-tooltip="true" />
      <el-table-column label="计量单位" align="center" prop="unitName" />
      <el-table-column label="当前在用量" align="center" prop="num"></el-table-column>
@ -112,7 +112,7 @@
      <el-table :data="maCodeList" width="100%" height="450px">
        <el-table-column label="序号" type="index" width="55" align="center" />
        <el-table-column
-          label="类型名称"
+          label="物资名称"
          prop="materialName"
          align="center"
          :show-overflow-tooltip="true"
--- a/src/views/materialsStation/toolsBack/back/index.vue
+++ b/src/views/materialsStation/toolsBack/back/index.vue
@ -24,6 +24,7 @@ import Home from './component/home.vue'
 import AddReturn from './component/addReturn.vue'
 import QueryReturn from './component/queryReturn.vue'
 export default {
+  name: 'ToolsBack',
  components: {
    PageHeader,
    Home,
--- a/src/views/materialsStation/toolsBack/back/outRecord.vue
+++ b/src/views/materialsStation/toolsBack/back/outRecord.vue
@ -121,7 +121,7 @@
      <el-form-item label="综合搜索" prop="keyWord">
        <el-input
          v-model="queryParams.keyWord"
-          placeholder="输入『 工器具名称 / 退料工程 / 班组长 / 出库人 / 退料单号 』关键字搜索"
+          placeholder="输入『 物资名称 / 退料工程 / 班组长 / 出库人 / 退料单号 』关键字搜索"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 460px"
@ -144,7 +144,7 @@
          <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="工器具名称" align="center" prop="materialName" :show-overflow-tooltip="true" width="110"/>
+      <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" width="110"/>
      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
      <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
      <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true">
@ -206,7 +206,7 @@
          type="index"
          :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
        ></el-table-column>
-        <el-table-column label="机具名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
        <!-- <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true" /> -->
        <!-- <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" /> -->
@ -232,7 +232,7 @@ import { getBackInfoDetailsApi, getBackInfoDetailsNoPageListApi, getSecondBackIn
    getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList
 } from '@/api/materialsStation'
 export default {
-  name: '',
+  name: 'OutRecord',
  dicts: [],
  data() {
    return {
--- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
@ -158,7 +158,7 @@

    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
      <el-table-column align="center" label="序号" type="index" width="55" />
-      <el-table-column align="center" label="类型名称" prop="maTypeName" show-overflow-tooltip></el-table-column>
+      <el-table-column align="center" label="物资名称" prop="maTypeName" show-overflow-tooltip></el-table-column>
      <el-table-column align="center" label="规格型号" prop="typeName" show-overflow-tooltip />
      <el-table-column align="center" label="计量单位" prop="unitName" />
      <el-table-column align="center" label="当前库存" prop="storageNum" />
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@ -117,10 +117,10 @@
        </el-select>
      </el-form-item>

-      <el-form-item label="领料工器具类型" prop="maTypeNames">
+      <el-form-item label="物资名称" prop="maTypeNames">
        <el-select
          v-model="queryParams.maTypeNames"
-          placeholder="请选择领料工器具类型"
+          placeholder="请选择物资名称"
          clearable
          filterable
          style="width: 240px"
@ -191,7 +191,7 @@
      <el-table-column label="领料班组" align="center" prop="teamName" width="200" />
      <el-table-column label="租赁工程" align="center" prop="projectName" width="200" />
      <el-table-column
-        label="领料工器具类型"
+        label="物资名称"
        align="center"
        prop="maTypeNames"
        :show-overflow-tooltip="true"
@ -275,7 +275,7 @@

            <!-- <el-table :data="leaseApplyDetails" class="table" border style="width: 100%">
            <el-table-column label="序号" align="center" type="index" width="60px" />
-            <el-table-column label="类型名称" align="center" prop="maTypeName" />
+            <el-table-column label="物资名称" align="center" prop="maTypeName" />
            <el-table-column label="规格型号" align="center" prop="typeName" />
            <el-table-column label="计量单位" align="center" prop="unitName" />
            <el-table-column label="预领数量" align="center" prop="preNum" />
@ -291,7 +291,7 @@
              <thead>
                <tr align="center">
                  <th style="width: 60px">序号</th>
-                  <th>类型名称</th>
+                  <th>物资名称</th>
                  <th>规格型号</th>
                  <th>计量单位</th>
                  <th>领料数量</th>
@ -359,7 +359,7 @@
          </div>
          <!-- <el-table :data="getListViewInfo" style="padding: 1px">
            <el-table-column align="center" label="序号" type="index" width="55" />
-            <el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+            <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
            <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
            <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
          </el-table> -->
@ -367,7 +367,7 @@
            <thead>
              <tr align="center">
                <th>序号</th>
-                <th>类型名称</th>
+                <th>物资名称</th>
                <th>规格型号</th>
                <th>设备编码</th>
              </tr>
@ -437,7 +437,7 @@ export default {
        subUnitName:'',//分包单位
        proName:'',//领料工程
        teamName:'',//领料班组
-        maTypeNames:''//领料工器具类型
+        maTypeNames:''//物资名称
      },
      openPrint: false,
      open: false,
@ -541,7 +541,7 @@ export default {
        subUnitName:'',//分包单位
        proName:'',//领料工程
        teamName:'',//领料班组
-        maTypeNames:''//领料工器具类型
+        maTypeNames:''//物资名称
      }
      this.$store.commit('clzApply/clzApplyQueryParams', this.queryParams)
      this.getImpUnitOptions()
--- a/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue
@ -79,7 +79,7 @@
    <el-table v-loading="loading" :data="equipmentList">
      <el-table-column label="序号" align="center" type="index" />
      <el-table-column
-        label="类型名称"
+        label="物资名称"
        align="center"
        prop="maTypeName"
        :show-overflow-tooltip="true"
--- a/src/views/materialsStation/toolsLease/apply/index.vue
+++ b/src/views/materialsStation/toolsLease/apply/index.vue
@ -27,6 +27,7 @@ import Home from './component/homeApply.vue' // 主列表
 import AddTools from './component/addToolsApply.vue' // 新增机具 和 修改机具
 import QueryTools from './component/queryToolsApply.vue' // 查询机具 和 验收机具
 export default {
+  name: 'ToolsLeaseApply',
  components: {
    Home,
    PageHeaderApply,
--- a/src/views/materialsStation/toolsLease/apply/leaseRecord.vue
+++ b/src/views/materialsStation/toolsLease/apply/leaseRecord.vue
@ -146,7 +146,7 @@
          <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="工器具名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
      <!-- <el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" /> -->
      <el-table-column label="出库数量" align="center" prop="outNum" :show-overflow-tooltip="true">
@ -213,7 +213,7 @@
          type="index"
          :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
        ></el-table-column>
-        <el-table-column label="机具名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
        <el-table-column label="出库人员" align="center" prop="outPerson" :show-overflow-tooltip="true" />
@ -237,7 +237,7 @@ import { getLeaseInfoDetailsApi, getLeaseInfoDetailsNoPageListApi, getSecondLeas
 import { formatTime } from '@/utils/bonus'

 export default {
-  name: '',
+  name: 'LeaseRecord',
  dicts: [],
  data() {
    return {
--- a/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue
@ -27,7 +27,7 @@
      >
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
-        <el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
      </el-table>
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@ -179,7 +179,7 @@

    <el-table v-loading="loading" :data="equipmentList">
      <el-table-column align="center" label="序号" type="index" width="55" />
-      <el-table-column align="center" label="类型名称" prop="maTypeName" show-overflow-tooltip></el-table-column>
+      <el-table-column align="center" label="物资名称" prop="maTypeName" show-overflow-tooltip></el-table-column>
      <el-table-column align="center" label="规格型号" prop="typeName" show-overflow-tooltip />
      <el-table-column align="center" label="计量单位" prop="unitName" />
      <el-table-column align="center" label="当前库存" prop="storageNum" />
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@ -117,10 +117,10 @@
        </el-select>
      </el-form-item>

-      <el-form-item label="领料工器具类型" prop="maTypeNames">
+      <el-form-item label="物资名称" prop="maTypeNames">
        <el-select
          v-model="queryParams.maTypeNames"
-          placeholder="请选择领料工器具类型"
+          placeholder="请选择物资名称"
          clearable
          filterable
          style="width: 240px"
@ -188,7 +188,7 @@
      <el-table-column label="领料班组" align="center" prop="teamName" width="200" />
      <el-table-column label="租赁工程" align="center" prop="projectName" width="200" />
      <el-table-column
-        label="领料工器具类型"
+        label="物资名称"
        align="center"
        prop="maTypeNames"
        :show-overflow-tooltip="true"
@ -263,7 +263,7 @@

            <!-- <el-table :data="leaseApplyDetails" class="table" border style="width: 100%">
            <el-table-column label="序号" align="center" type="index" width="60px" />
-            <el-table-column label="类型名称" align="center" prop="maTypeName" />
+            <el-table-column label="物资名称" align="center" prop="maTypeName" />
            <el-table-column label="规格型号" align="center" prop="typeName" />
            <el-table-column label="计量单位" align="center" prop="unitName" />
            <el-table-column label="预领数量" align="center" prop="preNum" />
@ -279,7 +279,7 @@
              <thead>
                <tr align="center">
                  <th style="width: 60px">序号</th>
-                  <th>类型名称</th>
+                  <th>物资名称</th>
                  <th>规格型号</th>
                  <th>计量单位</th>
                  <th>领料数量</th>
@ -347,7 +347,7 @@
          </div>
          <!-- <el-table :data="getListViewInfo" style="padding: 1px">
            <el-table-column align="center" label="序号" type="index" width="55" />
-            <el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+            <el-table-column label="物资名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
            <el-table-column label="规格型号" align="center" prop="materialModel" :show-overflow-tooltip="true" />
            <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
          </el-table> -->
@ -355,7 +355,7 @@
            <thead>
              <tr align="center">
                <th>序号</th>
-                <th>类型名称</th>
+                <th>物资名称</th>
                <th>规格型号</th>
                <th>设备编码</th>
              </tr>
@ -425,7 +425,7 @@ export default {
        proName:'',//领料工程
        subUnitName:'',//分包单位
        teamName:'',//领料班组
-        maTypeNames:''//领料工器具类型
+        maTypeNames:''//物资名称
      },
      openPrint: false,
      open: false,
@ -535,7 +535,7 @@ export default {
        proName:'',//领料工程
        subUnitName:'',//分包单位
        teamName:'',//领料班组
-        maTypeNames:''//领料工器具类型
+        maTypeNames:''//物资名称
      }
      this.$store.commit('clzOutBoubnd/clzOutBoundQueryParams', this.queryParams)
      this.getImpUnitOptions()
--- a/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue
@ -65,7 +65,7 @@
    </el-row>
    <el-table v-loading="loading" :data="equipmentList">
      <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
      <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"></el-table-column>
      <el-table-column
--- a/src/views/materialsStation/toolsLease/outBound/index.vue
+++ b/src/views/materialsStation/toolsLease/outBound/index.vue
@ -29,6 +29,7 @@ import Home from './component/homeApply.vue' // 主列表
 import AddTools from './component/addToolsApply.vue' // 新增机具 和 修改机具
 import QueryTools from './component/queryToolsApply.vue' // 查询机具 和 验收机具
 export default {
+  name: 'ToolsOutBound',
  components: {
    Home,
    PageHeaderApply,
--- a/src/views/warning-analysis/engineering-in-use/safetyToolEarlyWarning.vue
+++ b/src/views/warning-analysis/engineering-in-use/safetyToolEarlyWarning.vue
@ -132,6 +132,7 @@ import { getOverTimeListApi, getMaTypeApi } from '@/api/warning-analysis/enginee
 import { equipmentTypeTree } from '@/api/purchase/goodsArrived'

 export default {
+    name: 'SafetyToolEarlyWarning',
    data() {
        return {
            showSearch: true,