From 304038a788e4b8864f5badce8bac7f3d4ee6762b Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 13 May 2025 11:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/component/addReturn.vue     |   8 +-
 src/views/material/back/component/home.vue    |   3 +-
 .../equipment/equipmentRecord/index.vue       |  62 --
 .../lease/apply/component/addToolsApply.vue   | 816 +++++++++---------
 .../lease/apply/component/homeApply.vue       |  24 +-
 src/views/material/lease/outBound/index.vue   |  26 +-
 6 files changed, 421 insertions(+), 518 deletions(-)

diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index e7d1290b..1663beb3 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -10,7 +10,7 @@
             label-width="100px"
         >
             <el-row>
-                <el-form-item label="退料单位" prop="unitId">
+                <el-form-item label="退料班组" prop="unitId">
                     <treeselect
                         v-model="queryParams.unitId"
                         :disabled="backId != ''"
@@ -91,7 +91,7 @@
                     <span style="color: red">*</span>
                     <span style="font-size: 14px; font-weight: 600; color: #606266">物品类型</span>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="7">
                     <el-select
                         ref="typeSelect"
                         v-model="tempDeviceType"
@@ -1463,4 +1463,8 @@ export default {
         }
     }
 }
+
+.el-upload-list__item-thumbnail {
+  height: 145px !important;
+}
 </style>
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 61b35c43..8cd2881a 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -133,7 +133,8 @@
                         v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleUpdate(scope.row)" 
                         >编辑</el-button>
                     <el-button size="mini" type="success" plain icon="el-icon-refresh"
-                        v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleSubmit(scope.row)"
+                        v-show="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleSubmit(scope.row)"
+                        v-hasPermi="['back:info:submit']"
                         >提交</el-button> 
                     <el-button size="mini" type="danger" icon="el-icon-delete"
                         v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1"
diff --git a/src/views/material/equipment/equipmentRecord/index.vue b/src/views/material/equipment/equipmentRecord/index.vue
index 58586dc1..e6211228 100644
--- a/src/views/material/equipment/equipmentRecord/index.vue
+++ b/src/views/material/equipment/equipmentRecord/index.vue
@@ -252,55 +252,6 @@ export default {
       },
       useRecordList: [], //在用设备列表
       dialogUserTotal: 0,
-      //在修弹窗
-      openRepairRecord: false,
-      dialogRepairQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined
-      },
-      repairRecordList: [], //在修设备列表
-      dialogRepairTotal: 0,
-
-      //新购待入库弹窗
-      openPurchaseRecord: false,
-      dialogPurchaseQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined
-      },
-      purchaseRecordList: [], //新购待入库设备列表
-      dialogPurchaseTotal: 0,
-
-      //修试待入库弹窗
-      openTestedRecord: false,
-      dialogTestedQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined
-      },
-      testedRecordList: [], //修试待入库设备列表
-      dialogTestedTotal: 0,
-
-      //待报废弹窗
-      openToScrapRecord: false,
-      dialogToScrapQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined
-      },
-      toScrapRecordList: [], //待报废设备列表
-      dialogToScrapTotal: 0,
-
-      //已审核弹窗
-      openAuditedRecord: false,
-      dialogAuditedQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined
-      },
-      auditedRecordList: [], //已审核设备列表
-      dialogAuditedTotal: 0
     }
   },
   created() {
@@ -399,19 +350,6 @@ export default {
         `综合查询_保有设备总量_${new Date().getTime()}.xlsx`
       )
     },
