diff --git a/src/views/material/cost/costDecreaseList.vue b/src/views/material/cost/costDecreaseList.vue
index c182ed32..8e3c0975 100644
--- a/src/views/material/cost/costDecreaseList.vue
+++ b/src/views/material/cost/costDecreaseList.vue
@@ -224,6 +224,30 @@
           </el-row>
         </el-form>
 
+        <el-row style="margin-bottom:20px;margin-left:20px">
+            <el-col :span="10">
+               <span style="font-family: Arial; font-size: 16px; position: relative; padding-left: 20px;">
+                 <span style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 10px; height: 10px; background-color: #f5f7fa; border-radius: 50%; display: inline-block;"></span>
+                 当前减免时间符合的数据条数：{{ num1 }}
+               </span>
+            </el-col> 
+            <el-col :span="8">
+                <span style="font-family: Arial; font-size: 16px; position: relative; padding-left: 20px;">
+                 <span style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 10px; height: 10px; background-color: #c0e6fa; border-radius: 50%; display: inline-block;"></span>
+                 当前减免时间不符合的数据条数：{{ num2 }}
+               </span>
+            </el-col>
+            <el-col :span="6">
+               <el-button
+                  type="success"
+                  size="small"
+                  @click="handleClean"
+                  v-if="num2>0"
+                  >一键去除</el-button
+                >
+            </el-col>
+          </el-row>
+
         <el-table v-loading="loading"  row-key="id" :data="applyList"  
         :span-method="objectSpanMethodApply"  
         border  
@@ -283,7 +307,7 @@
           </el-table-column>          
         </el-table>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" >确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
