diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index fe41d20c..7d4f39dd 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -173,7 +173,7 @@
                  min-width="100"
             >
                 <template slot-scope="scope">
-                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)" v-if="scope.row.manageType==0">查看编码</div>
+                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)" v-if="scope.row.manageType==0">{{ scope.row.preNum }}</div>
                     <!-- <el-input
                         v-if="scope.row.manageType==1"
                         v-model.number="scope.row.preNum"
@@ -184,7 +184,7 @@
                         @input="checkNum(scope.row)"
                         style="width: 100%"
                     /> -->
-                    <div>{{ scope.row.preNum }}</div>
+                    <div v-if="scope.row.manageType==1">{{ scope.row.preNum }}</div>
                 </template>
             </el-table-column>
             <el-table-column
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 4ce3253c..e9be6425 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -116,6 +116,7 @@
             @click="handleNotice(scope.row)" v-hasPermi="['purchase:person:notice']"
             >通知</el-button>
           <el-button size="mini" type="warning" 
+            v-if="scope.row.taskStatusName == '未完成'"
             @click="handlePrint(scope.row)"
             >验收单</el-button> 
           <el-button size="mini" type="danger" v-hasPermi="['purchase:info:remove']"
diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
index c496ae72..145b6108 100644
--- a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
+++ b/src/views/material/repair/inventoryScrap/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="deviceType">
         <el-row :gutter="10">
           <el-col :span="15">
@@ -35,9 +28,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>
@@ -63,7 +54,7 @@
         </el-row>
       </el-form-item>
       <div>
-      <el-form-item label="附件" prop="bmFileInfos" >
+        <el-form-item label="附件" prop="bmFileInfos">
           <el-upload
             :action="uploadUrl"
             :file-list="maForm.bmFileInfos"
@@ -78,23 +69,22 @@
             :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 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="">
+                <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"/>
+                  <i class="el-icon-download" />
                 </span>
                 <span v-else class="el-upload-list__item-preview" @click="picturePreviewFbs(file)">
-                <i class="el-icon-zoom-in"/>
+                  <i class="el-icon-zoom-in" />
                 </span>
                 <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
-                <i class="el-icon-delete"/>
+                  <i class="el-icon-delete" />
                 </span>
               </span>
             </div>
@@ -105,66 +95,48 @@
     </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"
-    >
+    <el-table v-loading="loading" :data="equipmentList">
       <!-- <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="scrapNum" align="center">
-          <template v-slot="scope">
-                <template v-if="scope.row.manageType === '1'">
-                    <el-input
-                        v-model.number="scope.row.scrapNum"
-                        controls-position="right" type="number"
-                        style="width: 100%" 
-                        :min="0" @input="v =>scope.row.scrapNum = Number(v.replace(/[^\d.]/g, ''))"
-                    ></el-input>
-                </template>
-                <template v-else>
-                <span>{{ scope.row.scrapNum }}</span>
-              </template>
+        <template v-slot="scope">
+          <template v-if="scope.row.manageType === '1'">
+            <el-input
+              v-model.number="scope.row.scrapNum"
+              controls-position="right"
+              type="number"
+              style="width: 100%"
+              :min="0"
+              @input="v => (scope.row.scrapNum = Number(v.replace(/[^\d.]/g, '')))"
+            ></el-input>
           </template>
+          <template v-else>
+            <span>{{ scope.row.scrapNum }}</span>
+          </template>
+        </template>
       </el-table-column>
       <el-table-column label="设备编号" align="center" prop="maCodeList" width="200px">
         <template v-slot="scope">
           <template v-if="scope.row.manageType === '0'">
-            <el-select 
-            v-model="scope.row.maCodeList" 
-            placeholder="请选择设备编号" 
-            multiple 
-            collapse-tags 
-            filterable
-            @change="handleDeviceCodeChange(scope.row)"
-            style="width: 180px;"
+            <el-select
+              v-model="scope.row.maCodeList"
+              placeholder="请选择设备编号"
+              multiple
+              collapse-tags
+              filterable
+              @change="handleDeviceCodeChange(scope.row)"
+              style="width: 180px"
             >
               <el-option
                 v-for="item in scope.row.deviceCodeOptions"
