diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 18ed5fa..e270fb7 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -801,6 +801,17 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="提示" :close-on-click-modal="false" :visible.sync="finalInspectConfirmFlag" width="460px">
+      <div>确定最终检验完成？</div>
+      <el-checkbox v-model="triggerMachineInspect" style="margin-top: 16px">
+        是否触发QMS的上机检验任务单
+      </el-checkbox>
+      <span slot="footer">
+        <el-button @click="finalInspectConfirmFlag = false">取消</el-button>
+        <el-button type="primary" @click="confirmFinalInspect">确定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -867,7 +878,7 @@
       },
       needTriggerMachineInspectOption () {
         const types = this.appearanceInspectTypes || []
-        return (this.IQCSelections || []).some(r => types.indexOf(r.submissionType) !== -1)
+        return (this.IQCSelections || []).some(r => types.indexOf(r.submissionType) !== -1 && this.treatsAsQualified(r))
       }
     },
     watch: {
@@ -928,6 +939,7 @@
           triggerMachineInspect: false,
         },
         submitConfirmFlag: false,
+        finalInspectConfirmFlag: false,
         triggerMachineInspect: false,
         iqcSubmissionTypeOptions: ['材料进货检验', '刀模进货检验-外观', '刀模进货检验-上机', '刀模维修检验-外观', '刀模维修检验-上机'],
         appearanceInspectTypes: ['刀模进货检验-外观', '刀模维修检验-外观'],
@@ -1889,6 +1901,7 @@
           responsiblePersonName: '',
           invdefinetype: '',
           state: '',
+          submissionType: '',
           passQty: '',
           notPassQty: '',
           batchQualifiedQty: ''
@@ -2639,6 +2652,22 @@
         })
       },
 
+      isAppearanceInspectType (type) {
+        const value = type == null ? '' : String(type).trim()
+        return (this.appearanceInspectTypes || []).indexOf(value) !== -1
+      },
+
+      treatsAsQualified (row) {
+        if (!row) {
+          return false
+        }
+        if (row.inspectionResult === '合格') {
+          return true
+        }
+        return row.inspectionResult === '不合格'
+          && (row.disposalMeasures === '让步接收' || row.disposalMeasures === '挑选使用')
+      },
+
       async Transfer (type) {
         if (type === '2') {
           if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
@@ -2672,9 +2701,19 @@
           this.$message.warning('合格数量不能大于送检数量！')
           return
         }
+        if (type === '2' && this.isAppearanceInspectType(this.detailData.submissionType) && this.treatsAsQualified(this.detailData)) {
+          this.triggerMachineInspect = false
+          this.finalInspectConfirmFlag = true
+          return
+        }
         this.saveDetailInformation(type)
       },
 
+      confirmFinalInspect () {
+        this.finalInspectConfirmFlag = false
+        this.saveDetailInformation('2')
+      },
+
       // 新增明细信息
       saveDetailInformation (type, options = {}) {
         const keepDetailOpen = options.keepDetailOpen === true
@@ -2701,6 +2740,8 @@
         this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
         this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
         this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty
+        this.saveInformationData.triggerMachineInspect = this.isAppearanceInspectType(this.detailData.submissionType) && this.treatsAsQualified(this.detailData) ? this.triggerMachineInspect : false
+        this.saveInformationData.submissionType = this.detailData.submissionType
         this.transferLoadFlag = true
         // this.saveInformationData.subDetailList = this.acquisitionList
         saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
@@ -2825,6 +2866,8 @@
         this.detailData.responsiblePersonName = row.responsiblePersonName
         this.detailData.invdefinetype = row.invdefinetype
         this.detailData.state = row.state
+        this.$set(this.detailData, 'submissionType', row.submissionType || '')
+        this.$set(this.detailData, 'supplierNo', row.supplierNo || '')
         // if (row.state === '待检验') {
         //   this.detailData.passQty = row.samplingQty
         // } else {