diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 9ee6ab5..fcd24fe 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -328,7 +328,21 @@
           <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
           <el-input class="numInput" @input="handleInput(detailData.unqualifiedQty,1)" v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
-        <el-form-item :label="'处置措施'">
+        <el-form-item :label="'检验结论'">
+          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'质检备注'">
+          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
+        </el-form-item>
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置措施'">
           <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
             <el-option
               v-for = "i in disposalMeasuresOptions"
@@ -346,20 +360,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'处置说明'">
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置说明'">
           <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
         </el-form-item>
-        <el-form-item :label="'检验结论'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="检验员">
           <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
             <el-option
@@ -378,10 +382,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'质检备注'">
-          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
-          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
-        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
@@ -2835,6 +2835,10 @@
           this.$message.warning('请选择检验结论！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+          this.$message.warning('请选择处置措施！')
+          return
+        }
         this.saveDetailInformation()
       },
 
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 4210554..96d36cc 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -328,7 +328,21 @@
           <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
           <el-input class="numInput" @input="handleInput(detailData.unqualifiedQty,1)" v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
-        <el-form-item :label="'处置措施'">
+        <el-form-item :label="'检验结论'">
+          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'质检备注'">
+          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
+        </el-form-item>
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置措施'">
           <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
             <el-option
               v-for = "i in disposalMeasuresOptions"
@@ -346,20 +360,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'处置说明'">
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置说明'">
           <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
         </el-form-item>
-        <el-form-item :label="'检验结论'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="检验员">
           <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
             <el-option
@@ -378,10 +382,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'质检备注'">
-          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
-          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
-        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
@@ -2833,6 +2833,10 @@
           this.$message.warning('请选择检验结论！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+          this.$message.warning('请选择处置措施！')
+          return
+        }
         this.saveDetailInformation()
       },
 
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 28b9b62..1dfbab3 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -350,7 +350,21 @@
           <el-input class="numInput" v-if="detailData.submitFlag == 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
           <el-input class="numInput" @input="handleInput(detailData.unqualifiedQty,1)" v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
-        <el-form-item :label="'处置措施'">
+        <el-form-item :label="'检验结论'">
+          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'质检备注'">
+          <el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
+        </el-form-item>
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置措施'">
           <el-select v-if="detailData.submitFlag == 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
             <el-option
               v-for = "i in disposalMeasuresOptions"
@@ -368,20 +382,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'处置说明'">
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置说明'">
           <el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
         </el-form-item>
-        <el-form-item :label="'检验结论'">
-          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="检验员">
           <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
             <el-option
@@ -400,10 +404,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'质检备注'">
-          <el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
-          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
-        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
@@ -2897,6 +2897,10 @@
         //     this.detailList[i].itemResult = 'Y'
         //   }
         // }
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+          this.$message.warning('请选择处置措施！')
+          return
+        }
         this.saveDetailInformation()
       },
 
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 2598797..950b46a 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -180,13 +180,27 @@
         <el-form-item :label="'抽样数量'">
           <el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 120px"></el-input>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
         <el-form-item :label="'不合格项目数量'">
           <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
           <el-input class="numInput" @input="handleInput(detailData.unqualifiedQty,1)" v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
-        <el-form-item :label="'处置措施'">
+      </el-form>
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'检验结论'">
+          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'质检备注'">
+          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
+        </el-form-item>
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置措施'">
           <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
             <el-option
               v-for = "i in disposalMeasuresOptions"
@@ -204,20 +218,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'处置说明'">
+        <el-form-item v-if="detailData.inspectionResult == '不合格'" :label="'处置说明'">
           <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
         </el-form-item>
-        <el-form-item :label="'检验结论'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
-            <el-option label="合格" value="合格"></el-option>
-            <el-option label="不合格" value="不合格"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="检验员">
           <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
             <el-option
@@ -236,10 +240,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'质检备注'">
-          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
-          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
-        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
@@ -1607,6 +1607,10 @@
           this.$message.warning('请选择检验结论！')
           return
         }
+        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures == '')) {
+          this.$message.warning('请选择处置措施！')
+          return
+        }
         this.saveDetailInformation()
       },