@@ -183,18 +155,9 @@
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" label="出库数量" prop="alNum" /> -->
-      <el-table-column
-        label="报废原因"
-        prop="scrapReason"
-        align="center"
-        label-width="500px"
-      >
+      <el-table-column label="报废原因" prop="scrapReason" align="center" label-width="500px">
         <template v-slot="scope">
-          <el-input
-            v-model="scope.row.scrapReason"
-            controls-position="right"
-            style="width: 100%"
-          ></el-input>
+          <el-input v-model="scope.row.scrapReason" controls-position="right" style="width: 100%"></el-input>
         </template>
       </el-table-column>
 
@@ -204,69 +167,60 @@
             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 { getToken } from "@/utils/auth";
-import {
-  uploadPurchaseFile,
-  getPurchaseFileList,
-} from "@/api/purchase/goodsAccept";
-import {downloadFile, downloadFileData} from '@/utils/download'
+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'
-import {
-  getMachineListByCode,
-  addScrapInfo,
-  getScrapInfo,
-  editScrapInfo
-} from "@/api/repair/scrapLedgerReview";
+import { getMachineListByCode, addScrapInfo, getScrapInfo, editScrapInfo } from '@/api/repair/scrapLedgerReview'
 
 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,
@@ -286,7 +240,7 @@ export default {
       // 角色表格数据
       equipmentList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       rowData: {},
@@ -295,37 +249,37 @@ 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: {
         bmFileInfos: [
           {
-            required: true,//是否分包商(是：合同编号必填)
+            required: true, //是否分包商(是：合同编号必填)
             message: '请上传附件',
             trigger: 'change'
           }
-        ],
+        ]
       },
       deviceTypeTreeProps: {
-        children: "children",
-        label: "typeName",
-        value: "typeId",
+        children: 'children',
+        label: 'typeName',
+        value: 'typeId',
         multiple: true,
         emitPath: true
       },
@@ -366,8 +320,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张后，隐藏上传框
@@ -377,52 +331,51 @@ 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.equipmentType();//机具类型下拉选
+    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()
     }
   },
   methods: {
     handleDeviceCodeChange(row) {
-      console.log('maCodeList:', row.maCodeList);
-      const newDeviceCount = row.maCodeList.length;
-      row.scrapNum = newDeviceCount;
+      const newDeviceCount = row.maCodeList.length
+      row.scrapNum = newDeviceCount
     },
 
     /** 机具类型 */
     equipmentType() {
-      equipmentTypeTree().then((response) => {
-        this.equipmentTypeList = response.data;
-        console.log("this.equipmentTypeList", this.equipmentTypeList);
+      equipmentTypeTree().then(response => {
+        this.equipmentTypeList = response.data
+        console.log('this.equipmentTypeList', this.equipmentTypeList)
         // 处理并扁平化所有类型数据
-        this.flattenTypeOptions = this.processTypeData(response.data);
+        this.flattenTypeOptions = this.processTypeData(response.data)
         // 初始显示所有选项
-        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({
@@ -436,400 +389,391 @@ export default {
             unitName: node.unitName,
             unitValue: node.unitValue,
             manageType: node.manageType
-          });
+          })
         }
 
         if (node.children) {
-          node.children.forEach(child => traverse(child, path));
+          node.children.forEach(child => traverse(child, path))
         }
-      };
+      }
 
-      data.forEach(node => traverse(node));
-      return result;
+      data.forEach(node => traverse(node))
+      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;
+      if (!val || val.length === 0) return
 
       // 获取新选中的项
-      const lastSelected = val[val.length - 1];
-      const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected);
-      console.log("typeData", typeData)
+      const lastSelected = val[val.length - 1]
+      const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected)
+      console.log('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 {
           const newItem = {
             ...typeData,
-            scrapNum: 0,
-          };
+            scrapNum: 0
+          }
           // 将新项添加到数组开头，实现倒序
-          this.equipmentList.unshift(newItem);
-          this.deviceType.push(lastSelected);
+          this.equipmentList.unshift(newItem)
+          this.deviceType.push(lastSelected)
           this.$message({
             message: `已添加 ${typeData.typeName}`,
             type: 'success'
-          });
+          })
           // 调用 getDeviceCodeOptions 并赋值
           this.getDeviceCodeOptions(newItem).then(options => {
-            this.$set(newItem, 'deviceCodeOptions', options);
-          });
-            }
+            this.$set(newItem, 'deviceCodeOptions', options)
+          })
+        }
       }
 
       // 清空临时选中值
       this.$nextTick(() => {
-        this.tempDeviceType = [];
-      });
+        this.tempDeviceType = []
+      })
     },
 