-    //跳转维修
-    jumpRepair(code) {
-      this.$router.push({ path: '/repair/repairManage', query: { code: code } })
-    },
-    // 跳转新购待入库
-    jumpInput(code) {
-      this.$router.push({ path: '/purchase/goodsEntry', query: { code: code } })
-    },
-    // 跳转修试后入库
-    jumpRepairInput(code) {
-      this.$router.push({ path: '/repair/testedInBound', query: { code: code } })
-    },
-    // ------------------
     //查看在库编码数据
     openRecords(row) {
       this.openRecord = true
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index 2a306efd..99eaf367 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -1,14 +1,7 @@
 <template>
   <!-- 新增工机具 -->
   <div>
-    <el-form
-      :model="maForm"
-      ref="maForm"
-      size="small"
-      :rules="rules"
-      :inline="true"
-      label-width="120px"
-    >
+    <el-form :model="maForm" ref="maForm" size="small" :rules="rules" :inline="true" label-width="120px">
       <!-- <el-form-item label="租赁单位" prop="leaseUnitId">
         <el-select
           v-model="maForm.leaseUnitId"
@@ -26,13 +19,20 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="租赁单位" prop="unitId">
+      <el-form-item label="领用班组" prop="unitId">
         <treeselect
-            v-model="maForm.unitId" :disabled="isEdit"
-            :options="uniteList" :normalizer="normalizer"
-            :show-count="true" style="width: 240px" :disable-branch-nodes="true"
-            noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-            placeholder="请选择租赁单位" @select="uniteChange"
+          v-model="maForm.unitId"
+          :disabled="isEdit"
+          :options="uniteList"
+          :normalizer="normalizer"
+          :show-count="true"
+          style="width: 240px"
+          :disable-branch-nodes="true"
+          noChildrenText="没有数据了"
+          noOptionsText="没有数据"
+          noResultsText="没有搜索结果"
+          placeholder="请选择租赁单位"
+          @select="uniteChange"
         />
         <!-- <el-cascader
           v-model="unitId"
@@ -49,11 +49,18 @@
       </el-form-item>
       <el-form-item label="租赁工程" prop="projectId">
         <treeselect
-            v-model="maForm.projectId" :disabled="isEdit"
-            :options="projectList" :normalizer="normalizer"
-            :show-count="true" style="width: 240px" :disable-branch-nodes="true"
-            noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-            placeholder="请选择租赁工程" @select="projectChange"
+          v-model="maForm.projectId"
+          :disabled="isEdit"
+          :options="projectList"
+          :normalizer="normalizer"
+          :show-count="true"
+          style="width: 240px"
+          :disable-branch-nodes="true"
+          noChildrenText="没有数据了"
+          noOptionsText="没有数据"
+          noResultsText="没有搜索结果"
+          placeholder="请选择租赁工程"
+          @select="projectChange"
         />
         <!-- <el-cascader
           v-model="projectId"
@@ -116,9 +123,7 @@
                 :data-key="item.typeId"
               >
                 <span v-html="highlightText(item.fullPath, searchKeyword)"></span>
-                <span style="float: right; color: #8492a6; font-size: 13px">
-                  库存:{{ item.storageNum }}
-                </span>
+                <span style="float: right; color: #8492a6; font-size: 13px">库存:{{ item.storageNum }}</span>
               </el-option>
             </el-select>
           </el-col>
@@ -144,17 +149,17 @@
         </el-row>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-          <el-input
-              v-model="maForm.remark"
-              placeholder="请输入备注"
-              clearable
-              maxlength="150"
-              type="textarea"
-              style="width: 240px"
-              rows="2"
-          />
+        <el-input
+          v-model="maForm.remark"
+          placeholder="请输入备注"
+          clearable
+          maxlength="150"
+          type="textarea"
+          style="width: 240px"
+          rows="2"
+        />
       </el-form-item>
-      <el-form-item label="委托书" prop="bmFileInfos" v-if="isFileFbs">
+      <!-- <el-form-item label="委托书" prop="bmFileInfos" v-if="isFileFbs">
           <el-upload
             :action="uploadUrl"
             :file-list="maForm.bmFileInfos"
@@ -169,8 +174,6 @@
             :on-preview="picturePreviewFbs"
             :on-remove="handleRemoveElectricianImgList"
           >
-
-            <!-- 文件格式下载，图片格式预览 -->
             <div slot="file" slot-scope="{file}" >
               <img v-if="isImage(file)" class="el-upload-list__item-thumbnail" :src="file.url" alt="">
               <div v-else class="picture-card-container">
@@ -191,69 +194,44 @@
             </div>
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-        </el-form-item>
+        </el-form-item> -->
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleSave"
-          >保存</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button>
             </el-col> -->
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="equipmentList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
       <!-- <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>
-      <el-table-column
-        align="center"
-        label="规格型号"
-        prop="typeName"
-        show-overflow-tooltip
-      />
+      <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" />
       <el-table-column label="预领数量" prop="preNum" align="center">
         <template v-slot="scope">
           <el-input
-              v-model.number="scope.row.preNum"
-              controls-position="right" type="number"
-              style="width: 100%" :disabled="scope.row.alNum && scope.row.alNum != 0 ? true : false"
-              :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.preNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.preNum=Number(v.replace(/[^\d]/g,'')))"
-              ></el-input>
+            v-model.number="scope.row.preNum"
+            controls-position="right"
+            type="number"
+            style="width: 100%"
+            :min="1"
+            @input="
+              v =>
+                scope.row.unitValue == 1
+                  ? (scope.row.preNum = Number(v.replace(/[^\d.]/g, '')))
+                  : (scope.row.preNum = Number(v.replace(/[^\d]/g, '')))
+            "
+          ></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="已出库数量" align="center" prop="alNum" v-if="maForm.taskId" :show-overflow-tooltip="true"/>
-      <!-- <el-table-column align="center" label="出库数量" prop="alNum" /> -->
-      <el-table-column
-        label="备注"
-        prop="remark"
-        align="center"
-        label-width="500px"
-      >
+      <el-table-column label="备注" prop="remark" align="center" label-width="500px">
         <template v-slot="scope">
-          <el-input
-            v-model="scope.row.remark"
-            controls-position="right"
-            style="width: 100%"
-          ></el-input>
+          <el-input v-model="scope.row.remark" controls-position="right" style="width: 100%"></el-input>
         </template>
       </el-table-column>
 
@@ -263,70 +241,66 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            style="color: red" v-if="!scope.row.alNum||scope.row.alNum==0"
+            style="color: red"
+            v-if="!scope.row.alNum || scope.row.alNum == 0"
             @click="handleDelete(scope.row)"
-            >删除</el-button
           >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 图片查看弹窗 -->
     <el-dialog :visible.sync="dialogVisible" width="600px" height="600px">