@@ -353,6 +377,8 @@ export default {
 
       //减免申请list
       applyList: [],
+      //备份所选的数据
+      applyListTemp: [],
 
       //减免费用弹窗
       showApply: false,
@@ -394,6 +420,11 @@ export default {
 
       //弹窗确定按钮是否能点击
       btnDisabled: false,
+
+      //当前符合的数据条数
+      num1: 0,
+      //当前不符合的数据条数
+      num2: 0,
     };
   },
   created() {
@@ -411,8 +442,9 @@ export default {
   methods: {
       getRowClassName({ row, rowIndex }) {
       if (this.dialogAppy.reduceStartTime && this.dialogAppy.reduceEndTime) {
-        if ((!row.reduceStartTime || !row.reduceEndTime)&&rowIndex!=this.applyList.length-1) {
+        if ((!row.reduceStartTime || !row.reduceEndTime) && rowIndex!=this.applyList.length-1) {
           return 'highlight-row'
+        }else{
         }
       }
       return '';
@@ -606,6 +638,7 @@ export default {
         this.uploadKey = Date.now();
         this.delBusinessFileIdList=[];
         this.applyList=[];
+        this.applyListTemp=[];
         // 去除 pushReviewList 数组的最后一个元素，将剩余元素赋值给 paramList
         const paramList = this.pushReviewList.slice(0, -1);
         paramList.forEach((item) => {
@@ -625,6 +658,7 @@ export default {
           reduceLeaseMoney: 0,
         }
         this.applyList.push(obj)
+        this.applyListTemp = this.applyList;
         this.showApply = true;
         this.title = "减免申请";
      },
@@ -780,23 +814,37 @@ export default {
       }
     },
 
+    updateNum() {
+        if (this.dialogAppy.reduceStartTime && this.dialogAppy.reduceEndTime) {
+            this.num2 = this.applyList.slice(0,-1).filter(item =>!item.reduceStartTime ||!item.reduceEndTime).length;
+            this.num1 = this.applyList.filter(item => item.reduceStartTime && item.reduceEndTime).length;
+        }
+    },
+
     // 更新表格中所有数据的减免开始时间
     updateTableStartTime() {
+      this.applyList = this.applyListTemp;
       const pickStartTime = new Date(this.dialogAppy.reduceStartTime);
       this.applyList.slice(0,-1).forEach(item => {
         let validEndTime = item.endTime ? new Date(item.endTime) : new Date();
         if(pickStartTime < new Date(item.startTime) || pickStartTime > validEndTime){
+          console.log('日期无效',validEndTime)
           this.$set(item, 'reduceStartTime', null);
         }else{
+          console.log('日期有效',validEndTime,this.dialogAppy.reduceStartTime)
           this.$set(item, 'reduceStartTime', this.dialogAppy.reduceStartTime);
         }
         // item.reduceStartTime = this.dialogAppy.reduceStartTime;
       });
       if (this.dialogAppy.reduceEndTime) {
+
         this.applyList.slice(0,-1).forEach(item => {
           const startTime = new Date(item.reduceStartTime);
           const endTime = new Date(item.reduceEndTime);
-          if (!isNaN(startTime) && !isNaN(endTime) && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+          const startTimeTemp = item.reduceStartTime;
+           const endTimeTemp = item.reduceEndTime;
+           console.log('日期无效sdadasdsada',startTimeTemp,endTimeTemp,startTime,endTime)
+          if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
             const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
             const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
             this.$set(item, 'reduceDays', diffDays);
@@ -804,7 +852,12 @@ export default {
               this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
             }
             // row.leaseDays = diffDays;
-          }else {
+          }else if(startTimeTemp!=null && item.reduceEndTime==null && startTimeTemp>=item.startTime && startTimeTemp<=item.endTime){
+            this.$set(item, 'reduceEndTime', startTime); 
+            this.$set(item, 'reduceDays', 0); 
+            this.$set(item, 'reduceLeaseMoney', 0);
+          }
+          else {
           this.$set(item, 'reduceStartTime', null); 
           // 如果日期无效，将减免天数设为 0 或者清空
           this.$set(item, 'reduceDays', 0); 
@@ -815,13 +868,17 @@ export default {
         }, 0);
       });
       }
+      this.updateNum()
     },
     // 更新表格中所有数据的减免结束时间
     updateTableEndTime() {
+      this.applyList = this.applyListTemp;
       const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
       this.applyList.slice(0,-1).forEach(item => {
          let validEndTime = item.endTime ? new Date(item.endTime) : new Date();
+         console.log('666666666666',item.startTime,pickEndTime)
         if(pickEndTime < new Date(item.startTime) || pickEndTime > validEndTime){
+          
           this.$set(item, 'reduceEndTime', null);
         }else{
           this.$set(item, 'reduceEndTime', this.dialogAppy.reduceEndTime);
@@ -832,7 +889,11 @@ export default {
         this.applyList.slice(0,-1).forEach(item => {
           const startTime = new Date(item.reduceStartTime);
           const endTime = new Date(item.reduceEndTime);
-          if (!isNaN(startTime) && !isNaN(endTime) && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+          const startTimeTemp = item.reduceStartTime;
+          const endTimeTemp = item.reduceEndTime;
+          console.log('xxxxxxxxxxxxx',endTimeTemp,item.startTime,item.endTime,item.reduceEndTime)
+          if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+            console.log('zzzzzzzzzzzzzz')
             const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
             const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
             this.$set(item, 'reduceDays', diffDays);
@@ -841,6 +902,11 @@ export default {
               this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
             }
             // row.leaseDays = diffDays;
+          }else if(endTimeTemp!=null && item.reduceStartTime==null && endTimeTemp>=item.startTime && endTimeTemp<=item.endTime){
+            console.log('yyyyyyyyyyy',item.reduceEndTime)
+            this.$set(item, 'reduceEndTime', endTime); 
+            this.$set(item, 'reduceDays', 0); 
+            this.$set(item, 'reduceLeaseMoney', 0);
           }else {
           this.$set(item, 'reduceEndTime', null); 
           // 如果日期无效，将减免天数设为 0 或者清空
@@ -852,6 +918,7 @@ export default {
         }, 0);
       });
       }
+            this.updateNum()
     },
 
     //table中时间改变
@@ -897,6 +964,7 @@ export default {
         this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
           return total + Number(item.reduceLeaseMoney);
         }, 0);
+        this.updateNum()
     },
 
     updateLeaseDaysEnd(row) {
@@ -939,6 +1007,7 @@ export default {
         this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
           return total + Number(item.reduceLeaseMoney);
         }, 0);
+        this.updateNum()
     },
 
     //table中数量改变
@@ -968,13 +1037,13 @@ export default {
           if(index3>-1){
             this.$modal.msgError('减免数量不能为0！') 
           }else if(index4>-1){
-            this.$modal.msgError('请选择减免开始时间！') 
+            this.$modal.msgError('请先去除减免时间不符合的数据！') 
           }else if(index5>-1){
-            this.$modal.msgError('请选择减免结束时间！')
+            this.$modal.msgError('请先去除减免时间不符合的数据！')
           }else if(index2>-1){
             this.$modal.msgError('减免数量不能大于领料数量！')
           }else if(index>-1){
-            this.$modal.msgError('减免结束时间不能小于减免开始时间！')
+            this.$modal.msgError('请先去除减免时间不符合的数据！')
           }else{
             const param = {
               agreementId: this.queryParams.agreementId,
@@ -1009,6 +1078,15 @@ export default {
     },
     closeDiag() {
       this.cancel();
+    },
+
+    handleClean(){
+      // 过滤掉不符合的数据
+      this.applyList = this.applyList.filter((item, index) => {
+        return index === this.applyList.length - 1 || (item.reduceStartTime && item.reduceEndTime);
+      });
+      // 更新符合和不符合的数据条数
+      this.updateNum();
     }
   },
 };
@@ -1035,68 +1113,6 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
-// .clickText {
-//   color: #02a7f0;
-//   cursor: pointer;
-// }
-
-// .tabelAllBottom {
-//   display: flex;
-//   border: 1px solid #dfe6ec;
-//   width:100%;
-//   border-bottom: 1px solid #dfe6ec;
-//   border-top: none;
-// }
-// .columnAll {
-//   flex: 1;
-//   display: flex;
-//   padding: 5px;
-//   border-left: 1px solid #dfe6ec;
-//   width:100%;
-//   align-items: center;
-//   text-align: center;
-//   justify-content: center; /* 将内容对齐到中间 */
-// }
-// .columnAllNum {
-//   padding: 5px;
-//   text-align: center;
-//   width:88.6%;
-//   border-left: none;
-// }
-
-// .tabelFirstBottom {
-//   display: flex;
-//   border: 1px solid #dfe6ec;
-//   width:100%;
-//   border-bottom: 1px solid #dfe6ec;
-//   border-top: none;
-// }
-// .columnFirst {
-//   display: flex ;
-//   background-color: #f8f8f9;
-//   padding: 5px;
-//   border-left: 1px solid #dfe6ec;
-//   width:14.5%;
-//   align-items: center;
-//   text-align: center;
-//   justify-content: center; /* 将内容对齐到中间 */
-// }
-// .columnFirstRight {
-//   padding: 5px;
-//   background-color: #f8f8f9;
-//   border-left: 1px solid #dfe6ec;
-//   width:28.5%;
-//   align-items: center;
-//   text-align: center;
-//   justify-content: center; /* 将内容对齐到中间 */
-// }
-// .columnFirstNum {
-//   background-color: #f8f8f9;
-//   padding: 5px;
-//   text-align: center;
-//   width:41.7%;
-//   border-left: none;
-// }
 
 //文件上传样式
 //隐藏图片上传框的css
diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
new file mode 100644
index 00000000..fb47e6e3
--- /dev/null
+++ b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
@@ -0,0 +1,1095 @@
+<template>
+  <!-- 新增工机具 -->
+  <div>
+    <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small"
+      :rules="rules"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="类型规格" prop="deviceType">
+        <el-row :gutter="10">
+          <el-col :span="15">
+            <el-select
+              ref="typeSelect"
+              v-model="tempDeviceType"
+              multiple
+              filterable
+              placeholder="请输入类型规格"
+              style="width: 500px"
+              @change="handleTypeChange"
+              clearable
+              collapse-tags
+              :filter-method="handleSearchImpl"
+              :popper-class="'type-select-dropdown'"
+              :popper-append-to-body="false"
+              @visible-change="handleVisibleChange"
+            >
+              <el-option
+                v-for="item in filteredOptions"
+                :key="item.typeId"
+                :label="item.fullPath"
+                :value="item.typeId"
+                :data-key="item.typeId"
+              >
+                <span v-html="highlightText(item.fullPath, searchKeyword)"></span>
+                <span style="float: right; color: #8492a6; font-size: 13px">
+                  库存:{{ item.storageNum }}
+                </span>
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-input
+              ref="searchInput"
+              v-model="searchKeyword"
+              placeholder="输入类型规格高亮搜索"
+              prefix-icon="el-icon-search"
+              clearable
+              style="width: 300px"
+              @input="handleHighlightSearch"
+              @focus="handleSearchFocus"
+              @click.native="handleSearchClick"
+            >
+              <template slot="append">
+                <span v-if="matchedOptions.length" style="margin: 0 5px">
+                  {{ currentMatchIndex + 1 }}/{{ matchedOptions.length }}
+                </span>
+              </template>
+            </el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="附件" prop="bmFileInfos" >
+          <el-upload
+            :action="uploadUrl"
+            :file-list="maForm.bmFileInfos"
+            :show-file-list="true"
+            :auto-upload="true"
+            :key="uploadKey"
+            :limit="5"
+            list-type="picture-card"
+            accept=".png, .jpg, .jpeg, .pdf"
+            :on-change="handleChangeBusinessList"
+            :class="{ disabledFbs: uploadDisabled }"
+            :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">
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download"/>
+                </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreviewFbs(file)">
+                <i class="el-icon-zoom-in"/>
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                <i class="el-icon-delete"/>
+                </span>
+              </span>
+            </div>
+            <i class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </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-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-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="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>
+        </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"
+      >
+        <template v-slot="scope">
+          <el-input
+            v-model="scope.row.remark"
+            controls-position="right"
+            style="width: 100%"
+          ></el-input>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            style="color: red" v-if="!scope.row.alNum||scope.row.alNum==0"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="600px" height="600px">
+      <img width="100%" height="500px" :src="dialogImageUrl"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+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'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: "AddTools",
+  dicts: ["purchase_task_status"],
+  components: { Treeselect },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    editTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+    editId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      taskId: "",
+      // isEdit: false,
+      // 遮罩层
+      loading: false,
+      loadingTwo: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      //机具类型
+      equipmentTypeList: [],
+      // 角色表格数据
+      equipmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      unitId: null,
+      projectId: null,
+      // 查询参数
+      queryParams: {
+        equipmentId: undefined,
+        productionTime: "",
+      },
+      maForm: {
+        unitId: undefined,
+        projectId: undefined,
+        arrivalTime: "",
+        purchaser: "",
+        remark: "",
+        purchaseNumber: "",
+        bmFileInfos: [],
+      },
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 表单校验
+      rules: {
+        bmFileInfos: [
+          {
+            required: true,//是否分包商(是：合同编号必填)
+            message: '请上传委托书',
+            trigger: 'change'
+          }
+        ],
+      },
+      deviceTypeTreeProps: {
+        children: "children",
+        label: "typeName",
+        value: "typeId",
+        multiple: true,
+        emitPath: true
+      },
+      deviceType: [],
+      propsKey: 1000,
+      projectTemp: undefined,
+      unitTemp: undefined,
+      agreementId: undefined,
+      // taxRate:0,
+      flattenOptions: [], // 扁平化后的选项数据
+      typePopoverVisible: false,
+      typeOptions: [], // 类型选项
+      allTypeList: [], // 所有类型数据
+      flattenTypeOptions: [], // 扁平化后的选项数据（缓存所有选项）
+      typeGroups: [], // 分组后的类型选项
+      typeGroupsBackup: [], // 备份原始分组数据，用于搜索
+      typeMap: new Map(), // 用于快速查找类型数据
+      tempDeviceType: [], // 临时选中值
+      filteredOptions: [], // 过滤后的选项（用于显示）
+      maxShowOptions: 100, // 最大显示选项数
+      searchTimer: null, // 用于自定义防抖
+      searchKeyword: '', // 高亮搜索关键字
+      currentMatchIndex: -1, // 当前匹配项索引
+      matchedOptions: [], // 匹配的选项
+      keepSelectOpen: false, // 控制下拉框是否保持打开
+      isSearching: false, // 添加搜索状态标记
+
+      urlTemp: '',
+      delBusinessFileIdList: [],
+      //图片查看弹窗
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadKey: Date.now(),
+      //上传
+      // upload: {
+      //   // 设置上传的请求头部
+      //   headers: {Authorization: 'Bearer ' + getToken()},
+      //   // 上传的地址
+      //   url: process.env.VUE_APP_BASE_API + '/file/upload'
+      // },
+      uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+    };
+  },
+  computed: {
+    //图片上传1张后，隐藏上传框
+    uploadDisabled() {
+      return this.maForm.bmFileInfos && this.maForm.bmFileInfos.length == 5
+    },
+    pickerOptions() {
+      return {
+        disabledDate(time) {
+          const currentDate = new Date();
+          currentDate.setHours(0, 0, 0, 0);
+          return time.getTime() < currentDate.getTime();
+        },
+      };
+    },
+  },
+  mounted() {
+    this.equipmentType();//机具类型下拉选
+    if (this.isEdit) {
+      console.log("isEdit", this.isEdit);
+      this.taskId = this.editTaskId;
+      this.id = this.editId;
+      this.getTaskInfo();
+      this.equipmentType();
+    }
+  },
+  methods: {
+
+    /** 机具类型 */
+    equipmentType() {
+      equipmentTypeTree().then((response) => {
+        this.equipmentTypeList = response.data;
+        // 处理并扁平化所有类型数据
+        this.flattenTypeOptions = this.processTypeData(response.data);
+        // 初始显示所有选项
+        this.filteredOptions = [...this.flattenTypeOptions];
+
+        // 反显选中数据
+        if (this.equipmentList.length > 0) {
+          this.deviceType = this.equipmentList.map(item => item.typeId);
+        }
+      });
+    },
+    // 处理类型数据
+    processTypeData(data) {
+      const result = [];
+
+      const traverse = (node, parents = []) => {
+        const path = [...parents, node.typeName];
+
+        if (!node.children || node.children.length === 0) {
+          result.push({
+            typeId: node.typeId,
+            typeName: node.typeName,
+            fullPath: path.join(' / '),
+            searchKey: path.join('').toLowerCase(),
+            storageNum: node.storageNum || 0,
+            maTypeName: parents[parents.length - 1] || '',
+            specificationType: node.typeName,
+            unitName: node.unitName,
+            unitValue: node.unitValue
+          });
+        }
+
+        if (node.children) {
+          node.children.forEach(child => traverse(child, path));
+        }
+      };
+
+      data.forEach(node => traverse(node));
+      return result;
+    },
+    // 搜索处理函数
+    handleSearchImpl(query) {
+      if (!query) {
+        this.filteredOptions = [...this.flattenTypeOptions];
+        return;
+      }
+
+      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;
+
+      // 获取新选中的项
+      const lastSelected = val[val.length - 1];
+      const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected);
+
+      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);
+        } else if (typeData.storageNum <= 0) {
+          this.$message.error("所选物资规格类型暂时无库存，无法申请！");
+          this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected);
+        } else {
+          // 将新项添加到数组开头，实现倒序
+          this.equipmentList.unshift({
+            ...typeData,
+            preNum: 0
+          });
+          this.deviceType.push(lastSelected);
+          this.$message({
+            message: `已添加 ${typeData.typeName}`,
+            type: 'success'
+          });
+        }
+      }
+
+      // 清空临时选中值
+      this.$nextTick(() => {
+        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;
+        // 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
+        // }
+    },
+    //单位，工程树结构数据获取父
+    treeParentsById(list, id) {
+      for (let i in list) {
+        if (list[i].id == id) {
+          //查询到就返回该数组对象的value
+          return [list[i].id];
+        }
+        if (list[i].children) {
+          let node = this.treeParentsById(list[i].children, id);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            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;
+    },
+    /** 保存按钮操作 */
+    handleSave() {
+      // console.log(this.equipmentList)
+      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) => {
+          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
+                }
+              }
+
+            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;
+            // this.maForm.checkDetailsList = this.equipmentList
+            await this.$modal
+              .confirm("是否确认保存当前页面")
+              .then(function () {})
+              .then(() => {
+                if (this.isEdit) {
+                  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) => {
+                    if (response.code == 200) {
+                      this.$modal.msgSuccess("编辑成功");
+                      // this.$tab.closeOpenPage({
+                      //     path: '/store/newBuy/newDevicesList',
+                      // })
+
+                      this.$emit("addToolsSuccess");
+                    }
+                    this.loading = false;
+                  });
+                } else if (!this.isEdit) {
+                  console.log("新增");
+                  // console.log(this.equipmentList)
+                  this.loading = true;
+                  addApplyInfo({
+                    leaseApplyDetailsList: this.equipmentList,
+                    leaseApplyInfo: this.maForm,
+                  }).then((response) => {
+                    if (response.code == 200) {
+                      this.$modal.msgSuccess("新增成功");
+                      // this.$tab.closeOpenPage({
+                      //     path: '/store/newBuy/newDevicesList',
+                      // })
+
+                      this.$emit("addToolsSuccess");
+                    }
+                    this.loading = false;
+                  });
+                }
+              })
+              .catch(() => {});
+          }
+        });
+      } else {
+        this.$modal.msgError("请先添加类型规格");
+      }
+    },
+    //文件管理
+    openFileDialog(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 == "") {
+        // 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;
+          });
+        }
+      } else {
+        this.getFileData();
+      }
+      this.open = true;
+    },
+    getFileData() {
+      let param = {
+        modelId: this.rowData.typeId,
+        taskType: 0,
+        taskId: this.rowData.taskId,
+      };
+      getPurchaseFileList(param)
+        .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;
+            });
+          }
+        })
+        .catch(() => {});
+    },
+    beforeFileUpload(row) {
+      this.rowData.fileType = row.fileType;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 200) {
+        if (this.taskId == "") {
+          //新增逻辑
+          // console.log(response)
+          // console.log(this.rowData)
+          // console.log(this.rowData.bmFileInfos)
+          let obj = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            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;
+          //判断当前上传的文件是否已上传过-再往机具类型数据中插入
+          if (this.rowData.bmFileInfos.length > 0) {
+            let index2 = this.rowData.bmFileInfos.findIndex(
+              (v) => v.fileType == this.rowData.fileType
+            );
+            if (index2 > -1) {
+              //相同类型文件重复上传-替换
+              this.rowData.bmFileInfos.splice(index2, 0, obj);
+            } else {
+              //不存在相同类型文件-添加
+              this.rowData.bmFileInfos.push(obj);
+            }
+          } else {
+            this.rowData.bmFileInfos.push(obj);
+          }
+        } else {
+          //编辑逻辑
+          let param = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          uploadPurchaseFile(param)
+            .then((response) => {
+              this.$modal.msgSuccess("上传成功");
+              this.getFileData();
+            })
+            .catch(() => {
+              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);
+      } else {
+        this.dialogVisible = true;
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(() => {
+          this.equipmentList = this.equipmentList.filter(
+            item => item.typeId !== row.typeId
+          );
+          // 更新实际存储的选中值
+          this.deviceType = this.equipmentList.map(item => item.typeId);
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/exportDetails",
+        { taskId: this.taskId },
+        `新购到货详情_${new Date().getTime()}.xlsx`
+      );
+    },
+
+   //委托书文件
+   handleChangeBusinessList(file, fileList) {
+      const fileListTemp = fileList.filter(item => {
+        return item.uid != file.uid
+      });
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if (fileList.length > 5) {
+        this.$message.warning('最多上传5张附件')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (!(extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')) {
+        this.$message.warning('文件格式不正确')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (file.size > 1024 * 1024 * 10) {
+        this.$message.warning('文件大小不能超过10Mb')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (file.name.length > 40) {
+        this.$message.warning('文件名长度不能超过40个字符')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (fileListTemp.some(item => item.name === file.name)) {
+        this.$message.warning('文件名重复')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }
+      fileList.forEach(file => {
+        if (extension === 'pdf') {
+          this.urlTemp = require('../../../../../assets/file.png');
+
+        }
+      });
+      this.maForm.bmFileInfos = fileList;
+      console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
+      // 手动触发表单验证
+      this.$refs.maForm.validateField('bmFileInfos');
+      // // 根据 bmFileInfos 是否有值来控制 bmFileInfos 的验证
+      // if (this.bmFileInfos.length > 0) {
+      //   // this.maForm.bmFileInfos = fileList.map(item => item.raw); // 假设需要上传文件对象;
+      //   // 有值，手动标记验证通过
+      //   console.log('222222222222222')
+      //   this.$refs.maForm.clearValidate('bmFileInfos');
+      // } else {
+      //   // maForm.bmFileInfos = false;
+      //   console.log('33333333')
+      //   // 无值，手动触发验证失败
+      //   this.$refs.maForm.validateField('bmFileInfos');
+      // }
+
+      console.log('4444444444')
+    },
+
+    isImage(file) {
+      this.urlTemp = require('@/assets/file.png');
+      if (this.updataIf(file)) {
+        return false
+      } else {
+        return true
+      }
+    },
+
+      // 判断文件类型,图片预览，文件下载
+      updataIf(e) {
+      if (e.fileName) {
+        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();
+        if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+
+    //上传组件-图片查看
+    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
+    }
+    },
+
+    //上传组件-图片删除
+    handleRemoveElectricianImgList(file, fileList) {
+      let sum = 0
+      this.maForm.bmFileInfos.forEach((item, index) => {
+        if (item.uid == file.uid) {
+          sum = index
+        }
+      })
+      this.maForm.bmFileInfos.splice(sum, 1)
+      if (file.status == 'success') {
+        this.delBusinessFileIdList.push(file.url);
+      }
+      console.log('delBusinessFileIdList', this.delBusinessFileIdList)
+    },
+
+    handleDownload(file) {
+      console.log(file)
+      if (file.status === 'ready') {
+        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 })
+      }
+    },
+
+    // 高亮文本
+    highlightText(text, keyword) {
+      if (!keyword) return text;
+      const reg = new RegExp(keyword, 'gi');
+      return text.replace(reg, match => `<span class="highlight-text">${match}</span>`);
+    },
+
+    // 处理下拉框可见性变化
+    handleVisibleChange(visible) {
+      if (!visible && this.keepSelectOpen && !this.isSearching) {
+        // 只有在非搜索状态下才重新打开下拉框
+        this.$nextTick(() => {
+          this.$refs.typeSelect.focus();
+        });
+      }
+    },
+
+    // 处理搜索框点击
+    handleSearchClick() {
+      this.isSearching = true;
+      this.keepSelectOpen = true;
+      // 确保下拉框打开
+      this.$refs.typeSelect.focus();
+      // 立即将焦点返回给搜索框
+      this.$nextTick(() => {
+        this.$refs.searchInput.focus();
+      });
+    },
+
+    // 处理搜索框获得焦点
+    handleSearchFocus() {
+      this.isSearching = true;
+      if (!this.$refs.typeSelect.visible) {
+        this.$refs.typeSelect.focus();
+        this.$nextTick(() => {
+          this.$refs.searchInput.focus();
+        });
+      }
+    },
+
+    // 高亮搜索处理
+    handleHighlightSearch() {
+      this.isSearching = true;
+      this.keepSelectOpen = true;
+
+      if (!this.searchKeyword) {
+        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.$nextTick(() => {
+          this.scrollToMatch();
+        });
+      }
+    },
+
+    // 滚动到匹配项
+    scrollToMatch() {
+      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}"]`);
+
+      if (optionDom) {
+        optionDom.scrollIntoView({ block: 'center', behavior: 'smooth' });
+      }
+    },
+  },
+  // 添加组件销毁时的清理
+  beforeDestroy() {
+    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;
+  }
+
+.popper-select {
+  .el-cascader-panel .el-scrollbar .el-checkbox {
+    display: none;
+  }
+
+  .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+    display: block !important;
+  }
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+.el-icon-arrow-down.is-reverse {
+  transform: rotateZ(180deg);
+}
+
+// .el-tree {
+//   max-height: 300px;
+//   overflow-y: auto;
+// }
+
+.highlight-text {
+  background-color: #ffd04b;
+  color: #000;
+}
+
+::v-deep .el-input-group__append {
+  padding: 0;
+  .el-button {
+    padding: 0 10px;
+    border: none;
+    height: 100%;
+    &:first-child {
+      border-right: 1px solid #dcdfe6;
+    }
+    &[disabled] {
+      color: #c0c4cc;
+    }
+  }
+}
+
+.type-select-dropdown {
+  .el-select-dropdown__wrap {
+    max-height: 400px !important;
+  }
+
+  .el-select-dropdown__item {
+    height: auto;
+    padding: 8px 20px;
+    white-space: normal;
+    word-break: break-all;
+  }
+}
+
+.highlight-text {
+  background-color: #ffd04b;
+  color: #000;
+}
+
+.el-input-group__append {
+  padding: 0;
+  .el-button {
+    padding: 0 10px;
+    border: none;
+    height: 100%;
+    &:first-child {
+      border-right: 1px solid #dcdfe6;
+    }
+    &[disabled] {
+      color: #c0c4cc;
+    }
+  }
+}
+
+
+.el-upload-list__item-thumbnail {
+  height: 145px !important;
+}
+
+.picture-card-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.picture-card {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  justify-content: center;
+  
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+
+.file-name {
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px;
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color: #333;
+  z-index: 999999;
+}
+
+.file-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+}
+</style>
diff --git a/src/views/material/repair/inventoryScrap/component/homeApply.vue b/src/views/material/repair/inventoryScrap/component/homeApply.vue
new file mode 100644
index 00000000..9e66b2ed
--- /dev/null
+++ b/src/views/material/repair/inventoryScrap/component/homeApply.vue
@@ -0,0 +1,370 @@
+<template>
+  <div>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item>
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 240px"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item prop="taskStatus">
+        <el-select
+          v-model="queryParams.taskStatus"
+          placeholder="请选择状态"
+          clearable
+          filterable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.lease_task_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索
+        </el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增报废
+        </el-button>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" row-key="id" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
+      <el-table-column width="60" align="center" label="序号" type="index" >
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报废单号" align="center" prop="createTime" width="160" :show-overflow-tooltip="true"/>
+      <el-table-column label="物资类型"   align="center" prop="createBy"  :show-overflow-tooltip="true"/>
+      <el-table-column label="提交人" align="center" prop="impUnitName"  :show-overflow-tooltip="true"/>
+      <el-table-column label="提交时间" align="center" prop="contractPart"  :show-overflow-tooltip="true"/>
+      <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.lease_task_status" :value="scope.row.taskStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" >
+        <template slot-scope="scope">
+          <el-button size="mini" style="margin-bottom: 10px" type="normal" 
+            @click="handleView(scope.row)" 
+            >查看</el-button>
+          <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" type="danger"
+            @click="handleDeletePurchase(scope.row)" v-if="scope.row.taskStatus == 1" v-hasPermi="['purchase:info:remove']"
+            >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import {
+  getListLeaseApply,
+  getPurchaseCheckInfo,
+  getAcceptanceForm,
+  purchaseCheckInfoRemove,
+  queryStatusDataApi,
+  getApplyInfo,
+  applyRemove,
+  applySend,
+  applySendAll,
+  getCheckInfo
+} from "@/api/lease/apply";
+
+import vueEasyPrint from "vue-easy-print";
+import printJS from 'print-js';
+
+export default {
+  name: "Home",
+  dicts: ["lease_task_status", "ma_type_manage_type"],
+  components: { vueEasyPrint },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      loadingTwo: true,
+      updateTime: "",
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      showPeople: false,
+      peopleOpen: false,
+      // 总条数
+      total: 0,
+      totalTwo: 0,
+      //搜索下拉数据
+      typesList: [],
+      modelList: [],
+      // 字典表格数据
+      typeList: [],
+      getListPeople: [],
+      configUserList: [],
+      phoneNumbers: [],
+      //选择人员
+      chosenUserList: [],
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 日期范围
+      dateRange: [],
+      statusDataRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        time: null, //申请时间  
+        keyWord: "",
+        taskStatus: null, //申请时间  
+      },
+      form: {
+        remark: "",
+      },
+      openPrint: false,
+      open: false,
+      printData: {},
+      printTableData: [],
+      checkDataInfo: {},
+      // 供应商
+      supplierStr: "",
+
+      //领料单
+      leaseApplyDetails: [],
+      // 领料任务详情数据
+      leaseApplyData: {},
+      sendTemp: [],
+      // 编码管理查看弹窗
+      showView: false,
+      titleView: "",
+      getListViewInfo: [],
+    };
+  },
+  created() {
+    // this.getStatusList();
+    this.getList();
+    // this.getTypeList()
+  }, 
+  methods: {
+    // getTypeList() {
+    //     getTypeList({ level: '3' }).then((response) => {
+    //         this.typesList = response.data
+    //     })
+    //     getTypeList({ level: '4' }).then((response) => {
+    //         this.modelList = response.data
+    //     })
+    // },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.sendTemp = [];
+      this.ids = selection.map((item) => item.id);
+      selection.forEach((item) => {
+        this.sendTemp.push({ id: item.id, taskId: item.taskId });
+      });
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+
+    //是否可用勾选框
+    selectable(row) {
+      if (row.taskStatus == 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    getList() {
+      this.loading = true;
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        taskStatus: this.queryParams.taskStatus,
+        startTime: this.queryParams.time && this.queryParams.time[0],
+        endTime: this.queryParams.time && this.queryParams.time[1], 
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+        statusList:[this.queryParams.taskStatus]
+      };
+      getListLeaseApply(params).then((response) => {
+        this.typeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.time = [];
+      this.resetForm("queryForm");
+      this.queryParams.keyWord = "";
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$emit("addTools");
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.$emit("queryTools", row.taskId, row.id);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$emit("editTools", row.taskId, row.id);
+    },
+
+    //----消息通知
+    getNowTime() {
+      var today = new Date();
+      var year = today.getFullYear(); //获取年份
+      var month = today.getMonth() + 1; //获取月份
+      var day = today.getDate(); //获取日期
+      return year + "-" + month + "-" + day;
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        taskId: "",
+        remark: "",
+      };
+      this.resetForm("form");
+    },
+
+    //获取验收单数据
+    getPrintTable(taskId) {
+      getAcceptanceForm({ taskId: taskId }).then((response) => {
+        this.printData = response.data;
+        this.printTableData = response.data.checkDetailsList;
+
+        let supplierList = [];
+        this.printTableData.forEach((e) => {
+          if (e.supplier) {
+            supplierList.push(e.supplier);
+          }
+        });
+        supplierList = [...new Set(supplierList)];
+
+        this.supplierStr = supplierList.join(",");
+      });
+    },
+
+
+
+    // 关闭弹窗并刷新页面
+    closeDialogAndRefresh() {
+      this.openPrint = false;
+    },
+
+    codeInfo(row) {
+      this.showView = true;
+      this.titleView = "查看";
+      this.getListViewInfo = row.maCodeVoList;
+    },
+
+    /** 删除按钮操作 */
+    handleDeletePurchase(row) {
+      // console.log(row)
+      let ids = [];
+      ids.push(row.id);
+      console.log("ids", ids);
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(function () {
+          return applyRemove(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+
+};
+</script>
+<style lang="scss" scoped>
+// ::v-deep.el-table .fixed-width .el-button--mini {
+//   width: 70px !important;
+//   margin-bottom: 10px;
+// }
+
+.image-type {
+    /* 旋转图片 */
+    transform: rotate(-90deg);
+    /* 确保旋转后的图片不会超出容器 */
+    max-width: 100%;
+    /* 保持图片的宽高比 */
+    width: 40px;
+    height: 100px;
+  }
+  .sign-type{
+    width: 100px;
+    height: 40px;
+  }
+
+</style>
diff --git a/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue b/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue
new file mode 100644
index 00000000..b88cca76
--- /dev/null
+++ b/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue
@@ -0,0 +1,276 @@
+<template>
+  <div>
+    <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small" 
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="租赁单位" prop="unitId">
+        <el-cascader
+          v-model="unitId"
+          :show-all-levels="false"
+          :options="uniteList"
+          :props="selectTreeProps"
+          filterable
+          clearable
+          collapse-tags 
+          disabled
+          placeholder="请选择租赁单位"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item label="租赁工程" prop="projectId">
+        <el-cascader
+          v-model="projectId"
+          :show-all-levels="false"
+          :options="projectList"
+          :props="selectTreeProps"
+          filterable
+          clearable
+          collapse-tags 
+          disabled
+          placeholder="请选择租赁工程"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item label="领料人" prop="leasePerson">
+        <el-input
+          v-model="maForm.leasePerson"
+          placeholder="请输入领料人"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          disabled
+        />
+      </el-form-item>
+
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="maForm.phone"
+          placeholder="请输入联系电话"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          disabled
+        />
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="equipmentList">
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column
+        label="类型名称"
+        align="center"
+        prop="maTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="计量单位"
+        align="center"
+        prop="unitName"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+      <el-table-column
+        label="当前库存"
+        align="center"
+        prop="storageNum"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+      <el-table-column
+        label="预领数量"
+        align="center"
+        prop="preNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出库数量"
+        align="center"
+        prop="alNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getPurchaseCheckInfo } from "@/api/purchase/goodsArrived";
+import {
+  uploadPurchaseFile,
+  getPurchaseFileList,
+} from "@/api/purchase/goodsAccept";
+import { getApplyInfo, getListProject, getListUnite } from "@/api/lease/apply";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "QueryTools",
+  dicts: ["purchase_task_status"],
+  components: {
+    // UploadImg,
+  },
+  props: {
+    isView: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    queryTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+    queryId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      //任务ID
+      taskId: "",
+      // 遮罩层
+      loading: true,
+      //租赁单位
+      uniteList: [],
+      //租赁工程
+      projectList: [],
+      // 表格数据
+      equipmentList: [],
+      unitId: null,
+      projectId: null,
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      maForm: {
+        unitId: undefined,
+        projectId: undefined,
+      },
+      selectTreeProps: {
+        children: "children",
+        label: "name",
+        // multiple: false,
+        value: "id",
+        // multiple: true,
+      },
+    };
+  },
+  computed: {},
+  mounted() {
+    this.taskId = this.queryTaskId;
+    this.id = this.queryId;
+    this.projectInfoList();
+    this.getTaskInfo();
+  },
+  methods: {
+    /** 租赁单位和工程-下拉选 */
+    projectInfoList() {
+      getListUnite({ id: null }).then((response) => {
+        this.uniteList = response.data;
+      });
+      getListProject({ id: null }).then((response) => {
+        this.projectList = response.data;
+      });
+    },
+    //获取任务详情-列表数据
+    getTaskInfo() {
+      this.loading = true;
+      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;
+
+        this.loading = false;
+      });
+    },
+    //单位，工程树结构数据获取父
+    treeParentsById(list, id) {
+      for (let i in list) {
+        if (list[i].id == id) {
+          //查询到就返回该数组对象的value
+          return [list[i].id];
+        }
+        if (list[i].children) {
+          let node = this.treeParentsById(list[i].children, id);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            node.unshift(list[i].id);
+            return node;
+          }
+        }
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/lease_apply_info/exportDetails",
+        { id: this.id },
+        `领料申请详情_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
+  }
+}
+.custom-textarea {
+  width: 300px;
+  height: 100px;
+}
+.accept-img {
+  color: #409eff;
+
+  .a-two {
+    margin-left: 20px;
+  }
+}
+
+.left-tip {
+  font-size: 16px;
+  letter-spacing: 1px;
+}
+</style>
diff --git a/src/views/material/repair/inventoryScrap/index.vue b/src/views/material/repair/inventoryScrap/index.vue
new file mode 100644
index 00000000..bd2ecf63
--- /dev/null
+++ b/src/views/material/repair/inventoryScrap/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <!-- 盘点报废管理 -->
+  <div class="app-container">
+    <PageHeaderApply
+      v-if="isShowComponent != 'Home'"
+      :pageContent="pageContent"
+      @goBack="goBack"
+    />
+    <component
+      :is="isShowComponent"
+      :isEdit="isEdit"
+      :editTaskId="editTaskId"
+      :editId="editId"
+      :queryTaskId="queryTaskId"
+      :queryId="queryId"
+      :isView="isView"
+      :codingTaskId="codingTaskId"
+      @addTools="addTools"
+      @editTools="editTools"
+      @addToolsSuccess="addToolsSuccess"
+      @queryTools="queryTools"
+    />
+  </div>
+</template>
+  
+<script>
+import PageHeaderApply from "@/components/pageHeaderApply";
+import Home from "./component/homeApply.vue"; // 主列表
+import AddTools from "./component/addToolsApply.vue"; // 新增机具 和 修改机具
+import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
+export default {
+  components: {
+    Home,
+    PageHeaderApply,
+    AddTools,
+    QueryTools,
+  },
+  data() {
+    return {
+      isShowComponent: "Home",
+      pageContent: "盘点报废申请",
+      isEdit: false,
+      editTaskId: "",
+      editId: "",
+      queryId: "",
+      queryTaskId: "",
+      isView: false,
+      codingTaskId: "",
+    };
+  },
+
+  methods: {
+    /* 新增工机具 */
+    addTools() {
+      this.isEdit = false;
+      this.editTaskId = "";
+      this.queryTaskId = "";
+      this.pageContent = "报废新增";
+      this.isShowComponent = "AddTools";
+    },
+    /* 新增成功 */
+    addToolsSuccess() {
+      this.isShowComponent = "Home";
+    },
+    /* 编辑工机具 */
+    editTools(taskId, id) {
+      this.isEdit = true;
+      this.pageContent = "报废编辑";
+      this.editTaskId = taskId;
+      this.editId = id;
+      this.isShowComponent = "AddTools";
+    },
+    /* 查询工机具 */
+    queryTools(taskId, id) {
+      this.isView = true;
+      this.pageContent = "详情信息";
+      this.queryTaskId = taskId;
+      this.queryId = id;
+      this.isShowComponent = "QueryTools";
+    },
+    /* 返回按钮 */
+    goBack() {
+      this.isShowComponent = "Home";
+    },
+  },
+};
+</script>
\ No newline at end of file