-    getDeviceCodeOptions(row) {
+    async getDeviceCodeOptions(row) {
       // 这里假设 handleTypeChange 中有相关数据，你需要根据实际情况调整
       // 例如，假设 this.equipmentList 中有相关数据
       console.log('xxxxxxxxxxxxxxxxx')
-      return  getMachineListByCode({"typeId":row.typeId,"taskId":this.taskId}).then((response) => {
-          console.log("response", response);
-          const relatedData = response.data.map(item => ({ id: item.maId, code: item.maCode  }));
-          console.log("relatedData", relatedData);
-          return relatedData;
-        });
+      const response = await getMachineListByCode({ typeId: row.typeId, taskId: this.taskId })
+      console.log('response', response)
+      const relatedData = response.data.map(item => ({ id: item.maId, code: item.maCode }))
+      console.log('relatedData', relatedData)
+      return relatedData
     },
 
-
     //获取任务详情--- 编辑回显数据
     async getTaskInfo() {
       // this.loading = true;
-      await getScrapInfo({'taskId':this.taskId}).then(async (response) => {
-        this.maForm.bmFileInfos = response.data.fileList;
-        
+      await getScrapInfo({ taskId: this.taskId }).then(async response => {
+        this.maForm.bmFileInfos = response.data.fileList
+
         this.equipmentList = response.data.scrapApplyDetailsList.map(item => {
-         let  newMaCodeList = []
-          if(item.manageType == "0"){
-               newMaCodeList = item.maCodeList.map(maCode => ({
-            id: maCode.maId,
-            code: maCode.maCode
-          }));
+          let newMaCodeList = []
+          if (item.manageType == '0') {
+            newMaCodeList = item.maCodeList.map(maCode => maCode.maId)
           }
           return {
             ...item,
             manageType: item.manageType,
             maCodeList: newMaCodeList,
             deviceCodeOptions: [] // 初始化设备编码选项
-          };
-        });
-          // 为每个设备项获取设备编码选项
-          for (let i = 0; i < this.equipmentList.length; i++) {
-            if(this.equipmentList[i].manageType == "0"){
-            const options = await this.getDeviceCodeOptions(this.equipmentList[i]);
-            this.$set(this.equipmentList[i], 'deviceCodeOptions', options);
-            }
           }
-          console.log("xxxxxxxxxx",this.equipmentList[0].maCodeList)
+        })
+        // 为每个设备项获取设备编码选项
+        for (let i = 0; i < this.equipmentList.length; i++) {
+          if (this.equipmentList[i].manageType == '0') {
+            const options = await this.getDeviceCodeOptions(this.equipmentList[i])
+            console.log('options', options)
+            this.$set(this.equipmentList[i], 'deviceCodeOptions', options)
+          }
+        }
+        console.log('xxxxxxxxxx', this.equipmentList[0].maCodeList)
         // 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
+      // }
     },
 
-
     /** 保存按钮操作 */
     handleSave() {
       // console.log(this.equipmentList)
-      console.log("maForm", this.maForm);
+      console.log('maForm', this.maForm)
       if (this.equipmentList.length > 0) {
-        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].scrapNum<=0){
-                  this.$message.error(`第 ${i + 1} 行的 ${'报废数量必须大于0'} `);
-                  return
-                }
-                if(this.equipmentList[i].scrapNum>this.equipmentList[i].storageNum){
-                  this.$message.error(`第 ${i + 1} 行的 ${'报废数量不可大于库存量'} `);
-                  return
-                }
+            for (let i = 0; i < this.equipmentList.length; i++) {
+              if (this.equipmentList[i].scrapNum <= 0) {
+                this.$message.error(`第 ${i + 1} 行的 ${'报废数量必须大于0'} `)
+                return
               }
+              if (this.equipmentList[i].scrapNum > this.equipmentList[i].storageNum) {
+                this.$message.error(`第 ${i + 1} 行的 ${'报废数量不可大于库存量'} `)
+                return
+              }
+            }
 
             // this.maForm.taskId = this.taskId;
             // this.maForm.checkDetailsList = this.equipmentList
             await this.$modal
-              .confirm("是否确认保存当前页面")
+              .confirm('是否确认保存当前页面')
               .then(function () {})
               .then(() => {
                 if (this.isEdit) {
-                  console.log("编辑");
-                  this.loading = true;
+                  console.log('编辑')
+                  this.loading = true
                   let dataList = []
-                  this.equipmentList.forEach((item) => {
-                     if(item.manageType == 0){
-                       let maCodeList = []
-                       item.maCodeList.forEach((param) => {
-                         maCodeList.push({'maId': param})
-                       })
-                       console.log('maCodeListxxxxxxxxxxxxxxx', maCodeList)
-                       dataList.push({
-                       "typeId": item.typeId,
-                       "scrapNum": item.scrapNum,
-                       'storageNum' : item.storageNum,
-                       'maCodeList': maCodeList,
-                       'scrapReason': item.scrapReason,
-                       })
-                     }else{
-                       dataList.push({
-                       "typeId": item.typeId,
-                       "scrapNum": item.scrapNum,
-                       'storageNum' : item.storageNum,
-                       'scrapReason': item.scrapReason, 
-                       })
-                     }
+                  this.equipmentList.forEach(item => {
+                    if (item.manageType == 0) {
+                      let maCodeList = []
+                      item.maCodeList.forEach(param => {
+                        maCodeList.push({ maId: param })
+                      })
+                      console.log('maCodeListxxxxxxxxxxxxxxx', maCodeList)
+                      dataList.push({
+                        typeId: item.typeId,
+                        scrapNum: item.scrapNum,
+                        storageNum: item.storageNum,
+                        maCodeList: maCodeList,
+                        scrapReason: item.scrapReason
+                      })
+                    } else {
+                      dataList.push({
+                        typeId: item.typeId,
+                        scrapNum: item.scrapNum,
+                        storageNum: item.storageNum,
+                        scrapReason: item.scrapReason
+                      })
+                    }
                   })
                   let list = {
-                    "fileList": this.maForm.bmFileInfos,
-                    "scrapApplyDetailsList":dataList,
-                    "taskId": this.taskId
+                    fileList: this.maForm.bmFileInfos,
+                    scrapApplyDetailsList: dataList,
+                    taskId: this.taskId
                   }
-                  editScrapInfo(list).then((response) => {
+                  editScrapInfo(list).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
                   let dataList = []
-                  this.equipmentList.forEach((item) => {
-                     if(item.manageType == 0){
-                       let maCodeList = []
-                       item.maCodeList.forEach((param) => {
-                         maCodeList.push({'maId': param})
-                       })
-                       console.log('maCodeListxxxxxxxxxxxxxxx', maCodeList)
-                       dataList.push({
-                       "typeId": item.typeId,
-                       "scrapNum": item.scrapNum,
-                       'storageNum' : item.storageNum,
-                       'maCodeList': maCodeList,
-                       'scrapReason': item.scrapReason,
-                       })
-                     }else{
-                       dataList.push({
-                       "typeId": item.typeId,
-                       "scrapNum": item.scrapNum,
-                       'storageNum' : item.storageNum,
-                       'scrapReason': item.scrapReason, 
-                       })
-                     }
+                  this.equipmentList.forEach(item => {
+                    if (item.manageType == 0) {
+                      let maCodeList = []
+                      item.maCodeList.forEach(param => {
+                        maCodeList.push({ maId: param })
+                      })
+                      console.log('maCodeListxxxxxxxxxxxxxxx', maCodeList)
+                      dataList.push({
+                        typeId: item.typeId,
+                        scrapNum: item.scrapNum,
+                        storageNum: item.storageNum,
+                        maCodeList: maCodeList,
+                        scrapReason: item.scrapReason
+                      })
+                    } else {
+                      dataList.push({
+                        typeId: item.typeId,
+                        scrapNum: item.scrapNum,
+                        storageNum: item.storageNum,
+                        scrapReason: item.scrapReason
+                      })
+                    }
                   })
                   let list = {
-                    "fileList": this.maForm.bmFileInfos,
-                    "scrapApplyDetailsList":dataList
+                    fileList: this.maForm.bmFileInfos,
+                    scrapApplyDetailsList: dataList
                   }
-                  addScrapInfo(list).then((response) => {
+                  addScrapInfo(list).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 => {
@@ -858,14 +802,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); // 假设需要上传文件对象;
@@ -883,7 +826,7 @@ export default {
     },
 
     isImage(file) {
-      this.urlTemp = require('@/assets/file.png');
+      this.urlTemp = require('@/assets/file.png')
       if (this.updataIf(file)) {
         return false
       } else {
@@ -891,19 +834,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 {
@@ -914,15 +857,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
+      }
     },
 
     //上传组件-图片删除
@@ -935,7 +878,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)
     },
@@ -943,19 +886,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>`)
     },
 
     // 处理下拉框可见性变化
@@ -963,92 +905,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 {
@@ -1131,7 +1073,6 @@ export default {
   }
 }
 
-
 .el-upload-list__item-thumbnail {
   height: 145px !important;
 }
@@ -1150,7 +1091,7 @@ export default {
   height: 100%;
   object-fit: cover;
   justify-content: center;
-  
+
   // border: 1px solid  #ddd;
   // border-radius: 4px;
 }
diff --git a/src/views/material/repair/scrapLedger/detail.vue b/src/views/material/repair/scrapLedger/detail.vue
index 9c13289f..813239ae 100644
--- a/src/views/material/repair/scrapLedger/detail.vue
+++ b/src/views/material/repair/scrapLedger/detail.vue
@@ -8,12 +8,16 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item  prop="dateRange">
+      <el-form-item prop="time">
           <el-date-picker
-            v-model="queryParams.month"
-            type="month"
-            placeholder="请选择月份">
-          </el-date-picker>
+              v-model="queryParams.time"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              style="width: 240px"
+          ></el-date-picker>
       </el-form-item>
       <el-form-item  prop="keyWord">
           <el-input
@@ -126,7 +130,7 @@ export default {
 
       // 查询参数
       queryParams: {
-        month:null,
+        time:null,
         keyWord: null,
         pageNum: 1,
         pageSize: 10,
@@ -158,8 +162,8 @@ export default {
       const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.month && this.queryParams.month[0],
-          endTime: this.queryParams.month && this.queryParams.month[1],
+          startTime: this.queryParams.time && this.queryParams.time[0],
+          endTime: this.queryParams.time && this.queryParams.time[1],
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum
       }
@@ -174,7 +178,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.keyWord = null;
-      this.queryParams.month = null;
+      this.queryParams.time = null;
       this.handleQuery();
     },
     /** 搜索按钮操作 */
@@ -189,8 +193,8 @@ export default {
         const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.month && this.queryParams.month[0],
-          endTime: this.queryParams.month && this.queryParams.month[1],
+          startTime: this.queryParams.time && this.queryParams.time[0],
+          endTime: this.queryParams.time && this.queryParams.time[1],
       }
       this.download(
         "/material/scrap_apply_details/getScrapDetailsList",
diff --git a/src/views/material/repair/scrapLedger/index.vue b/src/views/material/repair/scrapLedger/index.vue
index d104b5d2..7620f4af 100644
--- a/src/views/material/repair/scrapLedger/index.vue
+++ b/src/views/material/repair/scrapLedger/index.vue
@@ -1,11 +1,12 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item  prop="dateRange">
+        <el-form-item  prop="month">
             <el-date-picker
               v-model="queryParams.month"
               type="month"
-              placeholder="请选择月份">
+              placeholder="请选择月份"
+              value-format="yyyy-MM">
             </el-date-picker>
         </el-form-item>
         <el-form-item  prop="keyWord">
@@ -87,7 +88,6 @@ import { getToken } from '@/utils/auth'
         // 显示搜索条件
         showSearch: true,
         showHouse: false,
-        dateRange:[],
         ids: [],
         infos: [],
         // 总条数
@@ -114,6 +114,7 @@ import { getToken } from '@/utils/auth'
         /** 查询列表 */
         getList() {
             this.loading = true;
+            console.log(this.queryParams)
             getScrapList(this.queryParams).then(response => {
                 this.tableList = response.data.rows;
                 this.total = response.data.total;
@@ -127,8 +128,8 @@ import { getToken } from '@/utils/auth'
         },
         /** 搜索按钮操作 */
         handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
+          this.queryParams.pageNum = 1;
+          this.getList();
         },
         //查看
         handleView(row){