diff --git a/src/api/report/report.js b/src/api/report/report.js
index a56eca39..d81f039e 100644
--- a/src/api/report/report.js
+++ b/src/api/report/report.js
@@ -74,4 +74,31 @@ export function getBackDetailsInputListApi(query) {
       method: 'get',
       params: query
     })
+}
+
+
+
+// 维修报表查询
+export function getRepairListApi(query) {
+  return request({
+    url: '/material/bm_report/getRepairList',
+    method: 'get',
+    params: query
+  })
+}
+// 维修报表查询-无分页
+export function getRepairListNoPageApi(query) {
+  return request({
+    url: '/material/bm_report/getRepairListNoPage',
+    method: 'get',
+    params: query
+  })
+}
+// 维修报表-弹窗查询
+export function getRepairDetailsListApi(query) {
+    return request({
+      url: '/material/bm_report/getRepairDetailsList',
+      method: 'get',
+      params: query
+    })
 }
\ No newline at end of file
diff --git a/src/views/material/archives/index.vue b/src/views/material/archives/index.vue
index 62ee5645..3bd689f6 100644
--- a/src/views/material/archives/index.vue
+++ b/src/views/material/archives/index.vue
@@ -137,7 +137,7 @@
           </el-table-column>
           <el-table-column label="" align="center" width="200">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)">
+              <el-button size="mini" type="text" icon="el-icon-search" @click="handleView(scope.row)" v-if="scope.row.docType!='文件夹'">
                 查看
               </el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">
@@ -251,7 +251,7 @@
           </el-form-item>
         </el-row>
       </el-form>
-    </el-dialog>
+    </el-dialog> 
     
   </div>
 </template>
@@ -575,7 +575,24 @@ export default {
         }
         this.breadcrumbList.push(obj)
         this.getList()
+      }else{
+        //查看文件
+        this.picturePreview(row)
       }
+    },
+     //上传组件-图片查看
+     picturePreview(file) {
+      console.log(file)
+      this.dialogImageUrl = file.docUrl.replaceAll('#','%23');
+      const parts = file.docName.split('.');
+      const extension = parts.pop();
+      console.log(extension)
+      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
+        const windowName = file.docName;
+        window.open(file.docUrl, windowName)
+      } else {
+        this.dialogVisible = true
+      } 
     },
     // 节点单击事件 - 左侧树
     handleNodeClick(data, node) {
@@ -652,9 +669,10 @@ export default {
         return true;
       }
     },
-    //******查看************
+    //查看文件
     handleView(row) {
-      console.log(row)
+      // console.log(row)
+      this.picturePreview(row)
     },
     //顶部重命名按钮
     handleReName(){
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index 6530f4a5..43c31dcf 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -1,14 +1,6 @@
 <template>
     <div>
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :rules="queryRules"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
-        >
+        <el-form :model="queryParams" ref="queryForm" size="small" :rules="queryRules" :inline="true" v-show="showSearch" label-width="100px">
             <el-row>
                 <el-form-item label="退料单位" prop="unitId">
                     <treeselect
@@ -68,7 +60,6 @@
                         style="width: 240px"
                     ></el-input>
                 </el-form-item> -->
-
                 <el-form-item label="退料人" prop="backPerson">
                     <el-input
                         v-model="queryParams.backPerson"
@@ -86,63 +77,61 @@
                         :maxlength="11"
                     />
                 </el-form-item> 
-            </el-row> 
-                <!-- <el-form-item label="物品类型" prop="deviceType"> -->
+            </el-row>
             <el-row :gutter="24" style="display: flex;align-items: center;">
-                        <el-col :span="1.5" style="text-align: center;margin-left: 20px;">
-                            <span style="color: red;">*</span>
-                            <span style="font-size: 14px;font-weight: 600;color: #606266;">物品类型</span>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-select
-                                ref="typeSelect"
-                                v-model="tempDeviceType"
-                                multiple
-                                filterable
-                                placeholder="请输入物品类型"
-                                style="width: 400px"
-                                @change="handleTypeChange"
-                                clearable
-                                collapse-tags
-                                :filter-method="handleSearchImpl"
-                                :popper-class="'type-select-dropdown'"
-                                :popper-append-to-body="false"
-                                @visible-change="handleVisibleChange"
+                    <el-col :span="1.5" style="text-align: center;margin-left: 20px;">
+                        <span style="color: red;">*</span>
+                        <span style="font-size: 14px;font-weight: 600;color: #606266;">物品类型</span>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-select
+                            ref="typeSelect"
+                            v-model="tempDeviceType"
+                            multiple
+                            filterable
+                            placeholder="请输入物品类型"
+                            style="width: 400px"
+                            @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"
                             >
-                                <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.num }}
-                                    </span>
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="5">
-                            <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>
-                   
+                                <span v-html="highlightText(item.fullPath, searchKeyword)"></span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">
+                                    出库:{{ item.num }}
+                                </span>
+                            </el-option>
+                        </el-select>
+                    </el-col>
+                    <el-col :span="5">
+                        <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-cascader
                         :key="propsKey"
                         v-model="deviceType"
