diff --git a/src/api/lease/apply.js b/src/api/lease/apply.js
index 622b7599..47736caa 100644
--- a/src/api/lease/apply.js
+++ b/src/api/lease/apply.js
@@ -63,10 +63,11 @@ export function getAgreement(data) {
 }
 
 // 领料申请-删除
-export function applyRemove(ids) {
+export function applyRemove(data) {
   return request({
-    url: '/material/lease_apply_info/' + ids,
-    method: 'delete',
+    url: '/material/scrap_apply_details/delete',
+    method: 'post',
+    data,
   })
 }
 
diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue
index 14694f03..35b0d20c 100644
--- a/src/views/business/businessHandling/index.vue
+++ b/src/views/business/businessHandling/index.vue
@@ -214,12 +214,12 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-document" size="mini" @click="handleSave" v-if="!isDetail">
+      <el-col :span="1.5" v-if="!isDetail">
+        <el-button type="primary" plain icon="el-icon-document" size="mini" @click="handleSave">
           {{ isEdit ? '提交' : '发起申请' }}
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="!isDetail">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addColumns">新增条目</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -604,6 +604,7 @@ export default {
       console.log('isEdit', this.isEdit)
       this.getTaskInfo()
     }
+    console.log('🚀 ~ created ~ this.isDetail:', this.isDetail)
     console.log(this.$store, 'this.$store.getters')
     console.log(this.$route.query, 'this.$route.query')
   },