-      <img width="100%" height="500px" :src="dialogImageUrl"/>
+      <img width="100%" height="500px" :src="dialogImageUrl" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  getPurchaseCheckInfo,
-  equipmentTypeTree,
-} from "@/api/purchase/goodsArrived";
+import { getPurchaseCheckInfo, equipmentTypeTree } from '@/api/purchase/goodsArrived'
 import {
   getListProject,
   getListUnite,
   addApplyInfo,
   updateApplyInfo,
   getApplyInfo,
-  getAgreement,
-} from "@/api/lease/apply";
-import { getToken } from "@/utils/auth";
-import {
-  uploadPurchaseFile,
-  getPurchaseFileList,
-} from "@/api/purchase/goodsAccept";
-import {downloadFile, downloadFileData} from '@/utils/download'
+  getAgreement
+} from '@/api/lease/apply'
+import { getToken } from '@/utils/auth'
+import { uploadPurchaseFile, getPurchaseFileList } from '@/api/purchase/goodsAccept'
+import { downloadFile, downloadFileData } from '@/utils/download'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "AddTools",
-  dicts: ["purchase_task_status"],
+  name: 'AddTools',
+  dicts: ['purchase_task_status'],
   components: { Treeselect },
   props: {
     isEdit: {
       type: Boolean,
       default: () => {
-        return false;
-      },
+        return false
+      }
     },
     editTaskId: {
       type: [String, Number],
       default: () => {
-        return "";
-      },
+        return ''
+      }
     },
     editId: {
       type: [String, Number],
       default: () => {
-        return "";
-      },
-    },
+        return ''
+      }
+    }
   },
   data() {
     return {
-      taskId: "",
+      taskId: '',
       // isEdit: false,
       // 遮罩层
       loading: false,
@@ -342,10 +316,10 @@ export default {
       // 总条数
       total: 0,
       selectTreeProps: {
-        children: "children",
-        label: "name",
+        children: 'children',
+        label: 'name',
         // multiple: false,
-        value: "id",
+        value: 'id'
         // multiple: true,
       },
       //租赁单位
@@ -357,7 +331,7 @@ export default {
       // 角色表格数据
       equipmentList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       rowData: {},
@@ -366,69 +340,69 @@ export default {
       // 查询参数
       queryParams: {
         equipmentId: undefined,
-        productionTime: "",
+        productionTime: ''
       },
       maForm: {
         unitId: undefined,
         projectId: undefined,
-        arrivalTime: "",
-        purchaser: "",
-        remark: "",
-        purchaseNumber: "",
-        bmFileInfos: [],
+        arrivalTime: '',
+        purchaser: '',
+        remark: '',
+        purchaseNumber: '',
+        bmFileInfos: []
       },
       // 表单参数
       form: {},
       defaultProps: {
-        children: "children",
-        label: "label",
+        children: 'children',
+        label: 'label'
       },
       // 表单校验
       rules: {
         unitId: [
           {
             required: true,
-            message: "请选择租赁单位",
-            trigger: "blur",
-          },
+            message: '请选择租赁单位',
+            trigger: 'blur'
+          }
         ],
         projectId: [
           {
             required: true,
-            message: "请选择租赁工程",
-            trigger: "blur",
-          },
+            message: '请选择租赁工程',
+            trigger: 'blur'
+          }
         ],
         leasePerson: [
           {
             required: true,
-            message: "请输入领料人",
-            trigger: "blur",
-          },
+            message: '请输入领料人',
+            trigger: 'blur'
+          }
         ],
         phone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
         ],
         bmFileInfos: [
           {
-            required: false,//是否分包商(是：合同编号必填)
+            required: false, //是否分包商(是：合同编号必填)
             message: '请上传委托书',
             trigger: 'change'
           }
-        ],
+        ]
         // purchaser: [
         //   { required: true, message: "采购员不能为空", trigger: "blur" }
         // ]
       },
       deviceTypeTreeProps: {
-        children: "children",
-        label: "typeName",
-        value: "typeId",
+        children: 'children',
+        label: 'typeName',
+        value: 'typeId',
         multiple: true,
         emitPath: true
       },
