From 22d2799bbbfea904ef430e7beb86b70ffbb35836 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 7 May 2024 17:58:45 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-07=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/com_eam_object_upload_file.vue        |  4 +-
 .../modules/eam/eamWorkOrderForCheck.vue      |  8 +---
 .../eam/eamWorkOrderForMaintenance.vue        |  9 +---
 src/views/modules/eam/eam_device_list.vue     | 44 ++++++++++++++++++-
 src/views/modules/qc/FAIResultEntry.vue       | 44 +++++++++++++------
 src/views/modules/qc/FQCResultEntry.vue       | 44 +++++++++++++------
 src/views/modules/qc/IPQCResultEntry.vue      | 42 +++++++++++++-----
 src/views/modules/qc/IQCResultEntry.vue       | 28 ++++++++++--
 .../reportWorkOrder/reportCheckOrder.vue      |  9 +---
 .../reportMaintenanceOrder.vue                |  9 +---
 10 files changed, 169 insertions(+), 72 deletions(-)

diff --git a/src/views/modules/eam/com_eam_object_upload_file.vue b/src/views/modules/eam/com_eam_object_upload_file.vue
index 3c26c81..b814862 100644
--- a/src/views/modules/eam/com_eam_object_upload_file.vue
+++ b/src/views/modules/eam/com_eam_object_upload_file.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="420px" style="height: 520px;" class="customer-dialog">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="381px" style="height: 520px" class="customer-dialog">
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-row>
           <el-col :span="12" style="width: 32%">
@@ -148,7 +148,7 @@ export default {
 }
 
 </script>
-<style scoped lang="scss">
 
 
+<style scoped lang="scss">
 </style>
diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index ef58355..05ae10d 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -1395,12 +1395,8 @@
           }
         }
         if (this.saveData.checkResult === '不合格') {
-          this.detailList.forEach(val => {
-            if (val.itemResult === '不合格') {
-              tempFlag = 'Y'
-            }
-          })
-          if (tempFlag !== 'Y') {
+          const flag = this.detailList.some(item => item.itemResult === '不合格')
+          if (!flag) {
             this.$message.warning('请选择不合格项目！')
             return
           }
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index 059eedd..024d889 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -1612,7 +1612,6 @@
       },
 
       updateWorkOrder () {
-        let tempFlag = 'N'
         if (this.saveData.checkResult === '' || this.saveData.checkResult == null) {
           this.$message.warning('请选择维保结论！')
           return
@@ -1622,12 +1621,8 @@
           return
         }
         if (this.saveData.checkResult === '不合格') {
-          this.detailList.forEach(val => {
-            if (val.itemResult === '不合格') {
-              tempFlag = 'Y'
-            }
-          })
-          if (tempFlag !== 'Y') {
+          const flag = this.detailList.some(item => item.itemResult === '不合格')
+          if (!flag) {
             this.$message.warning('请选择不合格项目！')
             return
           }
diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 432b2ac..0f43e66 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -153,8 +153,9 @@
             width="100"
             label="操作">
             <template slot-scope="scope">
-              <a @click="downloadFile(scope.row)" >下载</a>
-              <a type="text" size="small" @click="deleteFile(scope.row)">删除</a>
+              <el-link style="cursor:pointer" @click="previewFile(scope.row)">预览</el-link>
+              <el-link style="cursor:pointer" @click="downloadFile(scope.row)">下载</el-link>
+              <el-link style="cursor:pointer" @click="deleteFile(scope.row)">删除</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -3380,6 +3381,45 @@
         return this.exportList;
       },
 
+      // 预览
+      previewFile (row) {
+        // 预览文件
+        let image = ['jpg', 'jpeg', 'png', 'gif', 'bmp']
+        let type = ''
+        if (image.includes(row.fileType.toLowerCase())) {
+          type = 'image/' + row.fileType
+        }
+        let video = ['mp4', 'avi', 'mov', 'wmv', 'flv']
+        if (video.includes(row.fileType.toLowerCase())) {
+          type = 'video/' + row.fileType
+        }
+        let txt = ['txt']
+        if (txt.includes(row.fileType.toLowerCase())) {
+          type = 'text/plain'
+        }
+        let office = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx']
+        if (office.includes(row.fileType.toLowerCase())) {
+          if (row.fileType.toLowerCase() === 'doc' || row.fileType.toLowerCase() === 'docx') {
+            type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+          } else if (row.fileType.toLowerCase() === 'ppt' || row.fileType.toLowerCase() === 'pptx') {
+            type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+          } else {
+            type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+          }
+        }
+        let pdf = ['pdf']
+        if (pdf.includes(row.fileType.toLowerCase())) {
+          type = 'application/pdf'
+        }
+        downLoadObjectFile(row).then(({data}) => {
+          const blob = new Blob([data], { type: type });
+          // 创建URL来生成预览
+          const fileURL = URL.createObjectURL(blob);
+          // 在新标签页中打开文件预览
+          const newTab = window.open(fileURL, '_blank')
+        })
+      },
+
       // 下载
       downloadFile (row) {
         downLoadObjectFile(row)
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 782b5b1..3418b6c 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -504,22 +504,30 @@
     <el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
       <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工单号">
-          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="派工单号">
-          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="SKU">
-          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+          <el-input v-model="seqDetailData.sku" clearable style="width: 150px"></el-input>
         </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
+            <el-option label="下达" value="下达"></el-option>
+            <el-option label="关闭" value="关闭"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="物料编码">
-          <el-input v-model="seqDetailData.partNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partDesc" clearable style="width: 315px"></el-input>
         </el-form-item>
         <el-form-item label="工序">
-          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchSeqInfo" style="margin-top: 24px">查询</el-button>
@@ -1702,10 +1710,11 @@
           seqNo: '',
           sku: '',
           partNo: '',
-          partDesc:'',
-          operationDesc:'',
-          qtyrequired:'',
-          lotsize:''
+          partDesc: '',
+          operationDesc: '',
+          qtyrequired: '',
+          lotsize: '',
+          status: '下达'
         },
         seqDetailColumnList: [
           {
@@ -2854,10 +2863,17 @@
           this.$message.warning('请选择检验结论！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
           this.$message.warning('请选择处置措施！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格') {
+          const flag = this.detailList.some(item => item.itemResult === 'N')
+          if (!flag) {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         if (this.detailData.inspectionResult !== '不合格') {
           this.detailData.disposalMeasures = ''
           this.detailData.disposalRemark = ''
@@ -3325,7 +3341,8 @@
           sku: this.seqDetailData.sku,
           partDesc: this.seqDetailData.partDesc,
           partNo: this.seqDetailData.partNo,
-          operationDesc: this.seqDetailData.operationDesc
+          operationDesc: this.seqDetailData.operationDesc,
+          status: this.seqDetailData.status
         }
         if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
           this.seqInfoList = []
@@ -3348,7 +3365,8 @@
           sku: '',
           partNo: '',
           partDesc: '',
-          operationDesc: ''
+          operationDesc: '',
+          status: '下达'
         }
         this.seqInfoList = []
       },
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index dfd6dc7..7a84771 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -674,22 +674,30 @@
     <el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
       <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工单号">
-          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="派工单号">
-          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="SKU">
-          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+          <el-input v-model="seqDetailData.sku" clearable style="width: 150px"></el-input>
         </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
+            <el-option label="下达" value="下达"></el-option>
+            <el-option label="关闭" value="关闭"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="物料编码">
-          <el-input v-model="seqDetailData.partNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partDesc" clearable style="width: 315px"></el-input>
         </el-form-item>
         <el-form-item label="工序">
-          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchSeqInfo" style="margin-top: 24px">查询</el-button>
@@ -1675,10 +1683,11 @@
           seqNo: '',
           sku: '',
           partNo: '',
-          partDesc:'',
-          operationDesc:'',
-          qtyrequired:'',
-          lotsize:''
+          partDesc: '',
+          operationDesc: '',
+          qtyrequired: '',
+          lotsize: '',
+          status: '下达'
         },
         seqDetailColumnList: [
           {
@@ -2826,10 +2835,17 @@
           this.$message.warning('请选择检验结论！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
           this.$message.warning('请选择处置措施！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格') {
+          const flag = this.detailList.some(item => item.itemResult === 'N')
+          if (!flag) {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         if (this.detailData.inspectionResult !== '不合格') {
           this.detailData.disposalMeasures = ''
           this.detailData.disposalRemark = ''
@@ -3307,7 +3323,8 @@
           sku: this.seqDetailData.sku,
           partDesc: this.seqDetailData.partDesc,
           partNo: this.seqDetailData.partNo,
-          operationDesc: this.seqDetailData.operationDesc
+          operationDesc: this.seqDetailData.operationDesc,
+          status: this.seqDetailData.status
         }
         if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
           this.seqInfoList = []
@@ -3330,7 +3347,8 @@
           sku: '',
           partNo: '',
           partDesc:'',
-          operationDesc: ''
+          operationDesc: '',
+          status: '下达'
         }
         this.seqInfoList = []
       },
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 0cc0f47..af272f3 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -544,22 +544,30 @@
     <el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
       <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工单号">
-          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="派工单号">
-          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="SKU">
-          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+          <el-input v-model="seqDetailData.sku" clearable style="width: 150px"></el-input>
         </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
+            <el-option label="下达" value="下达"></el-option>
+            <el-option label="关闭" value="关闭"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="物料编码">
-          <el-input v-model="seqDetailData.partNo" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partNo" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.partDesc" clearable style="width: 315px"></el-input>
         </el-form-item>
         <el-form-item label="工序">
-          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
+          <el-input v-model="seqDetailData.operationDesc" clearable style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchSeqInfo" style="margin-top: 24px">查询</el-button>
@@ -1725,9 +1733,10 @@
           cinvSourceCode:'',
           partNo: '',
           partDesc: '',
-          operationDesc:'',
-          qtyrequired:'',
-          lotsize:''
+          operationDesc: '',
+          qtyrequired: '',
+          lotsize: '',
+          status: '下达'
         },
         seqDetailColumnList: [
           {
@@ -2893,10 +2902,17 @@
         //     this.detailList[i].itemResult = 'Y'
         //   }
         // }
-        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
           this.$message.warning('请选择处置措施！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格') {
+          const flag = this.detailList.some(item => item.itemResult === 'N')
+          if (!flag) {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         if (this.detailData.inspectionResult !== '不合格') {
           this.detailData.disposalMeasures = ''
           this.detailData.disposalRemark = ''
@@ -3372,7 +3388,8 @@
           sku: this.seqDetailData.sku,
           partDesc: this.seqDetailData.partDesc,
           partNo: this.seqDetailData.partNo,
-          operationDesc: this.seqDetailData.operationDesc
+          operationDesc: this.seqDetailData.operationDesc,
+          status: this.seqDetailData.status
         }
         if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
           this.seqInfoList = []
@@ -3395,7 +3412,8 @@
           sku: '',
           partNo: '',
           partDesc: '',
-          operationDesc: ''
+          operationDesc: '',
+          status: '下达'
         }
         this.seqInfoList = []
       },
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index cb80145..56929bd 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -529,6 +529,7 @@
           isQualified: '',
           isQualifiedChinese: '',
           submitList: [],
+          updateBy: this.$store.state.user.name,
         },
         tagNo:'',
         searchData: {
@@ -1307,7 +1308,9 @@
           submitFlag: '',
           supplierNo: '',
           umId: '',
-          rollCount: ''
+          rollCount: '',
+          poOrderNo: '',
+          poItemNo: ''
         },
         detailInformationFlag: false,
         detailList: [],
@@ -1323,7 +1326,12 @@
           itemList:[],
           unqualifiedQty: '',
           rollCount: '',
-          samplingQty: ''
+          samplingQty: '',
+          poOrderNo: '',
+          poItemNo: '',
+          partNo: '',
+          partDesc: '',
+          sku: ''
         },
         // 子明细数据对象
         tableData: [],
@@ -1653,10 +1661,17 @@
           this.$message.warning('请选择检验结论！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
           this.$message.warning('请选择处置措施！')
           return
         }
+        if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
+          const flag = this.detailList.some(item => item.itemResult === 'N')
+          if (!flag) {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         if (this.detailData.inspectionResult !== '不合格') {
           this.detailData.disposalMeasures = ''
           this.detailData.disposalRemark = ''
@@ -1677,6 +1692,11 @@
         this.saveInformationData.rollCount = this.detailData.rollCount
         this.saveInformationData.samplingQty = this.detailData.samplingQty
         this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
+        this.saveInformationData.poOrderNo = this.detailData.poOrderNo
+        this.saveInformationData.poItemNo = this.detailData.poItemNo
+        this.saveInformationData.partNo = this.detailData.partNo
+        this.saveInformationData.partDesc = this.detailData.partDesc
+        this.saveInformationData.sku = this.detailData.sku
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1717,6 +1737,8 @@
         this.detailData.inspectionRemark = row.inspectionRemark
         this.detailData.umId = row.umId
         this.detailData.rollCount = row.rollCount
+        this.detailData.poOrderNo = row.poOrderNo
+        this.detailData.poItemNo = row.poItemNo
         this.getInspectionFormData()
         this.inspectorSearch()
         this.detailInformationFlag = true
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index 91b1599..7b03717 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -1347,7 +1347,6 @@
       },
 
       async saveCheckReport () {
-        let tempFlag = 'N'
         if (this.saveData.checkResult === ''|| this.saveData.checkResult == null) {
           this.$message.warning('请选择点检结论！')
           return
@@ -1380,12 +1379,8 @@
           // }
         }
         if (this.saveData.checkResult === '不合格') {
-          this.detailList.forEach(val => {
-            if (val.itemResult === '不合格') {
-              tempFlag = 'Y'
-            }
-          })
-          if (tempFlag !== 'Y') {
+          const flag = this.detailList.some(item => item.itemResult === '不合格')
+          if (!flag) {
             this.$message.warning('请选择不合格项目！')
             return
           }
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 8f2b6a7..0d2b363 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -1721,7 +1721,6 @@
       },
 
       async saveCheckReport () {
-        let tempFlag = 'N'
         if (this.saveData.checkResult === ''||this.saveData.checkResult == null) {
           this.$message.warning('请选择维保结论！')
           return
@@ -1742,12 +1741,8 @@
           // }
         }
         if (this.saveData.checkResult === '不合格') {
-          this.detailList.forEach(val => {
-            if (val.itemResult === '不合格') {
-              tempFlag = 'Y'
-            }
-          })
-          if (tempFlag !== 'Y') {
+          const flag = this.detailList.some(item => item.itemResult === '不合格')
+          if (!flag) {
             this.$message.warning('请选择不合格项目！')
             return
           }