@@ -680,7 +681,6 @@ export default {
     // },
   async getTypeList(row, typeIds, index) {
       console.log('🚀 ~ getTypeList ~ row:', row)
-      console.log('🚀 ~ getTypeList ~ typeId:', typeIds[typeIds.length - 1])
       // 递归循环 获取类型名称
       const filterData = data => {
         data.forEach(item => {
@@ -765,7 +765,7 @@ export default {
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
-      if (node.children && !node.children.length) {
+      if (!Array.isArray(node.children) || node.children.length === 0) {
         delete node.children
       }
       return {
@@ -847,6 +847,7 @@ export default {
     /** 机具类型 */
     equipmentType() {
       equipmentTypeTree().then(response => {
+        console.log('🚀 ~ equipmentTypeTree ~ response:', response)
         this.equipmentTypeList = response.data
         // 处理并扁平化所有类型数据
         this.flattenTypeOptions = this.processTypeData(response.data)
@@ -854,7 +855,7 @@ export default {
         this.filteredOptions = [...this.flattenTypeOptions]
 
         // 反显选中数据
-        if (this.equipmentList.length > 0) {
+        if (this.equipmentList && this.equipmentList.length > 0) {
           this.deviceType = this.equipmentList.map(item => item.typeId)
         }
       })
diff --git a/src/views/business/leasePublish/component/addToolsApply.vue b/src/views/business/leasePublish/component/addToolsApply.vue
index 03effcde..7c269494 100644
--- a/src/views/business/leasePublish/component/addToolsApply.vue
+++ b/src/views/business/leasePublish/component/addToolsApply.vue
@@ -63,7 +63,7 @@
       :data="leaseList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="(row) => row.pendingNum != 0" />
       <el-table-column align="center" label="序号" type="index" width="55" />
       <el-table-column
         align="center"
diff --git a/src/views/inventoryLogs/index.vue b/src/views/inventoryLogs/index.vue
index d532b10e..c12887cd 100644
--- a/src/views/inventoryLogs/index.vue
+++ b/src/views/inventoryLogs/index.vue
@@ -14,6 +14,7 @@
         </el-form-item>
         <el-form-item label="机具规格" prop="typeId">
           <el-cascader
+            v-model="queryParams.typeId"
             placeholder="请选择机具规格"
             :options="deviceTypeTree"
             :props="{  value: 'id',}"
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index 1fc00622..8d729219 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -821,7 +821,7 @@ export default {
         { dictLabel: "合格证", fileType: "0", name: "", url: "" },
         { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
         { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "第三方检测报告", fileType: "3", name: "", url: "" },
         { dictLabel: "其他", fileType: "4", name: "", url: "" },
       ];
       if (this.taskId == "") {
diff --git a/src/views/material/part/partAccept/detail.vue b/src/views/material/part/partAccept/detail.vue
index e52a1b51..05df10af 100644
--- a/src/views/material/part/partAccept/detail.vue
+++ b/src/views/material/part/partAccept/detail.vue
@@ -302,7 +302,7 @@ export default {
         { dictLabel: "合格证", fileType: "0", name: "", url: "" },
         { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
         { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "第三方检测报告", fileType: "3", name: "", url: "" },
         { dictLabel: "其他", fileType: "4", name: "", url: "" },
       ],
       // 查询参数
@@ -507,7 +507,7 @@ export default {
         this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+              {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
         this.getFileData()
         this.open=true
diff --git a/src/views/material/part/partAcceptTwo/detail.vue b/src/views/material/part/partAcceptTwo/detail.vue
index 3725ad0a..3b7e4e9e 100644
--- a/src/views/material/part/partAcceptTwo/detail.vue
+++ b/src/views/material/part/partAcceptTwo/detail.vue
@@ -364,7 +364,7 @@ export default {
         { dictLabel: "合格证", fileType: "0", name: "", url: "" },
         { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
         { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "第三方检测报告", fileType: "3", name: "", url: "" },
         { dictLabel: "其他", fileType: "4", name: "", url: "" },
       ],
       // 查询参数
@@ -608,7 +608,7 @@ export default {
         this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+              {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
               {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
         this.getFileData()
         this.open=true
diff --git a/src/views/material/part/partArrived/component/addTools.vue b/src/views/material/part/partArrived/component/addTools.vue
index 81954748..a40eac43 100644
--- a/src/views/material/part/partArrived/component/addTools.vue
+++ b/src/views/material/part/partArrived/component/addTools.vue
@@ -345,7 +345,7 @@ export default {
                 {dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]},
             ],
             fileListInfo: [],
@@ -669,7 +669,7 @@ export default {
             this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-            {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+            {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
             // console.log(this.rowData)
             // console.log(this.rowData.bmFileInfos)
@@ -692,7 +692,7 @@ export default {
                 this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
                 if (this.rowData.bmFileInfos == null) {
 
diff --git a/src/views/material/part/partArrived/component/queryTools.vue b/src/views/material/part/partArrived/component/queryTools.vue
index 7f94858c..2bec6dab 100644
--- a/src/views/material/part/partArrived/component/queryTools.vue
+++ b/src/views/material/part/partArrived/component/queryTools.vue
@@ -189,7 +189,7 @@ export default {
                 {dictLabel:"合格证",fileType:"0",name:"",url:""},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:""},
                 {dictLabel:"其他",fileType:"4",name:"",url:""},
             ],
             //上传
@@ -233,7 +233,7 @@ export default {
           this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
           this.getFileData()
           this.open=true
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index b4cbf1c6..a8151027 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -307,7 +307,7 @@ export default {
         { dictLabel: '合格证', fileType: '0', name: '', url: '' },
         { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
         { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
-        { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
+        { dictLabel: '第三方检测报告', fileType: '3', name: '', url: '' },
         { dictLabel: '其他', fileType: '4', name: '', url: '' }
       ],
       // 查询参数
@@ -571,7 +571,7 @@ export default {
         { dictLabel: '合格证', fileType: '0', name: '', url: '' },
         { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
         { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
-        { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
+        { dictLabel: '第三方检测报告', fileType: '3', name: '', url: '' },
         { dictLabel: '其他', fileType: '4', name: '', url: '' }
       ]
       this.getFileData()
diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index 564d81b4..2563b80c 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -4,8 +4,8 @@
         <el-form-item  prop="dateRange">
             <el-date-picker
                 v-model="dateRange"
-                type="datetimerange"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                type="daterange"
+                value-format="yyyy-MM-dd"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期">
@@ -132,13 +132,13 @@
             <div style="height: 500px; overflow-y: scroll">
                 <vue-easy-print tableShow ref="remarksPrintRef" class="print" style="padding: 0 5px;">
                 <div id="checkId">
-                    <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
+                    <div class="title" style="text-align: center;font-size: 21px;margin-bottom: 15px">
                         到货验收单
                     </div>
                     <div class="info" style="margin: 10px 20px 0; display: flex; justify-content: space-between; flex-wrap: wrap">
                         <div
                             class="item"
-                            style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+                            style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;max-width: 33%;">
                             <span>生产厂家（供应商）：{{printData.supplier}}</span>
                         </div>
                         <div
@@ -176,9 +176,9 @@
                             <th rowspan="3">备注</th>
                             </tr>
                             <tr>
-                            <th rowspan="2">采购数量</th>
+                            <th rowspan="2">到货数量</th>
                             <th rowspan="2">验收结论</th>
-                            <th colspan="2">质保质量</th>
+                            <th colspan="2">质保资料</th>
                             </tr>
                             <tr>
                             <th>实收份数</th>
@@ -194,7 +194,7 @@
                             <td align="center">{{ row.purchaseNum }}</td>
                             <td align="center">{{ row.checkResult }}</td>
                             <td align="center">{{ row.fileReceiveNum }}</td>
-                            <td align="center">{{ row.isQualified }}</td>
+                            <td align="center">{{ '符合' }}</td>
                             <td align="center">{{ row.remark }}</td>
                             </tr>
                         </tbody>
@@ -202,8 +202,8 @@
                     
                     <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 25%;">供应科：</div>
-                            <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
+                            <div style="width: 30%;">供应科：</div>
+                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
                                 <div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
@@ -211,16 +211,16 @@
                         </div>
 
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 30%;">生产技术科：</div>
-                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
+                            <div style="width: 45%;">生产技术科：</div>
+                            <div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
                                 <div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
                             </div>
                         </div>
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 25%;">库管班：</div>
-                            <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
+                            <div style="width: 30%;">库管班：</div>
+                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
                                 <div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
@@ -309,13 +309,8 @@
         /** 查询列表 */
         getList() {
             this.loading = true;
-            if(this.dateRange.length>0){
-                this.queryParams.startTime=this.dateRange[0]
-                this.queryParams.endTime=this.dateRange[1]
-            }else{
-                this.queryParams.startTime=undefined
-                this.queryParams.endTime=undefined
-            }
+            this.queryParams.startTime= this.dateRange ? this.dateRange[0] : ''
+            this.queryParams.endTime= this.dateRange ? this.dateRange[1] : ''
             this.queryParams.taskStage= 2
             getPurchaseList(this.queryParams).then(response => {
                 this.tableList = response.data.rows;
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 239102be..bd247013 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -54,7 +54,7 @@
             </el-radio-group>
             <!-- <div style="height: 40px; flex: 1;"> -->
             <el-date-picker
-                v-if="dateType === 'day'"
+                v-show="dateType === 'day'"
                 v-model="maForm.productionTime"
                 style="width: 240px"
                 value-format="yyyy-MM-dd"
@@ -65,7 +65,7 @@
             ></el-date-picker>
 
             <el-date-picker
-                v-if="dateType === 'month'"
+                v-show="dateType === 'month'"
                 v-model="maForm.productionTime"
                 style="width: 240px"
                 value-format="yyyy-MM"
@@ -483,7 +483,7 @@ export default {
                 {dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]},
             ],
             fileListInfo: [],
@@ -1034,7 +1034,7 @@ export default {
             this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-            {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+            {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
             {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
             // console.log(this.rowData)
             // console.log(this.rowData.bmFileInfos)
@@ -1057,7 +1057,7 @@ export default {
                 this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
                 if (this.rowData.bmFileInfos == null) {
 
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index d1111384..629eaaea 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -144,13 +144,13 @@
             <div style="height: 500px; overflow-y: scroll">
                 <vue-easy-print tableShow ref="remarksPrintRef" class="print">
                   <div id="checkId">
-                    <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
+                    <div class="title" style="text-align: center;font-size: 21px;margin-bottom: 15px;">
                         到货验收单
                     </div>
                     <div class="info" style="margin: 10px 20px 0; display: flex; justify-content: space-between;">
                         <div
                             class="item"
-                            style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+                            style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;max-width: 33%;">
                             <span>生产厂家（供应商）：{{printData.supplier}}</span>
                         </div>
                         <div
@@ -188,9 +188,9 @@
                             <th rowspan="3">备注</th>
                             </tr>
                             <tr>
-                            <th rowspan="2">采购数量</th>
+                            <th rowspan="2">到货数量</th>
                             <th rowspan="2">验收结论</th>
-                            <th colspan="2">质保质量</th>
+                            <th colspan="2">质保资料</th>
                             </tr>
                             <tr>
                             <th>实收份数</th>
@@ -206,7 +206,7 @@
                             <td align="center">{{ row.purchaseNum }}</td>
                             <td align="center">{{ row.checkResult }}</td>
                             <td align="center">{{ row.fileReceiveNum }}</td>
-                            <td align="center">{{ row.isQualified }}</td>
+                            <td align="center">{{ '符合' }}</td>
                             <td align="center">{{ row.remark }}</td>
                             </tr>
                         </tbody>
@@ -214,8 +214,8 @@
                     
                     <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 25%;">供应科：</div>
-                            <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
+                            <div style="width: 30%;">供应科：</div>
+                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
                                 <div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
@@ -223,16 +223,16 @@
                         </div>
 
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 30%;">生产技术科：</div>
-                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
+                            <div style="width: 45%;">生产技术科：</div>
+                            <div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
                                 <div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
                             </div>
                         </div>
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
-                            <div style="width: 25%;">库管班：</div>
-                            <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
+                            <div style="width: 30%;">库管班：</div>
+                            <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
                                 <div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
                                     <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
                                 </div>
@@ -256,7 +256,7 @@
     <el-dialog :visible.sync="openPrint2" width="800px" append-to-body>
       <div style="height: 500px; overflow-y: scroll">
         <vue-easy-print tableShow ref="remarksPrintRef2" class="print" style="margin: 0 20px">
-          <div style="text-align: center; font-weight: 600; font-size: 30px">新购入库单</div>
+          <div style="text-align: center;font-size: 21px;margin-bottom: 15px">新购入库单</div>
           <div style="margin-top: 10px; display: flex; flex-wrap: wrap; justify-content: flex-end; width: 95%">
             <!-- <div style="flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
               <span>单据编号：{{ printData.code }}</span>
diff --git a/src/views/material/purchase/goodsArrived/component/queryTools.vue b/src/views/material/purchase/goodsArrived/component/queryTools.vue
index fc0be48a..ae0d7386 100644
--- a/src/views/material/purchase/goodsArrived/component/queryTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/queryTools.vue
@@ -197,7 +197,7 @@ export default {
                 {dictLabel:"合格证",fileType:"0",name:"",url:""},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:""},
                 {dictLabel:"其他",fileType:"4",name:"",url:""},
             ],
             fileListInfo: [],
@@ -241,7 +241,7 @@ export default {
           this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
+                {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
                 {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}]
           this.getFileData()
           this.open=true
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index 0476d135..37de60f0 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -527,7 +527,7 @@ export default {
         { dictLabel: "合格证", fileType: "0", name: "", url: "" },
         { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
         { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "第三方检测报告", fileType: "3", name: "", url: "" },
         { dictLabel: "其他", fileType: "4", name: "", url: "" },
       ],
       //图片查看弹窗
@@ -670,7 +670,7 @@ export default {
         { dictLabel: "合格证", fileType: "0", name: "", url: "" },
         { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
         { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
-        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "第三方检测报告", fileType: "3", name: "", url: "" },
         { dictLabel: "其他", fileType: "4", name: "", url: "" },
       ];
       if (this.taskId == "") {
diff --git a/src/views/material/purchase/goodsBind/component/home.vue b/src/views/material/purchase/goodsBind/component/home.vue
index 9df16e46..17dbd384 100644
--- a/src/views/material/purchase/goodsBind/component/home.vue
+++ b/src/views/material/purchase/goodsBind/component/home.vue
@@ -18,7 +18,6 @@
                     value-format="yyyy-MM-dd"
                     end-placeholder="结束日期"
                     start-placeholder="开始日期"
-                    @change="onTimeChange"
                 ></el-date-picker>
             </el-form-item>
 
@@ -245,6 +244,8 @@ export default {
         },
         // 获取列表
         async getList() {
+            this.queryParams.startTime = this.queryTime ? this.queryTime[0] : ''
+            this.queryParams.endTime = this.queryTime ? this.queryTime[1] : ''
             this.loading = true
             this.queryParams.taskStage = 3
             const res = await getNewBuyBindListApi(this.queryParams)
diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index 5e29195b..6db89590 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -262,7 +262,7 @@ export default {
         {dictLabel:"合格证",fileType:"0",name:"",url:""},
         {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
         {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-        {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+        {dictLabel:"第三方检测报告",fileType:"3",name:"",url:""},
         {dictLabel:"其他报告",fileType:"4",name:"",url:""},
       ],
       // 查询参数
@@ -462,7 +462,7 @@ export default {
         this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:""},
               {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
               {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-              {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+              {dictLabel:"第三方检测报告",fileType:"3",name:"",url:""},
               {dictLabel:"其他报告",fileType:"4",name:"",url:""}]
         this.getFileData()
         this.open=true
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 2c4b43c3..9c4dbba2 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -4,8 +4,8 @@
       <el-form-item prop="dateRange">
         <el-date-picker
           v-model="dateRange"
-          type="datetimerange"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -140,7 +140,7 @@
     <el-dialog :title="title" :visible.sync="openPrint" width="800px" append-to-body>
       <div style="height: 500px; overflow-y: scroll">
         <vue-easy-print tableShow ref="remarksPrintRef" class="print" style="margin: 0 20px">
-          <div style="text-align: center; font-weight: 600; font-size: 30px">新购入库单</div>
+          <div style="text-align: center;font-size: 21px;margin-bottom: 15px">新购入库单</div>
           <div style="margin-top: 10px; display: flex; flex-wrap: wrap; justify-content: flex-end; width: 95%">
             <!-- <div style="flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
               <span>单据编号：{{ printData.code }}</span>
@@ -275,13 +275,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true
-      if (this.dateRange.length > 0) {
-        this.queryParams.startTime = this.dateRange[0]
-        this.queryParams.endTime = this.dateRange[1]
-      } else {
-        this.queryParams.startTime = undefined
-        this.queryParams.endTime = undefined
-      }
+      this.queryParams.startTime= this.dateRange ? this.dateRange[0] : ''
+      this.queryParams.endTime= this.dateRange ? this.dateRange[1] : ''
       // this.queryParams.statusList=[3,13,4,14,19]
       this.queryParams.taskStage = 4
       //   this.queryParams.modelName="新购验收"
diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
index 66abadce..0e7509bd 100644
--- a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
+++ b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
@@ -649,7 +649,7 @@ export default {
         { dictLabel: '合格证', fileType: '0', name: '', url: '' },
         { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
         { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
-        { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
+        { dictLabel: '第三方检测报告', fileType: '3', name: '', url: '' },
         { dictLabel: '其他', fileType: '4', name: '', url: '' }
       ]
       if (this.taskId == '') {
diff --git a/src/views/material/repair/inventoryScrap/component/homeApply.vue b/src/views/material/repair/inventoryScrap/component/homeApply.vue
index af3ac7ed..1c14abcd 100644
--- a/src/views/material/repair/inventoryScrap/component/homeApply.vue
+++ b/src/views/material/repair/inventoryScrap/component/homeApply.vue
@@ -116,10 +116,10 @@
             @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']"
+            @click="handleUpdate(scope.row)" v-if="scope.row.taskStatus != 1" 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']"
+            @click="handleDeletePurchase(scope.row)" v-if="scope.row.taskStatus != 1" v-hasPermi="['purchase:info:remove']"
             >删除</el-button>
         </template>
       </el-table-column>
@@ -307,14 +307,11 @@ export default {
 
     /** 删除按钮操作 */
     handleDeletePurchase(row) {
-      // console.log(row)
-      let ids = [];
-      ids.push(row.id);
-      console.log("ids", ids);
+      console.log('🚀 ~ handleDeletePurchase ~ row:', row)
       this.$modal
         .confirm("是否确认删除所选择的数据项？")
         .then(function () {
-          return applyRemove(ids);
+          return applyRemove({ taskId: row.taskId })
         })
         .then(() => {
           this.getList();