@@ -457,7 +431,7 @@ export default {
       isSearching: false, // 添加搜索状态标记
 
       //是否是分包商
-      isFileFbs:false,
+      isFileFbs: false,
       urlTemp: '',
       delBusinessFileIdList: [],
       //图片查看弹窗
@@ -471,8 +445,8 @@ export default {
       //   // 上传的地址
       //   url: process.env.VUE_APP_BASE_API + '/file/upload'
       // },
-      uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
-    };
+      uploadUrl: process.env.VUE_APP_BASE_API + '/file/upload' // 上传的图片服务器地址
+    }
   },
   computed: {
     //图片上传1张后，隐藏上传框
@@ -482,22 +456,22 @@ export default {
     pickerOptions() {
       return {
         disabledDate(time) {
-          const currentDate = new Date();
-          currentDate.setHours(0, 0, 0, 0);
-          return time.getTime() < currentDate.getTime();
-        },
-      };
-    },
+          const currentDate = new Date()
+          currentDate.setHours(0, 0, 0, 0)
+          return time.getTime() < currentDate.getTime()
+        }
+      }
+    }
   },
   mounted() {
-    this.projectInfoList();//单位工程下拉选
-    this.equipmentType();//机具类型下拉选
+    this.projectInfoList() //单位工程下拉选
+    this.equipmentType() //机具类型下拉选
     if (this.isEdit) {
-      console.log("isEdit", this.isEdit);
-      this.taskId = this.editTaskId;
-      this.id = this.editId;
-      this.getTaskInfo();
-      this.equipmentType();
+      console.log('isEdit', this.isEdit)
+      this.taskId = this.editTaskId
+      this.id = this.editId
+      this.getTaskInfo()
+      this.equipmentType()
     }
     // this.projectInfoList();
     // this.equipmentType();
@@ -505,14 +479,14 @@ export default {
   methods: {
     /** 转换菜单数据结构 */
     normalizer(node) {
-        if (node.children && !node.children.length) {
-            delete node.children;
-        }
-        return {
-            id: node.id,
-            label: node.name,
-            children: node.children,
-        };
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      }
     },
     uniteChange(val) {
       // this.projectList = [];
@@ -521,19 +495,19 @@ export default {
       // } else if (val && val.length == 0) {
       //   this.maForm.unitId = "";
       // }
-      if(val.typeKey=='fbs'){
-        this.isFileFbs=true;
-        this.rules['bmFileInfos'][0].required=true;
-      }else{
-        this.isFileFbs=false;
-        this.rules['bmFileInfos'][0].required=false;
+      if (val.typeKey == 'fbs') {
+        this.isFileFbs = true
+        this.rules['bmFileInfos'][0].required = true
+      } else {
+        this.isFileFbs = false
+        this.rules['bmFileInfos'][0].required = false
       }
-      setTimeout(()=>{
-        getListProject({ unitId: this.maForm.unitId }).then((response) => {
-          this.projectList = response.data;
-          this.maForm.projectId=null
-        });
-      },500)
+      setTimeout(() => {
+        getListProject({ unitId: this.maForm.unitId }).then(response => {
+          this.projectList = response.data
+          this.maForm.projectId = null
+        })
+      }, 500)
     },
     projectChange(val) {
       // if (val && val.length > 0) {
@@ -541,29 +515,29 @@ export default {
       // } else if (val && val.length == 0) {
       //   this.maForm.projectId = "";
       // }
-      setTimeout(()=>{
+      setTimeout(() => {
         // projectId: this.maForm.projectId
-        getListUnite({  }).then((response) => {
-          this.uniteList = response.data;
-        });
-      },500)
+        getListUnite({}).then(response => {
+          this.uniteList = response.data
+        })
+      }, 500)
     },
     /** 租赁单位和工程-下拉选 */
     projectInfoList() {
       if (!this.isEdit) {
-        getListUnite({ projectId: null }).then((response) => {
-          this.uniteList = response.data;
-        });
-        getListProject({ unitId: null }).then((response) => {
-          this.projectList = response.data;
-        });
+        getListUnite({ projectId: null }).then(response => {
+          this.uniteList = response.data
+        })
+        getListProject({ unitId: null }).then(response => {
+          this.projectList = response.data
+        })
       } else {
-        getListUnite({ projectId: null }).then((response) => {
-          this.uniteList = response.data;
-        });
-        getListProject({ unitId: this.maForm.unitId }).then((response) => {
-          this.projectList = response.data;
-        });
+        getListUnite({ projectId: null }).then(response => {
+          this.uniteList = response.data
+        })
+        getListProject({ unitId: this.maForm.unitId }).then(response => {
+          this.projectList = response.data
+        })
       }
     },
     // filterTree(nodes) {
@@ -582,26 +556,26 @@ export default {
     // },
     /** 机具类型 */
     equipmentType() {
-      equipmentTypeTree().then((response) => {
-        this.equipmentTypeList = response.data;
+      equipmentTypeTree().then(response => {
+        this.equipmentTypeList = response.data
         // 处理并扁平化所有类型数据
-        this.flattenTypeOptions = this.processTypeData(response.data);
+        this.flattenTypeOptions = this.processTypeData(response.data)
         debugger
         // 初始显示所有选项
-        this.filteredOptions = [...this.flattenTypeOptions];
+        this.filteredOptions = [...this.flattenTypeOptions]
 
         // 反显选中数据
         if (this.equipmentList.length > 0) {
-          this.deviceType = this.equipmentList.map(item => item.typeId);
+          this.deviceType = this.equipmentList.map(item => item.typeId)
         }
-      });
+      })
     },
     // 处理类型数据
     processTypeData(data) {
-      const result = [];
+      const result = []
 
       const traverse = (node, parents = []) => {
-        const path = [...parents, node.typeName];
+        const path = [...parents, node.typeName]
 
         if (!node.children || node.children.length === 0) {
           result.push({
@@ -615,357 +589,354 @@ export default {
             unitName: node.unitName,
             unitValue: node.unitValue,
             maxSortPriority: node.maxSortPriority
-          });
+          })
         }
 
         if (node.children) {
-          node.children.forEach(child => traverse(child, path));
+          node.children.forEach(child => traverse(child, path))
         }
-      };
+      }
 
-      data.forEach(node => traverse(node));
+      data.forEach(node => traverse(node))
 
       // 根据Api接口返回的Node节点中的 maxSortPriority字段 进行从大到小的排序
-      result.sort((a, b) => b.maxSortPriority - a.maxSortPriority);
+      result.sort((a, b) => b.maxSortPriority - a.maxSortPriority)
 
-      return result;
+      return result
     },
     // 搜索处理函数
     handleSearchImpl(query) {
       if (!query) {
-        this.filteredOptions = [...this.flattenTypeOptions];
-        return;
+        this.filteredOptions = [...this.flattenTypeOptions]
+        return
       }
 
-      const lowercaseQuery = query.toLowerCase();
-      this.filteredOptions = this.flattenTypeOptions.filter(item =>
-        item.searchKey.includes(lowercaseQuery) ||
-        item.fullPath.toLowerCase().includes(lowercaseQuery)
-      );
+      const lowercaseQuery = query.toLowerCase()
+      this.filteredOptions = this.flattenTypeOptions.filter(
+        item => item.searchKey.includes(lowercaseQuery) || item.fullPath.toLowerCase().includes(lowercaseQuery)
+      )
     },
     // 选择变化处理
     handleTypeChange(val) {
-      if (!val || val.length === 0) return;
+      console.log('🚀 ~ handleTypeChange ~ val:', val)
+      if (!val || val.length === 0) return
 
       // 获取新选中的项
-      const lastSelected = val[val.length - 1];
-      const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected);
+      const lastSelected = val[val.length - 1]
+      console.log('🚀 ~ handleTypeChange ~ lastSelected:', lastSelected)
+      const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected)
+      console.log('🚀 ~ handleTypeChange ~ typeData:', typeData)
 
       if (typeData) {
         if (this.equipmentList.some(item => item.typeId === lastSelected)) {
           this.$message({
             message: `${typeData.typeName} 已添加到列表中`,
             type: 'warning'
-          });
-          this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected);
+          })
+          this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
         } else if (typeData.storageNum <= 0) {
-          this.$message.error("所选物资规格类型暂时无库存，无法申请！");
-          this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected);
+          this.$message.error('所选物资规格类型暂时无库存，无法申请！')
+          this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
         } else {
           // 将新项添加到数组开头，实现倒序
           this.equipmentList.unshift({
             ...typeData,
             preNum: 0
-          });
-          this.deviceType.push(lastSelected);
+          })
+          this.deviceType.push(lastSelected)
           this.$message({
             message: `已添加 ${typeData.typeName}`,
             type: 'success'
-          });
+          })
         }