@@ -157,8 +146,7 @@
                         popper-class="popper-select"
                         @change="deviceTypeChange"
                     ></el-cascader> -->
-                <!-- </el-form-item> -->
-
+                    <!-- </el-form-item> --> 
                 <el-form-item label="备注" prop="roleName">
                     <el-input
                         v-model="queryParams.remark"
@@ -198,6 +186,7 @@
           >导出</el-button> -->
             </el-col>
         </el-row>
+
         <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
             <el-table-column label="序号" type="index" align="center" min-width="80" />
@@ -214,11 +203,9 @@
             </el-table-column>
             <el-table-column label="退料数量" align="center" prop="preNum" min-width="100">
                 <template slot-scope="scope">
-                    <div
-                        style="color: rgb(2, 167, 240)"
+                    <div style="color: rgb(2, 167, 240)"
                         @click="openAddCode(scope.row)"
-                        v-if="scope.row.manageType == 0"
-                    >
+                        v-if="scope.row.manageType == 0">
                         添加编码
                     </div>
                     <el-input
@@ -244,8 +231,7 @@
                         style="width: 100%"
                     />
                 </template>
-            </el-table-column>
-
+            </el-table-column> 
             <el-table-column label="备注" align="center" prop="remark" min-width="120">
                 <template slot-scope="scope">
                     <el-input
@@ -283,7 +269,6 @@
                     </div>
                 </template>
             </el-table-column>
-
             <el-table-column label="操作" align="center" width="100px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="danger" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
@@ -309,46 +294,18 @@
                     <el-button type="primary" size="mini" @click="handleAddCode">添加编码</el-button>
                 </el-col>
             </el-row> -->
-            <el-table
-                :data="machineList"
-                width="100%"
-                ref="codeTableList"
-                height="450px"
-                row-key="maId"
-                @selection-change="codeSelectionChange"
-            >
+            <el-table :data="machineList" width="100%" ref="codeTableList" height="450px" row-key="maId" @selection-change="codeSelectionChange">
                 <el-table-column type="selection" width="55" align="center" />
                 <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column
-                    label="类型名称"
-                    prop="typeName"
-                    align="center"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="规格型号"
-                    prop="materialName"
-                    align="center"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="设备编码"
-                    prop="maCode"
-                    align="center"
-                    :show-overflow-tooltip="true"
-                ></el-table-column> 
+                <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="materialName" align="center" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="设备编码" prop="maCode" align="center" :show-overflow-tooltip="true"></el-table-column> 
                 <el-table-column label="设备状态" prop="maStatus" align="center" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus" />
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="外观判定"
-                    prop="apDetection"
-                    align="center"
-                    width="150"
-                    :show-overflow-tooltip="true"
-                >
+                <el-table-column label="外观判定" prop="apDetection" align="center" width="150" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <el-input
                             v-model.number="scope.row.apDetection"
