测试问题修改，导航切换

2024-01-22 09:18:46 +08:00 · 2024-01-22 09:18:46 +08:00 · 6b07845e13
parent 03819147ae
commit 6b07845e13
48 changed files with 221 additions and 161 deletions
--- a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
+++ b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="assetAttributeAllocation">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
@ -146,7 +146,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "User",
+  name: "AssetAttributeAllocation",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue
+++ b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="assetAttributeManagement">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="资产类型名称" prop="propName">
        <el-input
@ -121,7 +121,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "Dict",
+  name: "AssetAttributeManagement",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/comeAndGo/index.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="comeAndGo">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -215,7 +215,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Dict",
+  name: "ComeAndGo",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/comeAndGo/people.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/people.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="comeAndGoPeople">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
@ -390,7 +390,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "User",
+  name: "ComeAndGoPeople",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/project/index.vue
+++ b/sgzb-ui/src/views/base/project/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="project">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="名称" prop="proName">
        <el-input
@ -131,7 +131,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Dict",
+  name: "Project",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="section">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -213,7 +213,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Dict",
+  name: "Section",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/base/unit/index.vue
+++ b/sgzb-ui/src/views/base/unit/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="unit">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="名称" prop="name">
        <el-input
@ -101,7 +101,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 import {addUnitType, delUnitType, unitTypeList, updateUnitType,statusUnitType,unitTypeDetail} from "@/api/base/base";
 export default {
-  name: "Dict",
+  name: "Unit",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="constructionSite">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="关键字" prop="dictName">
        <el-input
@ -305,7 +305,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "ConstructionSite",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="agreement">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -226,7 +226,7 @@ import { imgUpLoad,fileUpLoad } from "@/api/system/upload";


 export default {
-  name: "Dict",
+  name: "Agreement",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="receiveApply">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="申请日期" prop="dictName">
        <el-date-picker
@ -96,11 +96,13 @@
      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
      <el-table-column label="审批意见 " align="center" :show-overflow-tooltip="true">
        <template slot-scope="scope">
-          <span v-if="scope.row.taskStatus==30"></span>
+          <span v-if="scope.row.taskStatus<31"></span>
          <span v-if="scope.row.taskStatus==31||scope.row.taskStatus==98">{{ scope.row.leaseApplyInfoList[0].companyAuditRemark }} </span>
          <span v-if="scope.row.taskStatus==32||scope.row.taskStatus==99">{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }} </span>
          <span v-if="scope.row.taskStatus==33||scope.row.taskStatus==100">{{ scope.row.leaseApplyInfoList[0].directAuditRemark }} </span>
-          <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span>
+          <span v-if="scope.row.taskStatus>33&&scope.row.taskStatus<98">{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span>
+          <span v-if="scope.row.taskStatus>100">{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span>
+          <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
@ -198,7 +200,7 @@ import { getLeaseAuditListAll,getUnitData,getProData,deleteTask } from "@/api/cl


 export default {
-  name: "Dict",
+  name: "ReceiveApply",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@ -344,16 +346,13 @@ export default {
    },
    /** 新增按钮操作 */
    handleAdd() {
-      this.$router.push("/claimAndRefund/receive/receiveApplyAdd");
-      this.$router.push({
+      this.$tab.closeOpenPage({
        path:'/claimAndRefund/receive/receiveApplyAdd',
        query:{
          isEdit:true
        }
-      })
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加字典类型";
+      }) 
+
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
@ -362,7 +361,7 @@ export default {
      this.multiple = !selection.length
    },
    handleView(row) {
-      this.$router.push({
+      this.$tab.closeOpenPage({
        path:'/claimAndRefund/receive/receiveApplyAdd',
        query:{
          taskId:row.taskId,
@ -372,7 +371,7 @@ export default {
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
-      this.$router.push({
+      this.$tab.closeOpenPage({
        path:'/claimAndRefund/receive/receiveApplyAdd',
        query:{
          taskId:row.taskId,
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="receiveApplyAdd">
    <el-form :model="queryParams" ref="queryForm" size="small" :rules="queryRules" :inline="true" v-show="showSearch">
      <el-row>
        <el-form-item label="领料单位" prop="unitId">
@ -35,14 +35,14 @@
            ref="deviceTypeCascader"
            filterable></el-cascader>
        </el-form-item>
-        <el-form-item label="领料人" prop="roleName">
+        <el-form-item label="领料人" prop="leasePerson">
          <el-input
            v-model="queryParams.leaseApplyInfo.leasePerson"
            placeholder="请输入领料人"
            clearable 
          />
        </el-form-item>
-        <el-form-item label="领料人电话" prop="roleName">
+        <el-form-item label="领料人电话" prop="phone">
          <el-input
            v-model="queryParams.leaseApplyInfo.phone"
            placeholder="请输入领料人电话"
@ -82,10 +82,10 @@
        <el-button
          type="success"
          plain
-          icon="el-icon-edit"
+          icon="el-icon-back"
          size="mini"
          @click="handleBack"
-        >领料管理</el-button>
+        >领料申请</el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button
@ -104,6 +104,7 @@
      <el-table-column label="类型名称" prop="typeCn" :show-overflow-tooltip="true"   />
      <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
      <el-table-column label="计量单位" prop="unitCn"/>
+      <el-table-column label="库存数量" prop="num"/>
      <el-table-column label="预领数量" align="center" prop="createTime">
        <template slot-scope="scope">
          <el-input
@ -166,8 +167,19 @@ import {
 } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 export default {
-  name: "Role",
+  name: "ReceiveApplyAdd",
  data() {
+    const validatePhone = (rule, value, callback) => {
+      if (!value) {
+              callback(new Error("退料人电话不能为空"));
+              // this.$message.error("手机号不为空");
+      } else if (value.length < 11) {
+              callback(new Error("电话号码格式不正确"));
+              // this.$message.error("手机号格式不正确");
+      } else {
+              callback();
+      }
+    };
    return {
      user:null, // 用户信息
      // 遮罩层
@ -274,7 +286,17 @@ export default {
          {
            required:true,message:'请选择工程',trigger:'change',type:'number'
          }
-        ]
+        ],
+        leasePerson: [
+          {
+            required: true, message: '请输入领料人', trigger: 'blur',
+          }
+        ],
+        phone: [
+            {required: true, message: '请输入领料人手机号', trigger: 'change'},
+            { validator: validatePhone, trigger: "blur" },
+            { min: 11, message: "手机号不足11位", trigger: "blur" },
+        ],
      },
      unitList:[], //单位 集合
      proList:[], // 工程 集合
@ -427,6 +449,7 @@ export default {
      template.preNum = item.preNum
      template.status = item.status
      template.parenntId = item.parenntId
+      template.num = item.num
      return template
    }, 
       
@ -521,10 +544,8 @@ export default {
              this.$message({
                type:'success',
                message: '申请成功'
-              })
-              setTimeout(() => {
-                this.$router.back()
-              },1000)
+              }) 
+              this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"});
            }
          }
      })
@ -533,7 +554,7 @@ export default {
    },
    /** 修改按钮操作 */
    handleBack(row) {
-      this.$router.back()
+      this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"});
    }, 
    /** 删除按钮操作 */
    handleDelete(row) {
@ -548,7 +569,11 @@ export default {
   
    checkNum(row){
      if(row.preNum>=1){
-        row.preNum = row.preNum
+        if(row.preNum>=row.num){
+          row.preNum = row.num
+        }else{
+          row.preNum = row.preNum
+        }
      }else{
        row.preNum = 1
      }
@ -562,7 +587,7 @@ export default {
      if(nodes[0].level != 4){
        return
      }
-      console.log('nodes[0]',nodes[0],this.user)
+     
      this.leaseApplyDetails.push(
        this.handelTableItemData(nodes[0])
      )
@ -576,6 +601,8 @@ export default {
    handelTableItemData(node){
      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
      template.createBy = this.user.name
+      console.log(node.data)
+      template.num = node.data.num
      template.companyId = node.data.companyId
      template.typeId = node.data.id
      template.unitCn = node.data.unitName
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="receiveExamine">
    <el-row :gutter="10" class="mb8">
        <h3>{{ queryParams.applyFor }}提交的领料申请</h3>
        <div>领料单号：{{ queryParams.code }}</div>
@ -32,6 +32,17 @@
            />
          </el-form-item>
        </el-form>
+        <el-row :gutter="10" class="mb8"> 
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-back"
+              size="mini"
+              @click="handleBack"
+            >领料管理</el-button>
+          </el-col> 
+        </el-row>
        <el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
 <!--          <el-table-column type="selection" width="55" align="center" />-->
          <el-table-column label="序号" align="center" type="index" />
@ -134,7 +145,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { auditLeaseByCompany, getTaskDetail,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
 import {mapState} from 'vuex'
 export default {
-  name: "Dict",
+  name: "ReceiveExamine",
  data() {
    return {
      flowPath:[
@ -268,7 +279,7 @@ export default {
      const res = await auditLeaseByCompany(params)
      if(res.code == 200){
        this.examineVisible = false
-        this.$router.back()
+        this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveManage"});
      }
      console.log('subAuditLeaseByCompany ==================',res)
    },
@ -316,11 +327,14 @@ export default {
      const res = await rejectLeaseByCompany(params)
      if(res.code == 200){
        this.examineVisible = false
-        this.$router.back()
+        this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveManage"});
      }
      console.log('subAuditLeaseByCompany ==================',res)
    },
-
+    /** 修改按钮操作 */
+    handleBack(row) {
+      this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveManage"});
+    }, 
    /** 查询 */
    async getData(taskId) {
      const res = await getTaskDetail({
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="receiveManage">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="申请日期" prop="dictName">
        <el-date-picker
@ -210,7 +210,7 @@ import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/
 import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print';
 export default {
-  name: "Dict",
+  name: "ReceiveManage",
  data() {
    return {
      // 遮罩层
@ -374,13 +374,13 @@ export default {
    },
    /** 新增按钮操作 */
    handleAdd() {
-      this.$router.push("/claimAndRefund/receive/receiveManageAdd");
+      // this.$tab.closeOpenPage("/claimAndRefund/receive/receiveManageAdd");
      // this.reset();
      // this.open = true;
      // this.title = "添加字典类型";
    },
    handleExamine(row) {
-      this.$router.push({
+      this.$tab.closeOpenPage({
        path:"/claimAndRefund/receive/receiveExamine",
        query: {
          taskId:row.taskId
@ -388,7 +388,7 @@ export default {
      });
    },
    handleView(row) {
-      this.$router.push({
+      this.$tab.closeOpenPage({
        path:"/claimAndRefund/receive/receiveExamine?isView=true",
        query: {
          taskId:row.taskId
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="receiveManageAdd">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-row>
        <el-form-item label="领料单位" prop="roleName">
@ -232,7 +232,7 @@ import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleS
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

 export default {
-  name: "Role",
+  name: "ReceiveManageAdd",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="returnApply">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -449,7 +449,7 @@
        :total="loadingTotal"
        :page.sync="dialogQueryParams.pageNum"
        :limit.sync="dialogQueryParams.pageSize"
-        @pagination="getList"
+        @pagination="getDialogList"
      />

      <div
@ -526,7 +526,7 @@ import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
-  name: "Dict",
+  name: "ReturnApply",
  dicts: ['sys_normal_disable'],
  components: { dialogForm, },
  data() {
@ -670,7 +670,7 @@ export default {
      // this.reset();
      // // this.open = true;
      // // this.title = "计划借调";
-      this.$router.push("/claimAndRefund/return/returnApplyAdd");
+      this.$tab.closeOpenPage("/claimAndRefund/return/returnApplyAdd");
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
@ -781,6 +781,7 @@ export default {
      this.dialogQueryParams.backPerson = row.backPerson
      this.dialogQueryParams.phone = row.phone
      this.dialogQueryParams.backTime = row.backTime + ''
+      this.$set(this.dialogQueryParams,'keyWord','')
      this.loadingType = type
      this.rowObj = row
      this.open = true
@ -802,7 +803,10 @@ export default {
    getDialogList() {
      let params = {
        id: this.rowObj.id,
-        agreementId: this.rowObj.agreementId
+        agreementId: this.rowObj.agreementId,
+        keyWord:this.dialogQueryParams.keyWord,
+        pageNum: this.dialogQueryParams.pageNum,
+        pageSize: this.dialogQueryParams.pageSize,
      }
      ApiGetView(params).then(res => {
        this.loadingList = res.rows
@ -874,10 +878,11 @@ export default {
      this.GetProData()
    },
    handleQuery1() {
-
+      this.getDialogList()
    },
    resetQuery1() {
-
+      this.dialogQueryParams.keyWord = ''
+      this.getDialogList()
    },
    async initGetUseTypeTree(id){
      let params ={
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="returnApplyAdd">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -115,7 +115,7 @@
          plain
          icon="el-icon-back"
          size="mini"
-          @click="handleUpdate"
+          @click="handleBack"
          >退料管理</el-button
        >
      </el-col>
@ -208,7 +208,7 @@
          <!--            size="mini"-->
          <!--            type="text"-->
          <!--            icon="el-icon-edit"-->
-          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            @click="handleBack(scope.row)"-->
          <!--            v-hasPermi="['system:role:edit']"-->
          <!--          >修改</el-button>-->
          <el-button
@ -243,7 +243,7 @@ import {
  getInfo, h
 } from "@/api/login";
 export default {
-  name: "Role",
+  name: "ReturnApplyAdd",
  data() {
    const validatePhone = (rule, value, callback) => {
      if (!value) {
@ -372,6 +372,7 @@ export default {
          }
        ],
        phone: [
+            {required: true, message: '请输入退料人手机号', trigger: 'change'},
            { validator: validatePhone, trigger: "blur" },
            { min: 11, message: "手机号不足11位", trigger: "blur" },
        ],
@ -702,7 +703,7 @@ export default {
              message: '申请成功'
            })
            setTimeout(() => {
-              this.$router.back()
+              this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
            }, 1000)
          }
        }
@ -711,8 +712,8 @@ export default {

    },
    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.$router.back()
+    handleBack(row) {
+      this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
    },

    /** 分配数据权限操作 */
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="returnExamine">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -368,7 +368,7 @@
          <el-form-item label="关键字" prop="keyWord">
            <el-input
              v-model="dialogQueryParams.keyWord"
-              placeholder="请输入借出方单位"
+              placeholder="请输入关键字"
              clearable
              style="width: 240px"
            />
@ -418,7 +418,7 @@
        :total="loadingTotal"
        :page.sync="dialogQueryParams.pageNum"
        :limit.sync="dialogQueryParams.pageSize"
-        @pagination="getList"
+        @pagination="getDialogList"
      />

      <div
@ -495,7 +495,7 @@ import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
-  name: "Dict",
+  name: "ReturnExamine",
  dicts: ['sys_normal_disable'],
  components: { dialogForm, },
  data() {
@ -654,6 +654,7 @@ export default {
      this.dialogQueryParams.backPerson = row.backPerson
      this.dialogQueryParams.phone = row.phone
      this.dialogQueryParams.backTime = row.backTime + ''
+      this.$set(this.dialogQueryParams,'keyWord','')
      this.loadingType = type
      this.rowObj = row
      this.open = true
@ -666,6 +667,7 @@ export default {
      this.dialogQueryParams.backPerson = row.backPerson
      this.dialogQueryParams.phone = row.phone
      this.dialogQueryParams.backTime = row.backTime + ''
+      this.$set(this.dialogQueryParams,'keyWord','')
      this.loadingType = type
      this.rowObj = row
      this.open = true
@ -674,7 +676,10 @@ export default {
    getDialogList() {
      let params = {
        id: this.rowObj.id,
-        agreementId: this.rowObj.agreementId
+        agreementId: this.rowObj.agreementId,
+        pageNum: this.dialogQueryParams.pageNum,
+        pageSize: this.dialogQueryParams.pageSize,
+        keyWord:this.dialogQueryParams.keyWord
      }
      ApiGetView(params).then(res => {
        this.loadingList = res.rows
@ -825,11 +830,12 @@ export default {
      this.GetProData()
    },
    handleQuery1() {
-
+      this.getDialogList()
    },
    resetQuery1() {
-
-    }
+      this.dialogQueryParams.keyWord = ''
+      this.getDialogList()
+    },



--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="returnFinshed">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -424,7 +424,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import dialogForm from "./dialogForm.vue";
 export default {
  components: { dialogForm, },
-  name: "Dict",
+  name: "ReturnFinshed",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
+++ b/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="returnAbnormal">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -332,7 +332,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "ReturnAbnormal",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="inStoreBook">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="dictName">
        <el-input
@ -87,7 +87,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "InStoreBook",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="outStoreBook">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="dictName">
        <el-input
@ -87,7 +87,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "OutStoreBook",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="secondStore">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="dictName">
        <el-input
@ -168,7 +168,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "SecondStore",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="brokenExamine">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -489,7 +489,7 @@ import {
 import selectTree from '../repair/selectTree.vue'
 import Tree from '@/views/repairTest/repair/tree.vue'
 export default {
-  name: "Dict",
+  name: "BrokenExamine",
  components: { Tree, selectTree, },
  dicts: ['sys_normal_disable'],
  data() {
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="repair">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -559,7 +559,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import selectTree from './selectTree.vue'
 import Tree from './tree.vue'
 export default {
-  name: "Dict",
+  name: "Repair",
  dicts: ["sys_normal_disable"],
  components: { dialogOneForm, dialogTwoForm, dialogThreeForm, Treeselect, selectTree, Tree },
  data() {
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="testExamine">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -489,7 +489,7 @@ import {
 import selectTree from '../repair/selectTree.vue'
 import Tree from '@/views/repairTest/repair/tree.vue'
 export default {
-  name: "Dict",
+  name: "TestExamine",
  components: { Tree, selectTree, },
  dicts: ['sys_normal_disable'],
  data() {
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="labelBinding">
    <div style="z-index: 10000">
      <div style="z-index: 10000">
        <el-form
@ -405,7 +405,7 @@ import { getDeviceTypeTree } from "@/api/claimAndRefund/receive";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Dict",
+  name: "LabelBinding",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/label/labelBindingHistory.vue
+++ b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="labelBindingHistory">
    <el-form
      :model="queryParams"
      ref="queryForm"
@ -256,7 +256,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { listLabelHistoryList } from "@/api/store/label";
 import { getTypeList } from "@/api/store/warehousing";
 export default {
-  name: "Dict",
+  name: "LabelBindingHistory",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newAccessoryAccept">
    <el-row :gutter="24" class="mb8">
      <el-form :model="maForm" ref="maForm" :rules="maRules" size="small" :inline="true">
          <el-form-item label="采购日期" prop="purchaseTime">
@ -87,7 +87,7 @@
        <el-button
          type="success"
          plain
-          icon="el-icon-edit"
+          icon="el-icon-back"
          size="mini"
          @click="jumpList" 
        >新购配件管理</el-button>
@ -199,7 +199,7 @@ import { getAccessoryTree,addPurchaseAccessory,getPurchaseAccessoryDetails,updat
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Role",
+  name: "NewAccessoryAccept",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newAccessoryList">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="名称" prop="dictName">
        <el-input
@ -27,7 +27,7 @@
          @click="handleAccept" 
        >新增</el-button>
      </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          plain
@ -35,7 +35,7 @@
          size="mini"
          @click="handleAdd" 
        >发布入库</el-button>
-      </el-col>
+      </el-col> -->
      <el-col :span="1.5">
        <el-button
          type="warning"
@ -145,7 +145,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 import { listPurchaseAccessory,getPurchaseCheckInfo,delPurchaseAccessory } from "@/api/store/newBuy";
 export default {
-  name: "Dict",
+  name: "NewAccessoryList",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@ -247,17 +247,17 @@ export default {
    /** 编辑按钮操作 */
    handleUpdate(row) {
    let query = { taskId:row.taskId }
-    this.$router.replace({ path: "/store/newBuy/newAccessoryAccept", query });
+    this.$tab.closeOpenPage({ path: "/store/newBuy/newAccessoryAccept", query });
    },
    /** 查看按钮操作 */
    handleView(row) {
    let query = { taskId:row.taskId,isView:true }
-    this.$router.replace({ path: "/store/newBuy/newAccessoryAccept", query });
+    this.$tab.closeOpenPage({ path: "/store/newBuy/newAccessoryAccept", query });
    },
    /** 验收按钮操作 */
    handleCheck(row) {
    let query = { taskId:row.taskId,isCheck:true}
-    this.$router.replace({ path: "/store/newBuy/newAccessoryAccept", query });
+    this.$tab.closeOpenPage({ path: "/store/newBuy/newAccessoryAccept", query });
    },
    /** 提交按钮 */
    submitForm: function() {
@ -286,7 +286,7 @@ export default {
    },
    /** 新增 */
    handleAccept() {
-      this.$router.replace("/store/newBuy/newAccessoryAccept");
+      this.$tab.closeOpenPage("/store/newBuy/newAccessoryAccept");
    },
    /** 删除按钮操作 */
    handleDelete(row) {
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newDevicesAccept">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -28,10 +28,12 @@
      </el-col>
      <el-col :span="1.5">
        <el-button
+            type="success"
            plain
            size="mini"
+            icon="el-icon-back"
            @click="jumpList"
-        >采购验收管理</el-button>
+        >新购验收管理</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@ -257,7 +259,7 @@ import { getPurchaseCheckInfo,bmNoticeInfo,updatePurchaseCheckDetails,getNoticeU
 import { imgUpLoad,fileUpLoad } from "@/api/system/upload";

 export default {
-  name: "Dict",
+  name: "NewDevicesAccept",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newDevicesArrival">
    <el-row :gutter="24" class="mb8">
      <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
@ -110,10 +110,10 @@
        <el-button
            type="success"
            plain
-            icon="el-icon-edit"
+            icon="el-icon-back"
            size="mini"
            @click="jumpList"
-        >采购验收管理</el-button>
+        >新购验收管理</el-button>
      </el-col>


@ -214,7 +214,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {  } from "@/api/store/newBuy";

 export default {
-  name: "Role",
+  name: "NewDevicesArrival",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
@ -493,7 +493,8 @@ export default {
                    updatePurchaseCheckInfo(this.maForm).then(response => {
                      if(response.code == 200){
                        this.$modal.msgSuccess("编辑成功");
-                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
+                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList"}); 
+                        
                      }
                      this.loading = false;
                    })
@ -504,7 +505,7 @@ export default {
                    addPurchaseCheckInfo(this.maForm).then(response => {
                      if(response.code == 200){
                        this.$modal.msgSuccess("新增成功");
-                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
+                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList"});
                      }
                      this.loading = false;
                    })
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newDevicesCode">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -29,11 +29,12 @@
      </el-col> -->
      <el-col :span="1.5">
        <el-button
-            type="primary"
+            type="success"
            plain
            size="mini"
+            icon="el-icon-back"
            @click="jumpList"
-        >采购验收管理</el-button>
+        >新购验收管理</el-button>
      </el-col>
     
    
@ -195,7 +196,7 @@ import { number } from 'echarts';


 export default {
-  name: "Dict",
+  name: "NewDevicesCode",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newDevicesList">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -261,7 +261,7 @@ import { listPurchaseCheckInfo,getPurchaseCheckInfo } from "@/api/store/newBuy";
 import vueEasyPrint from 'vue-easy-print';

 export default {
-  name: "Dict",
+  name: "NewDevicesList",
  dicts: ['sys_normal_disable'],
  components:{vueEasyPrint},
  data() {
@ -309,6 +309,13 @@ export default {
    };
  },
  created() {
+    //refresh
+    const refresh = this.$route.query && this.$route.query.refresh;
+    console.log(refresh,'111111111')
+    if(refresh){
+      this.queryParams.keyWord = ''
+      this.getList();
+    }
    this.getList();
  },
  methods: {
@ -351,15 +358,12 @@ export default {
    },
    /** 新增按钮操作 */
    handleAdd() {
-      this.$router.replace("/store/newBuy/newDevicesArrival");
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加字典类型";
+      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesArrival"});
    },
     /** 修改按钮操作 */
     handleUpdate(row) {
      let query = { taskId:row.taskId }
-      this.$router.replace({ path: "/store/newBuy/newDevicesArrival", query });
+      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesArrival", query });
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
@ -402,12 +406,12 @@ export default {
    /** 验收按钮 */
    handleAccept(row) {
      let query = { taskId:row.taskId }
-      this.$router.replace({ path: "/store/newBuy/newDevicesAccept", query });
+      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesAccept", query });
    },
    //编码管理
    handleCode(row) {
      let query = { taskId:row.taskId }
-      this.$router.replace({ path: "/store/newBuy/newDevicesCode", query });
+      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesCode", query });
    },

    //获取验收单数据
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="newDevicesWarehousing">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -380,7 +380,7 @@ import { getRepairedDetailList, inputByType } from "@/api/store/warehousing";
 import { getPutInList,getPutinDetailsList ,changePutinStatus,warehousingEntry} from "@/api/store/newBuy";
 import vueEasyPrint from 'vue-easy-print';
 export default {
-  name: "Dict",
+  name: "NewDevicesWarehousing",
  dicts: ['sys_normal_disable'],
  components:{vueEasyPrint},
  data() {
--- a/sgzb-ui/src/views/store/newBuy/plan.vue
+++ b/sgzb-ui/src/views/store/newBuy/plan.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="plan">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="名称" prop="dictName">
        <el-input
@ -155,7 +155,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "Plan",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/newBuy/planSecond.vue
+++ b/sgzb-ui/src/views/store/newBuy/planSecond.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="planSecond">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="名称" prop="dictName">
        <el-input
@ -183,7 +183,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "PlanSecond",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/shelves/shelvesConfig.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesConfig.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="shelvesConfig">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
@ -297,7 +297,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "User",
+  name: "ShelvesConfig",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/shelves/shelvesList.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="shelvesList">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="houseName">
        <el-input
@ -139,7 +139,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "Dept",
+  name: "ShelvesList",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/tools/accessory.vue
+++ b/sgzb-ui/src/views/store/tools/accessory.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="accessory">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="paName">
        <el-input v-model="queryParams.paName" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery" />
@ -116,7 +116,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 // level 层级 +1
 export default {
-  name: "Dept",
+  name: "Accessory",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="devices">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -359,7 +359,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import QRCode from 'qrcodejs2'

 export default {
-  name: "Dict",
+  name: "Devices",
  dicts: ['sys_normal_disable'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/tools/keeper.vue
+++ b/sgzb-ui/src/views/store/tools/keeper.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="keeper">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
@ -294,7 +294,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "User",
+  name: "Keeper",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/tools/repair.vue
+++ b/sgzb-ui/src/views/store/tools/repair.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="repair">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
@ -304,7 +304,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

 export default {
-  name: "User",
+  name: "Repair",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
--- a/sgzb-ui/src/views/store/tools/safeTools.vue
+++ b/sgzb-ui/src/views/store/tools/safeTools.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="safeTools">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
      <el-form-item label="供应商名称" prop="dictName">
        <el-input
@ -145,7 +145,7 @@
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

 export default {
-  name: "Dict",
+  name: "SafeTools",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue
+++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="toolsSupplier">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="供应商名称" prop="supplier">
        <el-input
@ -175,7 +175,7 @@
 import { listSupplierInfo, getSupplierInfo, addSupplier, updateSupplier, delSupplier } from "@/api/store/tools";
 import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
 export default {
-  name: "Dict",
+  name: "ToolsSupplier",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="toolsType">
    <el-row :gutter="20">
      <!--树数据-->
      <el-col :span="4" :xs="24">
@ -406,7 +406,7 @@ import { getProLists } from "@/api/base/base";
 import { imgUpLoad,fileUpLoad } from "@/api/system/upload";

 export default {
-  name: "User",
+  name: "ToolsType",
  // dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: {Treeselect},
  data() {
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="accessoryWarehousing">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -304,7 +304,7 @@ import { getPurchaseAccessoryPutInList,getPartList,getAccessoryPutInDetailList,c


 export default {
-  name: "Dict",
+  name: "AccessoryWarehousing",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="devicesWarehousing">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -305,7 +305,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { getReturnOfMaterialsInfoAll,getTypeList } from "@/api/store/warehousing";

 export default {
-  name: "Dict",
+  name: "DevicesWarehousing",
  dicts: ['sys_normal_disable'],
  data() {
    return {
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="repairWarehousing">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="关键字" prop="keyWord">
        <el-input
@ -311,7 +311,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { getRepairedList, getRepairedDetailList, inputByType,getTypeList } from "@/api/store/warehousing";

 export default {
-  name: "Dict",
+  name: "RepairWarehousing",
  dicts: ['sys_normal_disable'],
  data() {
    return {