+        console.log('🚀 ~ handleTypeChange ~ this.equipmentList:', this.equipmentList)
       }
 
       // 清空临时选中值
       this.$nextTick(() => {
-        this.tempDeviceType = [];
-      });
+        this.tempDeviceType = []
+      })
     },
     //获取任务详情--- 编辑回显数据
     async getTaskInfo() {
       // this.loading = true;
-      await getApplyInfo(this.id).then((response) => {
-        this.maForm = response.data.leaseApplyInfo;
-        this.maForm.unitId = response.data.leaseApplyInfo.leaseUnitId;
-        this.maForm.projectId = response.data.leaseApplyInfo.leaseProjectId;
-        this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId);
-        this.projectId = this.treeParentsById(
-          this.projectList,
-          this.maForm.projectId
-        );
-        this.equipmentList = response.data.leaseApplyDetailsList;
+      await getApplyInfo(this.id).then(response => {
+        this.maForm = response.data.leaseApplyInfo
+        this.maForm.unitId = response.data.leaseApplyInfo.leaseUnitId
+        this.maForm.projectId = response.data.leaseApplyInfo.leaseProjectId
+        this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId)
+        this.projectId = this.treeParentsById(this.projectList, this.maForm.projectId)
+        this.equipmentList = response.data.leaseApplyDetailsList
         // 如果 bmFileInfos有值
         if (this.maForm.bmFileInfos.length > 0) {
           this.isFileFbs = true
         }
         // this.loading = false;
-      });
+      })
       // await this.projectInfoList();
     },
     checkNum(row) {
-        // let maxNum = row.storageNum
-        // if (row.preNum <= 1) {
-        //     row.preNum = 1
-        // } else if (row.preNum > maxNum) {
-        //     row.preNum = maxNum-1
-        // }
+      // let maxNum = row.storageNum
+      // if (row.preNum <= 1) {
+      //     row.preNum = 1
+      // } else if (row.preNum > maxNum) {
+      //     row.preNum = maxNum-1
+      // }
     },
     //单位，工程树结构数据获取父
     treeParentsById(list, id) {
       for (let i in list) {
         if (list[i].id == id) {
           //查询到就返回该数组对象的value
-          return [list[i].id];
+          return [list[i].id]
         }
         if (list[i].children) {
-          let node = this.treeParentsById(list[i].children, id);
+          let node = this.treeParentsById(list[i].children, id)
           if (node !== undefined) {
             //查询到把父节把父节点加到数组前面
-            node.unshift(list[i].id);
-            return node;
+            node.unshift(list[i].id)
+            return node
           }
         }
       }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.roleId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map(item => item.roleId)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
     },
     /** 保存按钮操作 */
     handleSave() {
       // console.log(this.equipmentList)
-      console.log("maForm", this.maForm);
+      console.log('maForm', this.maForm)
       if (this.equipmentList.length > 0) {
         // if(this.bmFileInfos.length > 0){
         //   console.log(33333333333333333333333333333333333)
         //   this.$refs["maForm"].clearValidate('bmFileInfos');
         // }
-        this.$refs["maForm"].validate(async (valid) => {
+        this.$refs['maForm'].validate(async valid => {
           if (valid) {
-              for(let i = 0;i<this.equipmentList.length;i++){
-                if(this.equipmentList[i].preNum<=0){
-                  this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `);
-                  return
-                }
-                if(this.equipmentList[i].preNum>this.equipmentList[i].storageNum){
-                  this.$message.error(`第 ${i + 1} 行的 ${'预领数量不可大于库存量'} `);
-                  return
-                }
+            for (let i = 0; i < this.equipmentList.length; i++) {
+              if (this.equipmentList[i].preNum <= 0) {
+                this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `)
+                return
               }
+              if (this.equipmentList[i].preNum > this.equipmentList[i].storageNum) {
+                this.$message.error(`第 ${i + 1} 行的 ${'预领数量不可大于库存量'} `)
+                return
+              }
+            }
 
-            console.log("projectId", this.projectTemp);
+            console.log('projectId', this.projectTemp)
             await getAgreement({
               unitId: this.maForm.unitId,
-              projectId: this.maForm.projectId,
-            }).then((response) => {
-              this.agreementId = response.data.agreementId;
-              this.maForm.agreementId = this.agreementId;
-            });
-            this.maForm.taskId = this.taskId;
+              projectId: this.maForm.projectId
+            }).then(response => {
+              this.agreementId = response.data.agreementId
+              this.maForm.agreementId = this.agreementId
+            })
+            this.maForm.taskId = this.taskId
             // this.maForm.checkDetailsList = this.equipmentList
             await this.$modal
-              .confirm("是否确认保存当前页面")
+              .confirm('是否确认保存当前页面')
               .then(function () {})
               .then(() => {
                 if (this.isEdit) {
-                  this.maForm.leaseUnitId = this.maForm.unitId;
-                  this.maForm.leaseProjectId = this.maForm.projectId;
-                  console.log("编辑");
-                  this.loading = true;
+                  this.maForm.leaseUnitId = this.maForm.unitId
+                  this.maForm.leaseProjectId = this.maForm.projectId
+                  console.log('编辑')
+                  this.loading = true
                   updateApplyInfo({
                     leaseApplyDetailsList: this.equipmentList,
-                    leaseApplyInfo: this.maForm,
-                  }).then((response) => {
+                    leaseApplyInfo: this.maForm
+                  }).then(response => {
                     if (response.code == 200) {
-                      this.$modal.msgSuccess("编辑成功");
+                      this.$modal.msgSuccess('编辑成功')
                       // this.$tab.closeOpenPage({
                       //     path: '/store/newBuy/newDevicesList',
                       // })
 
-                      this.$emit("addToolsSuccess");
+                      this.$emit('addToolsSuccess')
                     }
-                    this.loading = false;
-                  });
+                    this.loading = false
+                  })
                 } else if (!this.isEdit) {
-                  console.log("新增");
+                  console.log('新增')
                   // console.log(this.equipmentList)
-                  this.loading = true;
+                  this.loading = true
                   addApplyInfo({
                     leaseApplyDetailsList: this.equipmentList,
-                    leaseApplyInfo: this.maForm,
-                  }).then((response) => {
+                    leaseApplyInfo: this.maForm
+                  }).then(response => {
                     if (response.code == 200) {
-                      this.$modal.msgSuccess("新增成功");
+                      this.$modal.msgSuccess('新增成功')
                       // this.$tab.closeOpenPage({
                       //     path: '/store/newBuy/newDevicesList',
                       // })
 
-                      this.$emit("addToolsSuccess");
+                      this.$emit('addToolsSuccess')
                     }
-                    this.loading = false;
-                  });
+                    this.loading = false
+                  })
                 }
               })
-              .catch(() => {});
+              .catch(() => {})
           }