@@ -459,6 +416,7 @@ export default {
             maId: '',
             maData: {},
             maCodeList: [], //编码表格
+            tempMaCodeList: [], //编码表格
             machineList: [], // 编码下拉选 集合
             //图片查看弹窗
             dialogImageUrl: '',
@@ -599,11 +557,8 @@ export default {
     },
     mounted() {
         this.GetUnitData()
-        this.GetProData()
-
-        if (this.backId) {
-            //编辑
-            console.log(this.backId)
+        this.GetProData() 
+        if (this.backId) { //编辑 
             this.rowId = this.backId
             this.GetViewByApply()
         }
@@ -821,7 +776,7 @@ export default {
         async GetViewByApply(params) {
             const res = await getBackApplyInfo(this.rowId)
             console.log(res)
-            const data = res.data
+            const data = res.data;
             this.queryParams.unitId = data.backApplyInfo.unitId
             // this.unitId = this.treeParentsById(this.unitList, this.queryParams.unitId)
             this.GetProData()
@@ -829,12 +784,12 @@ export default {
                 this.queryParams.proId = data.backApplyInfo.proId
             }, 500)
             // this.projectId = this.treeParentsById(this.proList, this.queryParams.proId)
-
             this.queryParams.phone = data.backApplyInfo.phone
             this.queryParams.backPerson = data.backApplyInfo.backPerson
             this.queryParams.agreementId = data.backApplyInfo.agreementId
             this.queryParams.remark = data.backApplyInfo.remark
-            this.equipmentList = data.backApplyDetailsList
+            this.equipmentList = data.backApplyDetailsList;
+            this.equipmentList.forEach(item=>{item.tempMaCodeList=item.maCodeList})
             this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
         },
         //单位，工程树结构数据获取父
@@ -1040,13 +995,13 @@ export default {
             template.num = node.data.num
             template.useNum = node.data.useNum
             return template
-        },
-
+        }, 
         // changeMachine(val){
         //     console.log(val)
         //     this.maData = this.machineList.find(option => option.maId == val);
         //     //  = this.machineList[index]
         // },
+
         //编码数据
         async getMachineById(typeId) {
             let param = {
@@ -1064,21 +1019,33 @@ export default {
         },
         //编码类型-弹窗
         async openAddCode(row) {
-            this.rowData = row
+            this.rowData = row;
             await this.getMachineById(row.typeId)
             // this.maId=""
-            if (this.rowData.maCodeList && this.rowData.maCodeList.length > 0) {
-                this.maCodeList = this.rowData.maCodeList
-                // console.log(this.maCodeList)
-                // console.log(this.machineList)
+            if (this.rowData.maCodeList && this.rowData.maCodeList.length > 0) { 
+                console.log(this.maCodeList)
+                console.log(this.machineList)
                 if (this.rowId != '') {
-                    //编辑插入已选数据后再回显勾选
-                    this.maCodeList.forEach(item => {
+                     // //编辑插入已选数据后再回显勾选
+                     this.rowData.tempMaCodeList.forEach(item => {
                         this.machineList.unshift(item) //插入
-                        this.$nextTick(() => {
-                            this.$refs.codeTableList.toggleRowSelection(item, true)
+                        // this.$nextTick(() => {
+                        //     this.$refs.codeTableList.toggleRowSelection(item, true)
+                        // })
+                    })
+                    this.maCodeList = this.rowData.maCodeList;
+                    this.machineList.forEach(item => {
+                        this.maCodeList.forEach(sub => {
+                            if (sub.maId == item.maId) {
+                                this.$nextTick(() => {
+                                    setTimeout(() => {
+                                        this.$refs.codeTableList.toggleRowSelection(item, true)
+                                    }, 500)
+                                })
+                            }
                         })
                     })
+                   
                 } else {
                     //新增回显勾选
                     // console.log("新增")
@@ -1101,8 +1068,7 @@ export default {
         },
         codeSelectionChange(selection) {
             this.maCodeList = selection
-            // console.log(selection)
-
+            // console.log(selection) 
             // this.queryParams.equipmentList = selection
         },
         //查询添加
@@ -1140,8 +1106,8 @@ export default {
         saveDevCode() {
             console.log(this.rowData)
             console.log(this.maCodeList)
-            this.rowData.maCodeList = this.maCodeList
-            this.rowData.preNum = this.maCodeList.length
+            this.rowData.maCodeList = this.maCodeList;
+            this.rowData.preNum = this.maCodeList.length;
             this.open = false
             console.log(this.equipmentList)
         },
@@ -1195,7 +1161,7 @@ export default {
                 this.dialogImageUrl = file.url.replaceAll('#','%23')
                 const parts = file.name.split('.')
                 const extension = parts.pop()
-                if (extension === 'doc' || extension === 'docx' || extension === 'pdf') {
+                if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
                     const windowName = file.name
                     window.open(file.url, windowName)
                 } else {
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index 2c4813fc..bd885405 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -939,7 +939,7 @@ export default {
                 this.dialogImageUrl = file.url.replaceAll('#','%23');
                 const parts = file.name.split('.');
                 const extension = parts.pop();
-                if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
                 const windowName = file.name;
                     window.open(file.url,windowName)
                 }else{
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index ebf6d177..c9f3aa8b 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -836,7 +836,7 @@ export default {
       this.dialogImageUrl = file.url;
       const parts = file.name.split(".");
       const extension = parts.pop();
-      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
         const windowName = file.name;
         window.open(file.url, windowName);
       } else {
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 6b034d3c..99b5bbe1 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -381,7 +381,7 @@
         this.dialogImageUrl = file.url.replaceAll('#','%23');
         const parts = file.name.split('.');
         const extension = parts.pop();
-        if(extension === 'pdf'){
+        if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
           const windowName = file.name;
           window.open(file.url,windowName)
         }else{
@@ -476,7 +476,7 @@
                   })
         }
         fileList.forEach(file=>{
-                  if(extension === 'pdf'){
+                  if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
                       this.urlTemp = require('../../../../assets/file.png');
 
                   }
diff --git a/src/views/material/part/partAccept/detail.vue b/src/views/material/part/partAccept/detail.vue
index 2d42745a..9e1eefd0 100644
--- a/src/views/material/part/partAccept/detail.vue
+++ b/src/views/material/part/partAccept/detail.vue
@@ -515,7 +515,7 @@ export default {
       this.dialogImageUrl = file.url;
       const parts = file.name.split(".");
       const extension = parts.pop();
-      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
         const windowName = file.name;
         window.open(file.url, windowName);
       } else {
diff --git a/src/views/material/part/partArrived/component/addTools.vue b/src/views/material/part/partArrived/component/addTools.vue
index 002e749d..69b8318c 100644
--- a/src/views/material/part/partArrived/component/addTools.vue
+++ b/src/views/material/part/partArrived/component/addTools.vue
@@ -880,7 +880,7 @@ export default {
           this.dialogImageUrl = file.url.replaceAll('#','%23');
           const parts = file.name.split('.');
           const extension = parts.pop();
-          if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
             const windowName = file.name;
             window.open(file.url,windowName)
           }else{
diff --git a/src/views/material/part/partArrived/component/queryTools.vue b/src/views/material/part/partArrived/component/queryTools.vue
index 005a773b..bc378dbf 100644
--- a/src/views/material/part/partArrived/component/queryTools.vue
+++ b/src/views/material/part/partArrived/component/queryTools.vue
@@ -329,7 +329,7 @@ export default {
           this.dialogImageUrl = file.url.replaceAll('#','%23');
           const parts = file.name.split('.');
           const extension = parts.pop();
-          if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
             const windowName = file.name;
             window.open(file.url,windowName)
           }else{
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index 5162b2ff..c916e1ba 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -475,7 +475,7 @@ export default {
       this.dialogImageUrl = file.url.replaceAll('#','%23');
       const parts = file.name.split(".");
       const extension = parts.pop();
-      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
         const windowName = file.name;
         window.open(file.url, windowName);
       } else {
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 5e253ae8..5a46ee5a 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -976,7 +976,7 @@ export default {
             this.dialogImageUrl = file.url.replaceAll("#","%23")
             const parts = file.name.split('.')
             const extension = parts.pop()
-          if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
                 const windowName = file.name
             window.open(file.url,windowName)
           }else{
diff --git a/src/views/material/purchase/goodsArrived/component/queryTools.vue b/src/views/material/purchase/goodsArrived/component/queryTools.vue
index 92104163..967efe65 100644
--- a/src/views/material/purchase/goodsArrived/component/queryTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/queryTools.vue
@@ -306,7 +306,7 @@ export default {
           this.dialogImageUrl = file.url.replaceAll('#','%23');
           const parts = file.name.split('.');
           const extension = parts.pop();
-          if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
             const windowName = file.name;
             window.open(file.url,windowName)
           }else{
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index ae8aea86..473e8d34 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -752,7 +752,7 @@ export default {
       this.dialogImageUrl = file.url.replaceAll('#','%23');
       const parts = file.name.split(".");
       const extension = parts.pop();
-      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
         const windowName = file.name;
         window.open(file.url, windowName);
       } else {
diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index 3d1bb985..019b3d60 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -513,7 +513,7 @@ export default {
         this.dialogImageUrl = file.url.replaceAll('#','%23');
         const parts = file.name.split('.');
         const extension = parts.pop();
-        if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+        if(extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF'){
           const windowName = file.name;
           window.open(file.url,windowName)
         }else{
diff --git a/src/views/material/report/repairReport.vue b/src/views/material/report/repairReport.vue
index 62e94fb4..ede84d38 100644
--- a/src/views/material/report/repairReport.vue
+++ b/src/views/material/report/repairReport.vue
@@ -35,19 +35,30 @@
                     <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
                 </template> 
             </el-table-column> 
-            <el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="计量单位" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="退料数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修合格数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="待报废数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="待修数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="退料日期" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修日期" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="领料单位" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="领料工程" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修人" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修单号" align="center" prop="" :show-overflow-tooltip="true"/>
+            <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
+            <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
+            <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true">
+                <template scope="scope">
+                    <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
+                    <span class="clickText" v-if="scope.row.manageType=='0'" @click="openRecords(scope.row)">
+                        {{ scope.row.backNum }}
+                    </span>
+                    <!-- 否则，直接显示数字 -->
+                    <span v-else>
+                        {{ scope.row.backNum }}
+                    </span>
+                </template> 
+            </el-table-column>
+            <el-table-column label="维修合格数量" align="center" prop="repairedNum" :show-overflow-tooltip="true"/>
+            <el-table-column label="待报废数量" align="center" prop="pendingScrapNum" :show-overflow-tooltip="true"/>
+            <el-table-column label="待修数量" align="center" prop="pendingRepairNum" :show-overflow-tooltip="true"/>
+            <el-table-column label="退料日期" align="center" prop="backTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="维修日期" align="center" prop="repairTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="领料单位" align="center" prop="leaseUnitName" :show-overflow-tooltip="true"/>
+            <el-table-column label="领料工程" align="center" prop="leaseProjectName" :show-overflow-tooltip="true"/>
+            <el-table-column label="维修人" align="center" prop="repairPersonName" :show-overflow-tooltip="true"/>
+            <el-table-column label="维修单号" align="center" prop="code" :show-overflow-tooltip="true"/>
         </el-table>
 
         <pagination
@@ -95,14 +106,10 @@
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true"/>
-                <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
-                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true"/>
-                <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/>
+                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/> 
+                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/> 
+                <el-table-column label="维修人员" align="center" prop="repairPersonName" :show-overflow-tooltip="true"/>
+                <el-table-column label="维修时间" align="center" prop="repairTime" :show-overflow-tooltip="true"/> 
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -116,7 +123,7 @@
 </template>
 
 <script>
-    import { getPurChaseReportListApi,getPurChaseReportListNoPageApi,getPurChaseReportDetailsListApi } from "@/api/report/report"; 
+    import { getRepairListApi, getRepairListNoPageApi, getRepairDetailsListApi } from "@/api/report/report"; 
     export default {
     name: "Report", 
     data() {
@@ -188,7 +195,7 @@
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
-            const res = await getPurChaseReportListApi(params)
+            const res = await getRepairListApi(params)
             if(res.data.rows.length>0){
                 this.tableList = res.data.rows; 
             }else{
@@ -200,14 +207,12 @@
                 startTime: this.dateRange && this.dateRange[0],
                 endTime: this.dateRange && this.dateRange[1],
             }
-            const response = await getPurChaseReportListNoPageApi(param)
+            const response = await getRepairListNoPageApi(param)
                 let obj = {
-                    purchaseNum: response.data.purchaseNum||0,//采购数量
-                    passNum: response.data.passNum||0,//验收合格数量
-                    inputNum: response.data.inputNum||0,//验收合格数量
-                    purchasePrice: response.data.purchasePrice||0,//采购价格(含税)
-                    purchasePriceNoTax: response.data.purchasePriceNoTax||0,//采购价格(不含税)
-                    pendingInputNum: response.data.pendingInputNum||0,//待入库数量
+                    backNum: response.data.backNum||0,//退料数量
+                    repairedNum: response.data.repairedNum||0,//维修合格数量
+                    pendingScrapNum: response.data.pendingScrapNum||0,//待报废数量
+                    pendingRepairNum: response.data.pendingRepairNum||0,//待修数量
                 }
                 this.tableList.unshift(obj)
                 this.loading = false
@@ -227,7 +232,7 @@
         },
         handleExport() {
             this.download(
-                "/material/bm_report/exportPurChaseReportList",
+                "/material/bm_report/exportRepairList",
                 {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
                 `维修报表_${new Date().getTime()}.xlsx`
             );
@@ -242,7 +247,7 @@
         },
         /** 查询弹框列表 */
         getDialogDataList() {
-            getPurChaseReportDetailsListApi(this.dialogQuery).then((response) => {
+            getRepairDetailsListApi(this.dialogQuery).then((response) => {
                 this.dialogList = response.data.rows
                 this.dialogTotal = response.data.total
             })
@@ -260,7 +265,7 @@
         /** 弹框导出操作 */
         handleDialogExport() {
             this.download(
-                'material/bm_report/exportPurChaseReportDetailsList',
+                'material/bm_report/exportRepairDetailsList',
                 { ...this.dialogQuery},
                 `维修报表_退料设备_${new Date().getTime()}.xlsx`,
             )