-        });
+        })
       } else {
-        this.$modal.msgError("请先添加类型规格");
+        this.$modal.msgError('请先添加类型规格')
       }
     },
     //文件管理
     openFileDialog(row) {
-      this.rowData = row;
+      this.rowData = row
       this.fileDataList = [
-        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
-        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
-        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
-        { dictLabel: "其他", fileType: "4", name: "", url: "" },
-      ];
-      if (this.taskId == "") {
+        { dictLabel: '合格证', fileType: '0', name: '', url: '' },
+        { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
+        { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
+        { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
+        { dictLabel: '其他', fileType: '4', name: '', url: '' }
+      ]
+      if (this.taskId == '') {
         // console.log(this.rowData)
         // console.log(this.rowData.bmFileInfos)
         if (this.rowData.bmFileInfos.length > 0) {
-          this.rowData.bmFileInfos.forEach((item) => {
-            let index = this.fileDataList.findIndex(
-              (v) => v.fileType == item.fileType
-            );
-            this.fileDataList[index].name = item.name;
-            this.fileDataList[index].url = item.url;
-          });
+          this.rowData.bmFileInfos.forEach(item => {
+            let index = this.fileDataList.findIndex(v => v.fileType == item.fileType)
+            this.fileDataList[index].name = item.name
+            this.fileDataList[index].url = item.url
+          })
         }
       } else {
-        this.getFileData();
+        this.getFileData()
       }
-      this.open = true;
+      this.open = true
     },
     getFileData() {
       let param = {
         modelId: this.rowData.typeId,
         taskType: 0,
-        taskId: this.rowData.taskId,
-      };
+        taskId: this.rowData.taskId
+      }
       getPurchaseFileList(param)
-        .then((response) => {
+        .then(response => {
           if (response.rows.length > 0) {
-            response.rows.forEach((item) => {
-              let index = this.fileDataList.findIndex(
-                (v) => v.fileType == item.fileType
-              );
-              this.fileDataList[index].name = item.name;
-              this.fileDataList[index].url = item.url;
-            });
+            response.rows.forEach(item => {
+              let index = this.fileDataList.findIndex(v => v.fileType == item.fileType)
+              this.fileDataList[index].name = item.name
+              this.fileDataList[index].url = item.url
+            })
           }
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     beforeFileUpload(row) {
-      this.rowData.fileType = row.fileType;
+      this.rowData.fileType = row.fileType
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       if (response.code == 200) {
-        if (this.taskId == "") {
+        if (this.taskId == '') {
           //新增逻辑
           // console.log(response)
           // console.log(this.rowData)
           // console.log(this.rowData.bmFileInfos)
           let obj = {
             taskId: this.taskId,
-            taskType: "0",
+            taskType: '0',
             name: response.data.name,
             url: response.data.url,
             modelId: this.rowData.typeId,
-            fileType: this.rowData.fileType,
+            fileType: this.rowData.fileType
             //   "dictLabel": this.rowData.dictLabel,
-          };
+          }
           //根据文件上传返回更新文件管理弹窗内容
-          let index = this.fileDataList.findIndex(
-            (v) => v.fileType == this.rowData.fileType
-          );
-          this.fileDataList[index].name = response.data.name;
-          this.fileDataList[index].url = response.data.url;
+          let index = this.fileDataList.findIndex(v => v.fileType == this.rowData.fileType)
+          this.fileDataList[index].name = response.data.name
+          this.fileDataList[index].url = response.data.url
           //判断当前上传的文件是否已上传过-再往机具类型数据中插入
           if (this.rowData.bmFileInfos.length > 0) {
-            let index2 = this.rowData.bmFileInfos.findIndex(
-              (v) => v.fileType == this.rowData.fileType
-            );
+            let index2 = this.rowData.bmFileInfos.findIndex(v => v.fileType == this.rowData.fileType)
             if (index2 > -1) {
               //相同类型文件重复上传-替换
-              this.rowData.bmFileInfos.splice(index2, 0, obj);
+              this.rowData.bmFileInfos.splice(index2, 0, obj)
             } else {
               //不存在相同类型文件-添加
-              this.rowData.bmFileInfos.push(obj);
+              this.rowData.bmFileInfos.push(obj)
             }
           } else {
-            this.rowData.bmFileInfos.push(obj);
+            this.rowData.bmFileInfos.push(obj)
           }
         } else {
           //编辑逻辑
           let param = {
             taskId: this.taskId,
-            taskType: "0",
+            taskType: '0',
             name: response.data.name,
             url: response.data.url,
             modelId: this.rowData.typeId,
-            fileType: this.rowData.fileType,
+            fileType: this.rowData.fileType
             //   "dictLabel": this.rowData.dictLabel,
-          };
+          }
           uploadPurchaseFile(param)
-            .then((response) => {
-              this.$modal.msgSuccess("上传成功");
-              this.getFileData();
+            .then(response => {
+              this.$modal.msgSuccess('上传成功')
+              this.getFileData()
             })
             .catch(() => {
-              this.$modal.msgError("上传失败");
-            });
+              this.$modal.msgError('上传失败')
+            })
         }
       }
     },
 
     //图片查看
     picturePreview(file) {
-      this.dialogImageUrl = file.url;
-      const parts = file.name.split(".");
-      const extension = parts.pop();
-      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
-        const windowName = file.name;
-        window.open(file.url, windowName);
+      this.dialogImageUrl = file.url
+      const parts = file.name.split('.')
+      const extension = parts.pop()
+      if (
+        extension === 'doc' ||
+        extension === 'DOC' ||
+        extension === 'docx' ||
+        extension === 'DOCX' ||
+        extension === 'pdf' ||
+        extension === 'PDF'
+      ) {
+        const windowName = file.name
+        window.open(file.url, windowName)
       } else {
-        this.dialogVisible = true;
+        this.dialogVisible = true
       }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm("是否确认删除所选择的数据项？")
+        .confirm('是否确认删除所选择的数据项？')
         .then(() => {
-          this.equipmentList = this.equipmentList.filter(
-            item => item.typeId !== row.typeId
-          );
+          this.equipmentList = this.equipmentList.filter(item => item.typeId !== row.typeId)
           // 更新实际存储的选中值
-          this.deviceType = this.equipmentList.map(item => item.typeId);
+          this.deviceType = this.equipmentList.map(item => item.typeId)
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "/material/purchase_check_info/exportDetails",
+        '/material/purchase_check_info/exportDetails',
         { taskId: this.taskId },
         `新购到货详情_${new Date().getTime()}.xlsx`
-      );
+      )
     },
 
-   //委托书文件
-   handleChangeBusinessList(file, fileList) {
+    //委托书文件
+    handleChangeBusinessList(file, fileList) {
       const fileListTemp = fileList.filter(item => {
         return item.uid != file.uid
-      });
-      const parts = file.name.split('.');
-      const extension = parts.pop();
+      })
+      const parts = file.name.split('.')
+      const extension = parts.pop()
       if (fileList.length > 5) {
         this.$message.warning('最多上传5张附件')
         fileList = fileList.filter(item => {
@@ -994,14 +965,13 @@ export default {
       }
       fileList.forEach(file => {
         if (extension === 'pdf') {
-          this.urlTemp = require('../../../../../assets/file.png');
-
+          this.urlTemp = require('../../../../../assets/file.png')
         }
-      });
-      this.maForm.bmFileInfos = fileList;
+      })
+      this.maForm.bmFileInfos = fileList
       console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
       // 手动触发表单验证
-      this.$refs.maForm.validateField('bmFileInfos');
+      this.$refs.maForm.validateField('bmFileInfos')
       // // 根据 bmFileInfos 是否有值来控制 bmFileInfos 的验证
       // if (this.bmFileInfos.length > 0) {
       //   // this.maForm.bmFileInfos = fileList.map(item => item.raw); // 假设需要上传文件对象;
@@ -1019,7 +989,7 @@ export default {
     },
 
     isImage(file) {
-      this.urlTemp = require('@/assets/file.png');
+      this.urlTemp = require('@/assets/file.png')
       if (this.updataIf(file)) {
         return false
       } else {
@@ -1027,19 +997,19 @@ export default {
       }
     },
 
-      // 判断文件类型,图片预览，文件下载
-      updataIf(e) {
+    // 判断文件类型,图片预览，文件下载
+    updataIf(e) {
       if (e.fileName) {
-        const parts = e.fileName.split('.');
-        const extension = parts.pop();
+        const parts = e.fileName.split('.')
+        const extension = parts.pop()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
         } else {
           return true
         }
       } else {
-        const parts = e.name.split('.');
-        const extension = parts.pop();
+        const parts = e.name.split('.')
+        const extension = parts.pop()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
         } else {
@@ -1050,15 +1020,15 @@ export default {
 
     //上传组件-图片查看
     picturePreviewFbs(file) {
-    this.dialogImageUrl = file.url.replaceAll('#','%23');
-    const parts = file.name.split('.');
-    const extension = parts.pop();
-    if (extension === 'pdf') {
-      const windowName = file.name;
-      window.open(file.url, windowName)
-    } else {
-      this.dialogVisible = true
-    }
+      this.dialogImageUrl = file.url.replaceAll('#', '%23')
+      const parts = file.name.split('.')
+      const extension = parts.pop()
+      if (extension === 'pdf') {
+        const windowName = file.name
+        window.open(file.url, windowName)
+      } else {
+        this.dialogVisible = true
+      }
     },
 
     //上传组件-图片删除
@@ -1071,7 +1041,7 @@ export default {
       })
       this.maForm.bmFileInfos.splice(sum, 1)
       if (file.status == 'success') {
-        this.delBusinessFileIdList.push(file.url);
+        this.delBusinessFileIdList.push(file.url)
       }
       console.log('delBusinessFileIdList', this.delBusinessFileIdList)
     },
@@ -1079,19 +1049,18 @@ export default {
     handleDownload(file) {
       console.log(file)
       if (file.status === 'ready') {
-        downloadFile({fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8'})
+        downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       } else if (file.status === 'success') {
-
-        downloadFileData({fileName: file.name, fileUrl: file.url})
+        downloadFileData({ fileName: file.name, fileUrl: file.url })
         // downloadFileData({ fileName: file.name,fileUrl:file.url })
       }
     },
 
     // 高亮文本
     highlightText(text, keyword) {
-      if (!keyword) return text;
-      const reg = new RegExp(keyword, 'gi');
-      return text.replace(reg, match => `<span class="highlight-text">${match}</span>`);
+      if (!keyword) return text
+      const reg = new RegExp(keyword, 'gi')
+      return text.replace(reg, match => `<span class="highlight-text">${match}</span>`)
     },
 
     // 处理下拉框可见性变化
@@ -1099,92 +1068,92 @@ export default {
       if (!visible && this.keepSelectOpen && !this.isSearching) {
         // 只有在非搜索状态下才重新打开下拉框
         this.$nextTick(() => {
-          this.$refs.typeSelect.focus();
-        });
+          this.$refs.typeSelect.focus()
+        })
       }
     },
 
     // 处理搜索框点击
     handleSearchClick() {
-      this.isSearching = true;
-      this.keepSelectOpen = true;
+      this.isSearching = true
+      this.keepSelectOpen = true
       // 确保下拉框打开
-      this.$refs.typeSelect.focus();
+      this.$refs.typeSelect.focus()
       // 立即将焦点返回给搜索框
       this.$nextTick(() => {
-        this.$refs.searchInput.focus();
-      });
+        this.$refs.searchInput.focus()
+      })
     },
 
     // 处理搜索框获得焦点
     handleSearchFocus() {
-      this.isSearching = true;
+      this.isSearching = true
       if (!this.$refs.typeSelect.visible) {
-        this.$refs.typeSelect.focus();
+        this.$refs.typeSelect.focus()
         this.$nextTick(() => {
-          this.$refs.searchInput.focus();
-        });
+          this.$refs.searchInput.focus()
+        })
       }
     },
 
     // 高亮搜索处理
     handleHighlightSearch() {
-      this.isSearching = true;
-      this.keepSelectOpen = true;
+      this.isSearching = true
+      this.keepSelectOpen = true
 
       if (!this.searchKeyword) {
-        this.currentMatchIndex = -1;
-        this.matchedOptions = [];
-        return;
+        this.currentMatchIndex = -1
+        this.matchedOptions = []
+        return
       }
 
       // 找到所有匹配项
       this.matchedOptions = this.filteredOptions.filter(item =>
         item.fullPath.toLowerCase().includes(this.searchKeyword.toLowerCase())
-      );
+      )
 
       if (this.matchedOptions.length > 0) {
-        this.currentMatchIndex = 0;
+        this.currentMatchIndex = 0
         this.$nextTick(() => {
-          this.scrollToMatch();
-        });
+          this.scrollToMatch()
+        })
       }
     },
 
     // 滚动到匹配项
     scrollToMatch() {
-      if (this.currentMatchIndex === -1 || !this.matchedOptions.length) return;
+      if (this.currentMatchIndex === -1 || !this.matchedOptions.length) return
 
-      const option = this.matchedOptions[this.currentMatchIndex];
-      const selectDom = this.$el.querySelector('.el-select-dropdown__wrap');
-      const optionDom = selectDom?.querySelector(`[data-key="${option.typeId}"]`);
+      const option = this.matchedOptions[this.currentMatchIndex]
+      const selectDom = this.$el.querySelector('.el-select-dropdown__wrap')
+      const optionDom = selectDom?.querySelector(`[data-key="${option.typeId}"]`)
 
       if (optionDom) {
-        optionDom.scrollIntoView({ block: 'center', behavior: 'smooth' });
+        optionDom.scrollIntoView({ block: 'center', behavior: 'smooth' })
       }
-    },
+    }
   },
   // 添加组件销毁时的清理
   beforeDestroy() {
-    this.keepSelectOpen = false;
-    this.isSearching = false;
+    this.keepSelectOpen = false
+    this.isSearching = false
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 //隐藏图片上传框的css
-  ::v-deep.disabledFbs {
-    .el-upload--picture-card {
-      display: none;
-    }
-  }
-  ::v-deep .el-upload-list__item {
-    margin-bottom: 20px;
-    overflow: unset !important;
-  }
-  ::v-deep .el-upload-list__item-actions {
-    overflow: unset !important;
+::v-deep.disabledFbs {
+  .el-upload--picture-card {
+    display: none;
   }
+}
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: unset !important;
+}
+::v-deep .el-upload-list__item-actions {
+  overflow: unset !important;
+}
 
 .popper-select {
   .el-cascader-panel .el-scrollbar .el-checkbox {
@@ -1267,7 +1236,6 @@ export default {
   }
 }
 
-
 .el-upload-list__item-thumbnail {
   height: 145px !important;
 }
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 17d8a36b..9e71806e 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -67,16 +67,6 @@
           >领料申请
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleSendAll"
-          >发布
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -102,13 +92,15 @@
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="createTime" width="160" :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="impUnitName" width="120px" :show-overflow-tooltip="true"/>
+      <el-table-column label="领料班组"   align="center" prop="departName" width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="实施单位" align="center" prop="impUnitName" width="120px" :show-overflow-tooltip="true"/>
       <el-table-column label="合同主体" align="center" prop="contractPart" width="120px" :show-overflow-tooltip="true"/>
-      <el-table-column label="租赁单位" align="center" prop="leaseUnit" width="150px" :show-overflow-tooltip="true"/>
+      <el-table-column label="租赁单位" align="center" prop="leaseUnit" width="150px" :show-overflow-tooltip="true"/> -->
       <el-table-column label="租赁工程" align="center" prop="leaseProject" width="150px" :show-overflow-tooltip="true"/>
       <!-- <el-table-column label="领料物资类型" align="center" prop="maTypeNames" width="110px" :show-overflow-tooltip="true"/> -->
-      <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/>
-      <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column>
+      <!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> -->
+      <el-table-column label="领料工器具类型" align="center" prop="leaseType" width="140px" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true"/>
       <!-- <el-table-column label="领料人电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> -->
       <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
@@ -125,9 +117,9 @@
           <el-button size="mini" style="margin-bottom: 10px" type="primary"
             @click="handleUpdate(scope.row)" v-if="scope.row.taskStatus != 4" v-hasPermi="['purchase:info:edit']"
             >编辑</el-button> 
-          <el-button size="mini" style="margin-bottom: 10px" type="success"
+          <!-- <el-button size="mini" style="margin-bottom: 10px" type="success"
             @click="handleSend(scope.row)" v-if="scope.row.taskStatus == 1" v-hasPermi="['purchase:person:notice']"
-            >发布</el-button>
+            >发布</el-button> -->
           <el-button size="mini" type="warning"
             v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)"
             >领料单</el-button>
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 815d7ec8..eeb1c226 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -65,26 +65,26 @@
             <el-table-column align="center" width="100" label="申请时间" prop="createTime" />
             <el-table-column label="申请人" width="100" align="center" prop="createBy" :show-overflow-tooltip="true" />
             <el-table-column
-                label="实施单位"
+                label="领料班组"
                 align="center"
                 prop="impUnitName"
                 width="150px"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
+            <!-- <el-table-column
                 label="合同主体"
                 align="center"
                 prop="contractPart"
                 width="150px"
                 :show-overflow-tooltip="true"
-            />
-            <el-table-column
+            /> -->
+            <!-- <el-table-column
                 label="租赁单位"
                 align="center"
                 prop="leaseUnit"
                 width="150px"
                 :show-overflow-tooltip="true"
-            />
+            /> -->
             <el-table-column
                 label="租赁工程"
                 align="center"
@@ -92,14 +92,14 @@
                 width="150px"
                 :show-overflow-tooltip="true"
             />
-            <!-- <el-table-column
-        label="领料物资类型"
-        align="center"
-        prop="maTypeNames"
-        width="110px"
-        :show-overflow-tooltip="true"
-      /> -->
             <el-table-column
+                label="领料工器具类型"
+                align="center"
+                prop="maTypeNames"
+                width="250px"
+                :show-overflow-tooltip="true"
+            />
+            <!-- <el-table-column
                 label="协议号"
                 align="center"
                 prop="agreementCode"
@@ -128,7 +128,7 @@
                 prop="alNum"
                 width="90px"
                 :show-overflow-tooltip="true"
-            ></el-table-column>
+            ></el-table-column> -->
 
             <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />