diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index a5d9cd7..d5ef199 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -82,8 +82,17 @@ export const saveAttributeDetailed = data => createAPI(`/pms/qc/saveAttributeDet
 export const uploadPartAttributeExcel = data => createAPI(`/pms/qc/uploadPartAttributeExcel`,'post',data)
 export const getOperationDescList = data => createAPI(`/pms/qc/getOperationDescList`,'post',data)
 export const getManufacturerList = data => createAPI(`/pms/qc/getManufacturerList`,'post',data)
+export const getCustomerList = data => createAPI(`/pms/qc/getCustomerList`,'post',data)
 export const getPartTemplateLists = data => createAPI(`/pms/qc/getPartTemplateLists`,'post',data)
 export const qcPartAttributeEdit = data => createAPI(`/pms/qc/qcPartAttributeEdit`,'post',data)
+
+// IPQC 巡检特殊配置（按工序）
+export const getPatrolConfigList = data => createAPI(`/pms/qc/getPatrolConfigList`, 'post', data)
+export const savePatrolConfig = data => createAPI(`/pms/qc/savePatrolConfig`, 'post', data)
+export const updatePatrolConfig = data => createAPI(`/pms/qc/updatePatrolConfig`, 'post', data)
+export const deletePatrolConfig = data => createAPI(`/pms/qc/deletePatrolConfig`, 'post', data)
+export const getPatrolOperationDescList = data => createAPI(`/pms/qc/getPatrolOperationDescList`, 'post', data)
+export const patrolConfigUpload = data => createAPI(`/pms/qc/patrolConfigUpload`, 'post', data)
 export const overLoadSearchPartInfo = data => createAPI(`/pms/qc/overLoadSearchPartInfo`,'post',data)
 export const partAttrDetailedSearch = data => createAPI(`/pms/qc/partAttrDetailedSearch`,'post',data)
 export const getPartAttrItemList = data => createAPI(`/pms/qc/getPartAttrItemList`,'post',data)
@@ -249,6 +258,32 @@ export const goUpItemQC = data => createAPI(`/pms/qc/goUpItemQC`,'post',data)
 export const goDownItemQC = data => createAPI(`/pms/qc/goDownItemQC`,'post',data)
 export const cancelApproval2 = data => createAPI(`/pms/qc/cancelApproval2`,'post',data)
 
+// ===================================== OQC / FQAS（OQCResultEntry） =====================================
+export const qcOQCInspectionSearch = data => createAPI(`/pms/qc/qcOQCInspectionSearch`,'post',data)
+export const fqasDetailSearch = data => createAPI(`/pms/qc/fqasDetailSearch`,'post',data)
+export const selectFQASSubDetailedRecord = data => createAPI(`/pms/qc/selectFQASSubDetailedRecord`,'post',data)
+export const saveFQASDetailedRecord = data => createAPI(`/pms/qc/saveFQASDetailedRecord`,'post',data)
+export const checkFQASIsSubmit = data => createAPI(`/pms/qc/checkFQASIsSubmit`,'post',data)
+export const saveFQASSubDetailed = data => createAPI(`/pms/qc/saveFQASSubDetailed`,'post',data)
+export const saveFQASSubmitResult = data => createAPI(`/pms/qc/saveFQASSubmitResult`,'post',data)
+export const cancelFQASSubmitResult = data => createAPI(`/pms/qc/cancelFQASSubmitResult`,'post',data)
+export const fqasRecordDelete = data => createAPI(`/pms/qc/fqasRecordDelete`,'post',data)
+export const fqasRecordOverLoad = data => createAPI(`/pms/qc/fqasRecordOverLoad`,'post',data)
+export const actionFQASInspection = data => createAPI(`/pms/qc/actionFQASInspection`,'post',data)
+export const changeInspectionWay = data => createAPI(`/pms/qc/changeInspectionWay`,'post',data)
+export const getFileContentList2 = data => createAPI('sys/file/getFileContentList2','post',data)
+export const downLoadObjectFile = data => createAPI(`pms/eamObject/downLoadObjectFile?id=`+data.id,'post',777)
+export const deleteObjectFile = data => createAPI(`/pms/qc/deleteObjectFile`,'post',data)
+export const getUserRoleList = data => createAPI(`/pms/qc/getUserRoleList`,'post',data)
+export const getOperatorList = data => createAPI(`/pms/qc/getOperatorList`,'post',data)
+export const searchQcSopFileList = data => createAPI(`/pms/qc/searchQcSopFileList`,'post',data)
+export const downloadSopFile = sopUrl => createAPI(`/pms/qc/downloadSopFile?sopUrl=${encodeURIComponent(sopUrl)}`,'post', 777)
+export const getOQCItemList = data => createAPI(`/pms/qc/getOQCItemList`,'post',data)
+export const addOQCItemDetails = data => createAPI(`/pms/qc/addOQCItemDetails`,'post',data)
+export const deleteOQCItemDetails = data => createAPI(`/pms/qc/deleteOQCItemDetails`,'post',data)
+export const getOQCTemplateList = data => createAPI(`/pms/qc/getOQCTemplateList`,'post',data)
+export const importOQCTemplateItems = data => createAPI(`/pms/qc/importOQCTemplateItems`,'post',data)
+
 // ===================================== SQC取消审核 =====================================
 export const cancelSQCApproval = data => createAPI(`/pms/qc/cancelSQCApproval`,'post',data)
 
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 3f8f6c8..3490c54 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -144,7 +144,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <template v-if="item.columnProp === 'pictureFlag'">
+              <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+            </template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -451,7 +456,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -520,8 +530,8 @@
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
@@ -574,6 +584,15 @@
           :fixed="item.fixed==''?false:item.fixed"
           :min-width="item.columnWidth"
           :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -718,7 +737,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -766,7 +790,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -839,7 +868,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -870,7 +904,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -1748,6 +1787,24 @@ export default {
           fixed: '',
           columnWidth: 120,
         },
+        {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'pictureFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片是否必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 301007,
@@ -3320,17 +3377,31 @@ export default {
 
     // 上传项目图片
     uploadImageModal (row) {
-      let currentData = {
-        site: this.detailData.site,
-        buNo: this.detailData.buNo,
-        createBy: this.$store.state.user.name,
-        inspectionNo: this.detailData.inspectionNo,
-        itemNo: row.itemNo,
-        folder: 'FAIItemImageFile'
+      const openImage = () => {
+        let currentData = {
+          site: this.detailData.site,
+          buNo: this.detailData.buNo,
+          createBy: this.$store.state.user.name,
+          inspectionNo: this.detailData.inspectionNo,
+          itemNo: row.itemNo,
+          folder: 'FAIItemImageFile'
+        }
+        this.$nextTick(() => {
+          this.$refs.comQcItemImageUploadFile.init(currentData)
+        })
       }
-      //打开组件 去做新增业务
-      this.$nextTick(() => {
-        this.$refs.comQcItemImageUploadFile.init(currentData)
+      if (this.detailData.state !== '待检验') {
+        openImage()
+        return
+      }
+      if (this.detailData.passQty > this.detailData.rollQty) {
+        this.$message.warning('合格数量不能大于送检数量！')
+        return
+      }
+      this.saveDetailInformation('1', {
+        keepDetailOpen: true,
+        skipSuccessMessage: true,
+        afterSuccess: openImage
       })
     },
 
@@ -3472,6 +3543,13 @@ export default {
           this.detailData.disposalMeasures = ''
           this.detailData.disposalRemark = ''
         }
+        const picRequiredRow = this.detailList.find(
+          item => item.pictureFlag === 'Y' && !(Number(item.imageDetailNum) > 0)
+        )
+        if (picRequiredRow) {
+          this.$message.warning(`项目编码：${picRequiredRow.itemNo || ''}图片必填，请检查！`)
+          return
+        }
       }
       if (this.detailData.passQty>this.detailData.rollQty){
         this.$message.warning('合格数量不能大于送检数量！')
@@ -3481,7 +3559,8 @@ export default {
     },
 
     // 新增明细信息
-    saveDetailInformation (type) {
+    saveDetailInformation (type, options = {}) {
+      const keepDetailOpen = options.keepDetailOpen === true
       this.saveInformationData.site = this.detailData.site
       this.saveInformationData.buNo = this.detailData.buNo
       this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -3507,13 +3586,28 @@ export default {
       saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()
-          this.detailInformationFlag = false
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {}
-          })
+          if (keepDetailOpen) {
+            this.getInspectionFormData()
+            if (!options.skipSuccessMessage) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+          } else {
+            this.detailInformationFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          }
+          if (typeof options.afterSuccess === 'function') {
+            options.afterSuccess()
+          }
         } else {
           this.$alert(data.msg, '错误', {
             confirmButtonText: '确定'
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index ad5d16f..9f4b86c 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -144,7 +144,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">
+            <template v-if="item.columnProp === 'pictureFlag'">
+              <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+            </template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -431,7 +436,12 @@
           :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
@@ -500,8 +510,8 @@
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
@@ -632,7 +642,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -680,7 +695,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -753,6 +773,15 @@
           :fixed="item.fixed==''?false:item.fixed"
           :min-width="item.columnWidth"
           :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -810,7 +839,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -841,7 +875,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -1718,6 +1757,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'pictureFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片是否必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+        },
           {
             userId: this.$store.state.user.name,
             functionId: 301015,
@@ -3284,17 +3341,31 @@
 
       // 上传项目图片
       uploadImageModal (row) {
-        let currentData = {
-          site: this.detailData.site,
-          buNo: this.detailData.buNo,
-          createBy: this.$store.state.user.name,
-          inspectionNo: this.detailData.inspectionNo,
-          itemNo: row.itemNo,
-          folder: 'FQCItemImageFile'
+        const openImage = () => {
+          let currentData = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            createBy: this.$store.state.user.name,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: row.itemNo,
+            folder: 'FQCItemImageFile'
+          }
+          this.$nextTick(() => {
+            this.$refs.comQcItemImageUploadFile.init(currentData)
+          })
         }
-        //打开组件 去做新增业务
-        this.$nextTick(() => {
-          this.$refs.comQcItemImageUploadFile.init(currentData)
+        if (this.detailData.state !== '待检验') {
+          openImage()
+          return
+        }
+        if (this.detailData.passQty > this.detailData.rollQty) {
+          this.$message.warning('合格数量不能大于送检数量！')
+          return
+        }
+        this.saveDetailInformation('1', {
+          keepDetailOpen: true,
+          skipSuccessMessage: true,
+          afterSuccess: openImage
         })
       },
 
@@ -3436,6 +3507,13 @@
             this.detailData.disposalMeasures = ''
             this.detailData.disposalRemark = ''
           }
+          const picRequiredRow = this.detailList.find(
+            item => item.pictureFlag === 'Y' && !(Number(item.imageDetailNum) > 0)
+          )
+          if (picRequiredRow) {
+            this.$message.warning(`项目编码：${picRequiredRow.itemNo || ''}图片必填，请检查！`)
+            return
+          }
         }
         if (this.detailData.passQty>this.detailData.rollQty){
           this.$message.warning('合格数量不能大于送检数量！')
@@ -3445,7 +3523,8 @@
       },
 
       // 新增明细信息
-      saveDetailInformation (type) {
+      saveDetailInformation (type, options = {}) {
+        const keepDetailOpen = options.keepDetailOpen === true
         this.saveInformationData.site = this.detailData.site
         this.saveInformationData.buNo = this.detailData.buNo
         this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -3471,13 +3550,28 @@
         saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.detailInformationFlag = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {}
-            })
+            if (keepDetailOpen) {
+              this.getInspectionFormData()
+              if (!options.skipSuccessMessage) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              }
+            } else {
+              this.detailInformationFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+            if (typeof options.afterSuccess === 'function') {
+              options.afterSuccess()
+            }
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 273596d..fb5c09a 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -148,7 +148,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <template v-if="item.columnProp === 'pictureFlag'">
+              <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+            </template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -443,7 +448,12 @@
           :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
@@ -512,8 +522,8 @@
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
@@ -643,6 +653,15 @@
           :fixed="item.fixed==''?false:item.fixed"
           :min-width="item.columnWidth"
           :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -710,7 +729,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -758,7 +782,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -831,7 +860,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -862,7 +896,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -1763,6 +1802,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'pictureFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片是否必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,
@@ -2951,17 +3008,31 @@
 
       // 上传项目图片
       uploadImageModal (row) {
-        let currentData = {
-          site: this.detailData.site,
-          buNo: this.detailData.buNo,
-          createBy: this.$store.state.user.name,
-          inspectionNo: this.detailData.inspectionNo,
-          itemNo: row.itemNo,
-          folder: 'IPQCItemImageFile'
+        const openImage = () => {
+          let currentData = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            createBy: this.$store.state.user.name,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: row.itemNo,
+            folder: 'IPQCItemImageFile'
+          }
+          this.$nextTick(() => {
+            this.$refs.comQcItemImageUploadFile.init(currentData)
+          })
         }
-        //打开组件 去做新增业务
-        this.$nextTick(() => {
-          this.$refs.comQcItemImageUploadFile.init(currentData)
+        if (this.detailData.state !== '待检验') {
+          openImage()
+          return
+        }
+        if (this.detailData.passQty > this.detailData.rollQty) {
+          this.$message.warning('合格数量不能大于送检数量！')
+          return
+        }
+        this.saveDetailInformation('1', {
+          keepDetailOpen: true,
+          skipSuccessMessage: true,
+          afterSuccess: openImage
         })
       },
 
@@ -3512,6 +3583,13 @@
             this.detailData.disposalMeasures = ''
             this.detailData.disposalRemark = ''
           }
+          const picRequiredRow = this.detailList.find(
+            item => item.pictureFlag === 'Y' && !(Number(item.imageDetailNum) > 0)
+          )
+          if (picRequiredRow) {
+            this.$message.warning(`项目编码：${picRequiredRow.itemNo || ''}图片必填，请检查！`)
+            return
+          }
         }
         if (this.detailData.passQty>this.detailData.rollQty){
           this.$message.warning('合格数量不能大于送检数量！')
@@ -3521,7 +3599,8 @@
       },
 
       // 新增明细信息
-      saveDetailInformation (type) {
+      saveDetailInformation (type, options = {}) {
+        const keepDetailOpen = options.keepDetailOpen === true
         this.saveInformationData.site = this.detailData.site
         this.saveInformationData.buNo = this.detailData.buNo
         this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -3547,13 +3626,28 @@
         saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.detailInformationFlag = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {}
-            })
+            if (keepDetailOpen) {
+              this.getInspectionFormData()
+              if (!options.skipSuccessMessage) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              }
+            } else {
+              this.detailInformationFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+            if (typeof options.afterSuccess === 'function') {
+              options.afterSuccess()
+            }
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 3661634..f163984 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -165,7 +165,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">
+            <template v-if="item.columnProp === 'pictureFlag'">
+              <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+            </template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -355,7 +360,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -424,8 +434,8 @@
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
@@ -702,7 +712,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -732,7 +747,12 @@
           :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+            <span v-if="!item.columnHidden">
+              <template v-if="item.columnProp === 'pictureFlag'">
+                <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+              </template>
+              <template v-else>{{ scope.row[item.columnProp] }}</template>
+            </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
@@ -1605,6 +1625,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'pictureFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片是否必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
@@ -2422,17 +2460,31 @@
 
       // 上传项目图片
       uploadImageModal (row) {
-        let currentData = {
-          site: this.detailData.site,
-          buNo: this.detailData.buNo,
-          createBy: this.$store.state.user.name,
-          inspectionNo: this.detailData.inspectionNo,
-          itemNo: row.itemNo,
-          folder: 'IQCItemImageFile'
+        const openImage = () => {
+          let currentData = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            createBy: this.$store.state.user.name,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: row.itemNo,
+            folder: 'IQCItemImageFile'
+          }
+          this.$nextTick(() => {
+            this.$refs.comQcItemImageUploadFile.init(currentData)
+          })
         }
-        //打开组件 去做新增业务
-        this.$nextTick(() => {
-          this.$refs.comQcItemImageUploadFile.init(currentData)
+        if (this.detailData.state !== '待检验') {
+          openImage()
+          return
+        }
+        if (this.detailData.passQty > this.detailData.rollQty) {
+          this.$message.warning('合格数量不能大于送检数量！')
+          return
+        }
+        this.saveDetailInformation('1', {
+          keepDetailOpen: true,
+          skipSuccessMessage: true,
+          afterSuccess: openImage
         })
       },
 
@@ -2542,6 +2594,13 @@
             this.detailData.disposalMeasures = ''
             this.detailData.disposalRemark = ''
           }
+          const picRequiredRow = this.detailList.find(
+            item => item.pictureFlag === 'Y' && !(Number(item.imageDetailNum) > 0)
+          )
+          if (picRequiredRow) {
+            this.$message.warning(`项目编码：${picRequiredRow.itemNo || ''}图片必填，请检查！`)
+            return
+          }
         }
         if (this.detailData.passQty>this.detailData.rollQty){
           this.$message.warning('合格数量不能大于送检数量！')
@@ -2551,7 +2610,8 @@
       },
 
       // 新增明细信息
-      saveDetailInformation (type) {
+      saveDetailInformation (type, options = {}) {
+        const keepDetailOpen = options.keepDetailOpen === true
         this.saveInformationData.site = this.detailData.site
         this.saveInformationData.buNo = this.detailData.buNo
         this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -2580,13 +2640,28 @@
         saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.detailInformationFlag = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {}
-            })
+            if (keepDetailOpen) {
+              this.getInspectionFormData()
+              if (!options.skipSuccessMessage) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              }
+            } else {
+              this.detailInformationFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+            if (typeof options.afterSuccess === 'function') {
+              options.afterSuccess()
+            }
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
new file mode 100644
index 0000000..91f1059
--- /dev/null
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -0,0 +1,3529 @@
+<template>
+  <div class="mod-config">
+
+    <!-- 条件查询 -->
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="工厂编码">
+        <el-input v-model="searchData.site" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item label="BU">
+        <el-select v-model="searchData.buDesc" placeholder="请选择BU" clearable style="width: 120px">
+          <el-option v-for="i in userBuList" :key="i.buNo" :label="i.buDesc" :value="i.buDesc"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="检验单号">
+        <el-input v-model="searchData.inspectionNo" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item label="销售订单">
+        <el-input v-model="searchData.poOrderNo" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item label="客户编码">
+        <el-input v-model="searchData.customerNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="客户名称">
+        <el-input v-model="searchData.customerName" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item label="物料编码">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="物料名称">
+        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item label="规格型号">
+        <el-input v-model="searchData.spec" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item label="检验结论">
+        <el-select v-model="searchData.inspectionResult" clearable style="width: 90px">
+          <el-option label="合格" value="合格"></el-option>
+          <el-option label="不合格" value="不合格"></el-option>
+          <el-option label="免检" value="免检"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处置措施">
+        <el-select v-model="searchData.disposalMeasures" clearable style="width: 120px">
+          <el-option
+            v-for="i in disposalMeasuresOptions"
+            :key="i.id"
+            :label="i.disposalMeasures"
+            :value="i.disposalMeasures">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="searchData.states" multiple style="width: 340px">
+          <el-option label="未开始" value="未开始"></el-option>
+          <el-option label="待检验" value="待检验"></el-option>
+          <el-option label="待审核" value="待审核"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="质检员">
+        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item label="送检日期">
+        <el-date-picker style="width: 160px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="检验日期">
+        <el-date-picker style="width: 160px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button v-if="!authSearch" type="primary" :loading="searchLoading" @click="getDataList">查询</el-button>
+        <el-button type="primary" @click="resetSearch">重置</el-button>
+        <el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
+        <el-button v-if="!authCancelCheck" type="primary" @click="cancelSubmitResult">取消审核</el-button>
+        <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
+        <el-button v-if="!authOverLoad" type="primary" :loading="overLoading" @click="overLoadModal">任务重载</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- 检验记录展示列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      @row-click="FQASClickRow"
+      @selection-change="selectionFQAS"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        label="状态">
+        <template slot-scope="scope">
+          <div :style="{fontWeight:'bold', color: scope.row.state === '待检验' ? 'red' : scope.row.state === '待审核' ? '#ffa500e0' : scope.row.state === '已完成' ? '#3ac252' : ''}">
+            {{ scope.row.state }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList1" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed===''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <div v-if="item.columnProp === 'inspectionResult' && scope.row.inspectionResult === '不合格' && scope.row.disposalMeasures === '拒收退回'">
+            <span v-if="!item.columnHidden" style="color: red"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </div>
+          <div v-else>
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="130"
+        label="操作">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
+          <el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
+          <el-link style="cursor: pointer" v-if="!authFile" @click="getFileContentData(scope.row)">工作文件</el-link>
+          <el-link style="cursor: pointer" v-if="!authChange && scope.row.state === '待检验'" @click="changeInspectionModal(scope.row)">更改检验方式</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页-->
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 检验单详情页（布局与 SQC 检验明细清单一致：el-form + label-top + .rq 表格） -->
+    <el-dialog
+      title="检验明细清单"
+      :close-on-click-modal="false"
+      v-drag
+      :visible.sync="detailInformationFlag"
+      width="1200px">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList">
+        <el-form-item label="物料编码">
+          <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="detailData.partDesc" readonly style="width: 300px"></el-input>
+        </el-form-item>
+        <el-form-item label="规格型号">
+          <el-input v-model="detailData.spec" readonly style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="计量单位">
+          <el-input v-model="detailData.umName" readonly style="width: 60px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <span v-if="detailData.submitFlag === 'Y'" slot="label">协同人员</span>
+          <span v-else style="cursor: pointer" slot="label" @click="getOperatorList"><a>协同人员</a></span>
+          <el-input v-model="detailData.operatorName" readonly style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人(供应商)</span>
+          <span v-else style="cursor: pointer" slot="label" @click="getBaseList(509)"><a>责任人(供应商)</a></span>
+          <el-input v-model="detailData.responsiblePerson" :readonly="detailData.submitFlag === 'Y'" style="width: 150px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList">
+        <el-form-item label="发货数量">
+          <el-input-number :controls="false" :step="0" v-model="detailData.rollQty" disabled style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="送检数量">
+          <el-input-number :controls="false" :step="0" v-model="detailData.rollCount" style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="抽样数量">
+          <el-input-number :controls="false" :step="0" v-model="detailData.samplingQty" style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="合格数量">
+          <el-input-number :controls="false" :step="0" :min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled style="width: 85px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :min="0" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="不合格数量">
+          <el-input-number :controls="false" :step="0" :min="0" v-model="detailData.notPassQty" disabled style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="不合格项目数量">
+          <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled style="width: 85px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" style="width: 85px"></el-input-number>
+        </el-form-item>
+        <el-form-item style="margin-top: 13px;margin-left: 365px">
+          <el-button @click="getFileContentData(detailData)">
+            <svg t="1739002974630" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="59598" width="22" height="22"><path d="M807.3216 889.5488H221.184c-78.7456 0-142.848-64.1024-142.848-142.848V286.976c0-78.7456 64.1024-142.848 142.848-142.848h178.8416c20.7872 0 40.7552 8.8064 54.784 24.1664l77.568 85.0944c2.4064 2.6112 5.8368 4.1472 9.3696 4.1472h265.5232c78.7456 0 142.848 64.1024 142.848 142.848v346.2656c0.0512 78.7968-64.0512 142.8992-142.7968 142.8992zM221.184 205.568c-44.9024 0-81.408 36.5056-81.408 81.408v459.6736c0 44.9024 36.5056 81.408 81.408 81.408h586.1376c44.9024 0 81.408-36.5056 81.408-81.408V400.4352c0-44.9024-36.5056-81.408-81.408-81.408h-265.5232c-20.7872 0-40.7552-8.8064-54.784-24.1664L409.3952 209.7152c-2.4064-2.6112-5.8368-4.1472-9.3696-4.1472H221.184z" fill="#6FB1F9" p-id="59599"></path><path d="M466.0224 453.8368H249.0368c-16.9472 0-30.72-13.7728-30.72-30.72s13.7728-30.72 30.72-30.72h216.9856c16.9472 0 30.72 13.7728 30.72 30.72s-13.7728 30.72-30.72 30.72z" fill="#6FB1F9" p-id="59600"></path></svg>
+          </el-button>
+          <el-button @click="subDetailUpload">
+            <svg t="1739002903501" class="icon" viewBox="0 0 1550 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="50418" width="22" height="22"><path d="M985.000229 727.917714c20.48 0 34.113829-13.663086 34.113828-34.143085 0-10.24-3.393829-17.056914-10.24-23.873829l-204.8-204.8c-6.816914-6.846171-13.633829-10.24-23.873828-10.24-10.24 0-17.086171 3.393829-23.903086 10.24l-204.8 204.8c-6.816914 6.816914-10.24 13.633829-10.24 23.873829 0 20.48 13.663086 34.143086 34.143086 34.143085 10.24 0 17.056914-3.423086 23.873828-10.24l146.783086-146.783085v395.966171c0 20.48 13.663086 34.113829 34.143086 34.113829s34.113829-13.633829 34.113828-34.113829V570.894629l146.783086 146.783085c6.816914 6.816914 13.663086 10.24 23.903086 10.24z m282.799542-353.045943c0-10.24 1.287314-17.086171 0-27.296914C1240.502857 128.117029 1043.0464 29.257143 858.199771 29.257143 701.205943 29.257143 564.662857 117.994057 496.405943 247.720229 469.079771 240.874057 441.782857 234.057143 414.485943 234.057143 281.365943 234.057143 175.542857 307.112229 175.542857 440.232229c0 17.056914 3.423086 34.113829 6.816914 51.2C97.514057 535.786057 29.257143 585.5232 29.257143 723.031771c0 170.656914 136.543086 277.942857 307.2 277.942858H585.142857c20.48 0 34.143086-13.633829 34.143086-34.113829S605.622857 932.717714 585.142857 932.717714h-248.685714c-133.12 0-238.943086-76.565943-238.943086-209.685943 0-82.797714 37.566171-131.657143 105.325714-166.765714l58.046172-20.48-13.663086-61.44c-3.423086-10.24-3.423086-23.873829-3.423086-34.113828 0-95.583086 75.103086-137.918171 170.686172-137.918172 20.48 0 37.536914 3.423086 58.016914 10.24l54.623086 20.48 27.296914-51.2c61.44-112.64 179.317029-198.100114 303.776914-184.32 184.846629 20.48 309.511314 71.68 341.343086 250.0608 1.199543 6.787657 0 10.24 0 17.056914v6.846172l-3.423086 47.776914 44.383086 20.48c110.094629 34.6112 222.354286 143.36 222.354286 249.183086 0 150.176914-122.88 243.799771-273.056914 243.799771h-214.571886c-20.48 0-34.113829 13.663086-34.113829 34.143086s13.633829 34.113829 34.113829 34.113829h214.571886c187.713829 0 341.313829-124.342857 341.313828-312.056686 0-144.530286-121.270857-269.663086-263.314286-314.046172z" fill="#6C5FFC" p-id="50419"></path></svg>
+          </el-button>
+          <!-- <el-button type="success" size="small" icon="el-icon-setting" @click="openItemOperationDialog">项目导入</el-button>
+          <el-button type="primary" size="small" icon="el-icon-download" @click="openTemplateImportDialog">模板导入</el-button> -->
+        </el-form-item>
+      </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-else v-model="detailData.inspectionResult" @change="resultChange" 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: 293px"></el-input>
+          <el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input>
+        </el-form-item>
+        <el-form-item v-show="detailData.inspectionResult === '不合格'" style="margin-top: 5px">
+          <el-form-item label="处置措施">
+            <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
+              <el-option
+                v-for="i in disposalMeasuresOptions"
+                :key="i.id"
+                :label="i.disposalMeasures"
+                :value="i.disposalMeasures">
+              </el-option>
+            </el-select>
+            <el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
+              <el-option
+                v-for="i in disposalMeasuresOptions"
+                :key="i.id"
+                :label="i.disposalMeasures"
+                :value="i.disposalMeasures">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="处置说明">
+            <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input>
+            <el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input>
+          </el-form-item>
+        </el-form-item>
+      </el-form>
+      <div class="rq">
+        <el-table
+          :height="500"
+          :data="detailList"
+          border
+          style="width: 100%;">
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="center"
+            :min-width="90"
+            label="操作">
+            <template slot-scope="scope">
+              <el-button class="el-icon-picture" v-if="scope.row.detailImageNum > 0" type="success" @click="uploadImageModal(scope.row)"></el-button>
+              <el-button class="el-icon-picture" v-else type="primary" @click="uploadImageModal(scope.row)"></el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in detailColumnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed===''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <!-- 标准值、上限值、下限值可编辑 -->
+              <template v-if="item.columnProp === 'defaultValue' || item.columnProp === 'minValue' || item.columnProp === 'maxValue'">
+                <el-input v-model="scope.row[item.columnProp]" style="height: 11px; width: 98%"></el-input>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="实测值">
+            <template slot-scope="scope">
+              <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+              <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="center"
+            min-width="80"
+            label="检验明细">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
+              <el-button v-else type="primary" @click="subDetailModal(scope.row)">点击输入</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            :min-width="80"
+            label="抽样数量">
+            <template slot-scope="scope">
+              <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.samplingQty" disabled style="height: 11px; width:98%"></el-input-number>
+              <el-input-number :controls="false" :step="0" v-else :ref="`samplingQty${scope.$index}`" v-model="scope.row.samplingQty" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px; width: 98%"></el-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            :min-width="80"
+            label="不合格数量">
+            <template slot-scope="scope">
+              <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled style="height: 11px; width:98%"></el-input-number>
+              <el-input-number :controls="false" :step="0" v-else :ref="`unqualifiedQuantity${scope.$index}`" v-model="scope.row.unqualifiedQuantity" @keyup.enter.native="focusNextInput(scope.$index, 'unqualifiedQuantity')" style="height: 11px; width: 98%"></el-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="center"
+            :min-width="90"
+            label="项目检验结论">
+            <template slot-scope="scope">
+              <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
+                <el-option label="合格" value="Y" style="color: green"></el-option>
+                <el-option label="不合格" value="N" style="color: red"></el-option>
+              </el-select>
+              <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-else v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="合格">
+                <el-option label="合格" value="Y" style="color: green"></el-option>
+                <el-option label="不合格" value="N" style="color: red"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 文件清单 -->
+    <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="900px">
+          <el-form :inline="true" label-position="top" style="margin-bottom: 10px;">
+            <el-form-item v-if="detailInformationFlag">
+              <el-button type="primary" size="small" @click="addUploadFileModal">上传文件</el-button>
+            </el-form-item>
+          </el-form>
+          <sqc-file-table :columns="fileColumnList" :data-list="fileContentList" :query-loading="fileLoading" @refresh="getFileContentData(detailData)"></sqc-file-table>
+          <!-- <el-table :height="350" :data="fileContentList" border style="width: 100%;">
+            <el-table-column v-for="(item,index) in fileColumnList" :key="index" :sortable="item.columnSortable" :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip" :align="item.align" :fixed="item.fixed===''?false:item.fixed" :min-width="item.columnWidth" :label="item.columnLabel">
+              <template slot-scope="scope">
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
+              <template slot-scope="scope">
+                <el-link style="cursor: pointer" @click="downloadFile(scope.row)">下载</el-link>
+                <el-link style="cursor:pointer" @click="previewFile(scope.row)">预览</el-link>
+                <el-link v-if="scope.row.fileType2 !== 'sop'" style="cursor: pointer" @click="deleteFile(scope.row)">删除</el-link>
+              </template>
+            </el-table-column>
+          </el-table> -->
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="fileFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 子明细信息 -->
+    <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="572px">
+      <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
+      <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button>
+      <el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button>
+      <div class="rq ">
+        <el-table
+          :height="400"
+          :data="templateTableData"
+          border
+          :row-class-name="rowClassName"
+          @selection-change="handleDetailSelectionChange"
+          style="width: 100%;">
+          <el-table-column type="selection" align="center" width="50"></el-table-column>
+          <el-table-column label="序号" align="center" prop="rowI" width="50"></el-table-column>
+          <el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `a`" v-model="templateTableData[row.xh-1].samplingLocation" @keyup.enter.native="nextFocus1(row.xh-1)" placeholder="请输入抽样位置A"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="samplingLocationB" header-align="center" align="center" :required="true" label="抽样位置B" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].samplingLocationB" readonly placeholder="请输入抽样位置B"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `b`" v-model="templateTableData[row.xh-1].samplingLocationB" @keyup.enter.native="nextFocus2(row.xh-1)" placeholder="请输入抽样位置B"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值A" width="200">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `c`" v-model="templateTableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValueB" header-align="center" align="center" :required="true" label="实测值B" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].subDetailValueB" readonly placeholder="请输入实测值B"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `d`" v-model="templateTableData[row.xh-1].subDetailValueB" @keyup.enter.native="nextFocus4(row.xh-1)" placeholder="请输入实测值B"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValueC" header-align="center" align="center" :required="true" label="实测值C" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].subDetailValueC" readonly placeholder="请输入实测值C"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `e`" v-model="templateTableData[row.xh-1].subDetailValueC" @keyup.enter.native="nextFocus5(row.xh-1)" placeholder="请输入实测值C"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValueD" header-align="center" align="center" :required="true" label="实测值D" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].subDetailValueD" readonly placeholder="请输入实测值D"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `f`" v-model="templateTableData[row.xh-1].subDetailValueD" @keyup.enter.native="nextFocus6(row.xh-1)" placeholder="请输入实测值D"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValueE" header-align="center" align="center" :required="true" label="实测值E" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].subDetailValueE" readonly placeholder="请输入实测值E"></el-input>
+              <el-input v-else :ref="`${row.xh-1}` + `g`" v-model="templateTableData[row.xh-1].subDetailValueE" @keyup.enter.native="nextFocus7(row.xh-1)" placeholder="请输入实测值E"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页-->
+        <el-pagination
+          @size-change="sizeChangeHandle2"
+          @current-change="currentChangeHandle2"
+          :current-page="pageIndex2"
+          :page-sizes="[20, 50, 100, 200, 500]"
+          :page-size="pageSize2"
+          :total="tableData.length"
+          layout="total, sizes, prev, pager, next, jumper">
+        </el-pagination>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button v-if="detailData.submitFlag !== 'Y'" type="primary" @click="saveSubDetailResult">保存</el-button>
+        <el-button type="primary" @click="subDetailFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 批量新增子明细操作-->
+    <el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="510px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'默认抽样位置A'">
+          <el-input v-model="batchAddData.samplingLocation" style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'默认抽样位置B'">
+          <el-input v-model="batchAddData.samplingLocationB" style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'抽样数量'">
+          <el-input type="number" v-model="batchAddData.samplingNumber" style="width: 150px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="batchHandleAddModal">保存</el-button>
+        <el-button type="primary" @click="batchHandleAddModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 机修人员清单 -->
+    <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="operatorData">
+          <el-form-item :label="'所属角色'">
+            <el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
+              <el-option
+                v-for = "i in roleList"
+                :key = "i.roleId"
+                :label = "i.roleName"
+                :value = "i.roleId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="'用户编码'">
+            <el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'用户姓名'">
+            <el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getOperatorList2">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="operatorList"
+          ref="operatorTable"
+          @row-click="operatorClickRow"
+          @selection-change="selectionChangeHandle2"
+          border
+          style="width: 100%;">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            width="50">
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in operatorDetailList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmOperator">确认</el-button>
+        <el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 更改检验方式 -->
+    <el-dialog title="更改检验方式" top="25vh" :close-on-click-modal="false" v-drag :visible.sync="changeModalFlag" width="500px">
+      <el-form :inline="true" label-position="top" :model="changeData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="检验方式">
+          <el-select v-model="changeData.inspectCode" style="width: 210px">
+            <el-option label="全检" value="全检"></el-option>
+            <el-option label="数量抽检" value="数量抽检"></el-option>
+            <el-option label="比例抽检" value="比例抽检"></el-option>
+            <el-option label="不固定抽检" value="不固定抽检"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="抽检数量">
+          <el-input class="inlineNumber numInput" v-model="changeData.qtySample" type="number" style="width: 110px"></el-input>
+        </el-form-item>
+        <el-form-item label="抽检比例">
+          <el-input class="inlineNumber numInput" v-model="changeData.percentSample" type="number" style="width: 110px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="changeData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
+          <span slot="label" @click="getBaseList(207)"><a herf="#">抽样方案编码</a></span>
+          <el-input v-model="changeData.samplingProgrammeNo" style="width: 143px"></el-input>
+        </el-form-item>
+        <el-form-item label="抽样方案名称">
+          <el-input v-model="changeData.samplingProgrammeDesc" disabled style="width: 300px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="changeData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
+          <span slot="label" @click="getBaseList(208)"><a herf="#">检验水平编码</a></span>
+          <el-input v-model="changeData.samplingLevelNo" style="width: 143px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验水平名称">
+          <el-input v-model="changeData.samplingLevelDesc" disabled style="width: 300px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="changeInspectionWay">保存</el-button>
+        <el-button type="primary" @click="changeModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
+    <!-- 上传文件的modal -->
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
+
+    <!-- 上传文件的modal -->
+    <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
+
+    <!-- 子明细导入 -->
+    <subDetailUpload @changeEvent="changeMyString" ref="subDetailUpload" @refreshPageTables="getInspectionFormData" v-drag></subDetailUpload>
+
+    <!-- 项目操作对话框 -->
+    <el-dialog title="检验项目操作" @close="refreshInspectionDetailList" :close-on-click-modal="false" v-drag :visible.sync="itemOperationDialogFlag" width="1200px">
+      <div class="search-container">
+        <el-form :inline="true" size="small">
+          <el-form-item label="项目编码">
+            <el-input v-model="itemOperationQuery.itemNo" placeholder="请输入项目编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
+          </el-form-item>
+          <el-form-item label="项目名称">
+            <el-input v-model="itemOperationQuery.itemDesc" placeholder="请输入项目名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
+          </el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="searchOQCItems">查询</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetItemQuery">重置</el-button>
+        </el-form>
+      </div>
+      <div class="item-operation-content">
+        <div class="item-panel available-panel">
+          <div class="panel-header">
+            <i class="el-icon-menu"></i>
+            <span class="panel-title">可选项目列表</span>
+            <span class="item-count">{{ availableItemList.length }}</span>
+          </div>
+          <el-table ref="availableItemTable" :data="availableItemList" @row-click="availableItemClickRow" @selection-change="availableItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
+            <el-table-column type="selection" width="45" align="center"></el-table-column>
+            <el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
+            <el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
+        <div class="operation-buttons">
+          <el-tooltip content="添加选中项目" placement="left">
+            <el-button type="primary" icon="el-icon-d-arrow-right" circle @click="addInspectionItems" :disabled="!availableItemSelections || availableItemSelections.length === 0"></el-button>
+          </el-tooltip>
+          <el-tooltip content="移除选中项目" placement="right">
+            <el-button type="danger" icon="el-icon-d-arrow-left" circle @click="deleteInspectionItems" :disabled="!selectedItemSelections || selectedItemSelections.length === 0"></el-button>
+          </el-tooltip>
+        </div>
+        <div class="item-panel selected-panel">
+          <div class="panel-header">
+            <i class="el-icon-tickets"></i>
+            <span class="panel-title">已有项目列表</span>
+            <span class="item-count">{{ selectedItemList.length }}</span>
+          </div>
+          <el-table ref="selectedItemTable" :data="selectedItemList" @row-click="selectedItemClickRow" @selection-change="selectedItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
+            <el-table-column type="selection" width="45" align="center"></el-table-column>
+            <el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
+            <el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="itemOperationDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 模板导入对话框 -->
+    <el-dialog title="模板导入" :close-on-click-modal="false" v-drag :visible.sync="templateImportDialogFlag" width="900px">
+      <div class="search-container">
+        <el-form :inline="true" size="small">
+          <el-form-item label="模板编码">
+            <el-input v-model="templateQuery.templateId" placeholder="请输入模板编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
+          </el-form-item>
+          <el-form-item label="模板名称">
+            <el-input v-model="templateQuery.templateDesc" placeholder="请输入模板名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
+          </el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="searchOQCTemplates">查询</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetTemplateQuery">重置</el-button>
+        </el-form>
+      </div>
+      <div class="template-list-container">
+        <div class="panel-header">
+          <i class="el-icon-s-grid"></i>
+          <span class="panel-title">OQC检验模板</span>
+          <span class="item-count">({{ templateList.length }})</span>
+        </div>
+        <el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" :header-cell-style="{background: '#f5f7fa', color: '#606266', fontWeight: '500'}">
+          <el-table-column type="selection" width="50" align="center"></el-table-column>
+          <el-table-column prop="templateId" label="模板编码" align="center" width="120"></el-table-column>
+          <el-table-column prop="templateName" label="模板名称" align="left" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="itemCount" label="项目数量" align="center" width="100"></el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" icon="el-icon-download" @click="confirmImportTemplate" :disabled="!templateSelections || templateSelections.length === 0" :loading="importLoading" size="small">导入选中模板</el-button>
+        <el-button @click="templateImportDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    qcOQCInspectionSearch, // OQC检验记录查询
+    fqasDetailSearch, // FQAS检验记录查询
+    selectFQASSubDetailedRecord, // 查询子明细记录
+    saveFQASDetailedRecord, // 新增明细信息
+    checkFQASIsSubmit, // 检查是否已提交
+    saveFQASSubDetailed, // 新增子明细信息
+    saveFQASSubmitResult, // 审核
+    cancelFQASSubmitResult,
+    fqasRecordDelete, // 删除检验记录
+    disposalMeasuresSearch, // 获取处置措施列表
+    fqasRecordOverLoad, // 重载检验单
+    getSiteAndBuByUserName,
+    actionFQASInspection, // 开始检验
+    dataAcquisition, // 数据采集
+    changeInspectionWay, // 更改检验方式
+    getFileContentList2,
+    downLoadObjectFile,
+    deleteObjectFile,
+    getUserRoleList,
+    getOperatorList,
+    // OQC检验项目操作和模板导入
+    getOQCItemList,
+    addOQCItemDetails,
+    deleteOQCItemDetails,
+    getOQCTemplateList,
+    importOQCTemplateItems,
+    searchQcSopFileList,
+    downloadSopFile
+  } from "@/api/qc/qc.js"
+  import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
+  import Chooselist from '@/views/modules/common/Chooselist_eam'
+  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcFAIUploadFile from "./qc_FAI_upload_file"
+  import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
+  import subDetailUpload from "./sub_detail_upload"
+  import SqcFileTable from "./SQCFileTable.vue";
+  export default {
+    components: {
+      Chooselist,
+      qcFAIUploadFile,
+      comQcItemImageUploadFile,
+      subDetailUpload,
+      SqcFileTable
+    },
+    computed: {
+      templateTableData () {
+        let start = (this.pageIndex2 - 1) * this.pageSize2
+        let end = start + this.pageSize2
+        if (end > this.tableData.length){
+          end = this.tableData.length
+        }
+        return this.tableData.slice(start,end)
+      }
+    },
+    watch: {
+      detailData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+        }
+      },
+      detailList: {
+        deep: true,
+        handler: function (newV, oldV) {
+          let num = 0
+          for (let i = 0; i < this.detailList.length; i++) {
+            if (this.detailList[i].itemResult === 'N') {
+              num++
+            }
+          }
+          this.detailData.unqualifiedQty = num
+        }
+      },
+    },
+    data () {
+      return {
+        searchLoading: false,
+        loadFlag: false,
+        // 是否收藏
+        favorite: false,
+        // 导出 start
+        exportData: [],
+        transferLoadFlag: false,
+        exportName: "FQAS检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["FQAS检验录入"],
+        exportFooter: [],
+        exportList: [],
+        // 导出 end
+        submitData: {
+          site: '',
+          inspectionNo: '',
+          isQualified: '',
+          isQualifiedChinese: '',
+          submitList: [],
+          updateBy: this.$store.state.user.name,
+        },
+        tagNo:'',
+        searchData: {
+          site: '',
+          userName: this.$store.state.user.name,
+          inspectionNo: '',
+          inspectionTypeNo:'110',
+          isQualified: '',
+          buDesc: '',
+          startDate: '',
+          endDate: '',
+          startDate2: '',
+          endDate2: '',
+          partNo:'',
+          partDesc:'',
+          spec: '',
+          state: '',
+          inspectionResult: '',
+          disposalMeasures: '',
+          inspectorName: '',
+          page: 1,
+          limit: 10,
+          states: ['未开始','待检验'],
+          customerNo: '',
+          customerName: '',
+          poOrderNo: ''
+        },
+        pageIndex: 1,
+        pageSize: 200,
+        totalPage: 0,
+        pageIndex2: 1,
+        pageSize2: 20,
+        totalPage2: 0,
+        height: 500,
+        dataList: [],
+        dataListSelections: [],
+        submitFlag: false,
+        modalData: {
+          flag:'',
+          functionType:'',
+          site: '',
+          bu: '',
+          inspectionNo:'',
+          workOrderNumber: '',
+          workOrderQuantity: '',
+          reelNumber: '',
+          partNo: '',
+          rollingQuantity: '',
+          sampleQuantity: '',
+          detailCodeNo:'',
+          detailCodeDesc:'',
+          inspectionTypeNo:'110',
+          inspectionTypeName:'OQC',
+          inspectorNo:'',
+          inspectorName:'',
+          isQualified:'',
+          isQualifiedChinese:''
+        },
+        // 展示列集
+        // columnList1: [],
+        columnList1: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1BuDesc',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'buDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'BU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectionNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectionNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验单号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectionResult',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectionResult',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1TaskDate',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'taskDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '送检日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectionCycle',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectionCycle',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '检验周期(h)',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1RollNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'rollNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '标签条码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1PartNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'partNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1PartDesc',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'partDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1Spec',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'spec',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '规格型号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1Umid',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'umName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '计量单位',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1RollQty',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'rollQty',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '发货数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1RollCount',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'rollCount',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '送检数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1SamplingQty',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'samplingQty',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '抽样数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1PoOrderNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'poOrderNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '关联单号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1PoItemNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'poItemNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '关联单行号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1CustomerNo',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'customerNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '客户编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1CustomerName',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'customerName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '客户名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectionRemark',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectionRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '质检备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1DisposalMeasures',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1DisposalRemark',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'disposalRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1ActionDate',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'actionDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '开始检验时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectorDate',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectorDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1CreateBy',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'createBy',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '送检员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1InspectorName',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'inspectorName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '质检员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+        ],
+        detailColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2ItemNo',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2ItemDesc',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验项目',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2SamplingLevelDesc',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'samplingLevelDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验水平',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2SamplingProgrammeDesc',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'samplingProgrammeDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验方案',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2MethodName',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'methodName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验方法',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2MethodRemark',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'methodRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验方法说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2ObjectDesc',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'objectDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检测仪器',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2Aql',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'aql',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: 'AQL',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2Ac',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'ac',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: 'AC',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2Re',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 're',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: 'RE',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2DefaultValue',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'defaultValue',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '标准值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2MaxValue',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'maxValue',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '最大值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2MinValue',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'minValue',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '最小值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table2ValueType',
+            tableId: "301017Table2",
+            tableName: "检验单明细表",
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检测值类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+        ],
+        fileColumnList: [
+          {
+            columnProp: 'fileName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '文件名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'createdBy',
+            headerAlign: "center",
+            align: 'center',
+            columnLabel: '上传人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            columnProp: 'createDate',
+            headerAlign: "center",
+            align: 'center',
+            columnLabel: '上传时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            columnProp: 'orderRef3',
+            headerAlign: "center",
+            align: 'center',
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+        ],
+        detailData: {
+          site: '',
+          buNo: '',
+          inspectionNo: '',
+          partNo: '',
+          partDesc: '',
+          rollQty: '',
+          samplingQty: '',
+          unqualifiedQty: 0,
+          unqualifiedQuantity: '',
+          disposalMeasures: '',
+          disposalRemark: '',
+          inspectionResult: '',
+          inspectorNo: '',
+          inspectionRemark: '',
+          submitFlag: '',
+          umId: '',
+          umName: '',
+          rollCount: '',
+          operator: '',
+          operatorName: '',
+          responsiblePerson: '',
+          responsiblePersonName: '',
+          passQty: '',
+          notPassQty: '',
+          spec: '',
+          state: ''
+        },
+        detailInformationFlag: false,
+        detailList: [],
+        saveInformationData: {
+          site: '',
+          buNo: '',
+          inspectionNo:'',
+          disposalMeasures: '',
+          disposalRemark: '',
+          inspectorNo: '',
+          inspectionRemark: '',
+          itemList:[],
+          unqualifiedQty: '',
+          rollCount: '',
+          samplingQty: '',
+          partNo: '',
+          partDesc: '',
+          operator: '',
+          operatorName: '',
+          responsiblePerson: '',
+          responsiblePersonName: '',
+          subDetailList: [],
+          passQty: '',
+          notPassQty: ''
+        },
+        // 子明细数据对象
+        tableData: [],
+        checkedDetail: [],
+        subDetailFlag: false,
+        subDetailData: {
+          site: '',
+          buNo: '',
+          inspectionNo: '',
+          itemNo: '',
+          itemDesc: '',
+          defaultValue: '',
+          maxValue: '',
+          minValue: '',
+          valueTypeDb: '',
+          subDetailValues:[]
+        },
+        options: [],
+        fileFlag: false,
+        fileContentList: [],
+        fileActiveTab: 'qcFile',
+        sopFileList: [],
+        sopFileLoading: false,
+        currentFileRow: null,
+        FQASSelections: [],
+        batchHandleAddModalFlag: false,
+        batchAddData: {
+          samplingLocation: '',
+          samplingLocationB: '',
+          samplingNumber: ''
+        },
+        disposalMeasuresOptions: [],
+        userBuList: [],
+        authSearch: false,
+        authCheck: false,
+        authCancelCheck:false,
+        authOverLoad: false,
+        authDelete: false,
+        authDetail: false,
+        authFile: false,
+        authChange: false,
+        menuId: this.$route.meta.menuId,
+        roleList: [],
+        operatorList: [],
+        operatorData: {
+          flag: '',
+          site: '',
+          bu: '',
+          adminID: '',
+          adminName: '',
+          roleName: '',
+          roleId: '',
+        },
+        operatorModelFlag: false,
+        dataListSelections2: [],
+        operatorDetailList: [
+          {
+            columnProp: 'adminID',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '用户账号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'adminName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '用户名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'email',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '邮箱',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'phone',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '手机号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
+        acquisitionList: [],
+        fileData: {
+          site: '',
+          buNo: '',
+          inspectionNo: '',
+          partNo: '',
+          inspectionTypeNo: ''
+        },
+        currentRow: {},
+        currentDetailRow: {},
+        changeData: {
+          site: '',
+          buNo: '',
+          inspectionNo: '',
+          rollCount: '',
+          inspectCode: '',
+          qtySample: '',
+          percentSample: '',
+          samplingProgrammeNo: '',
+          samplingProgrammeDesc: '',
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
+          receiptNo: '',
+          receiptItemNo: '',
+          inspectionTypeNo: ''
+        },
+        changeModalFlag: false,
+        overLoading: false,
+        // OQC项目操作相关
+        itemOperationDialogFlag: false,
+        itemOperationQuery: {
+          itemNo: '',
+          itemDesc: '',
+        },
+        availableItemList: [],
+        selectedItemList: [],
+        availableItemSelections: [],
+        selectedItemSelections: [],
+        // OQC模板导入相关
+        templateImportDialogFlag: false,
+        templateQuery: {
+          templateId: '',
+          templateDesc: '',
+        },
+        templateList: [],
+        templateSelections: [],
+        importLoading: false
+      }
+    },
+
+    mounted () {
+      this.height = window.innerHeight - 250
+    },
+
+    created () {
+      // 按钮控制
+      this.getButtonAuthData()
+      // 获取用户的 site 和 bu
+      this.getSiteAndBuByUserName()
+      this.favoriteIsOk()
+      this.disposalMeasuresSearch()
+      // 动态列
+      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
+      if (!this.authSearch) {
+        // 获取数据列表
+        this.getDataList()
+      }
+      // 获取用户角色
+      this.getUserRoleList()
+    },
+
+    methods: {
+      // 重置搜索条件
+      resetSearch() {
+        this.searchData = {
+          site: '',
+          userName: this.$store.state.user.name,
+          inspectionNo: '',
+          inspectionTypeNo: '110',
+          isQualified: '',
+          buDesc: '',
+          startDate: '',
+          endDate: '',
+          startDate2: '',
+          endDate2: '',
+          partNo: '',
+          partDesc: '',
+          spec: '',
+          inspectorName: '',
+          customerNo: '',
+          customerName: '',
+          inspectionResult: '',
+          disposalMeasures: '',
+          state: '',
+          states: ['未开始', '待检验'],
+          poOrderNo: '',
+          page: 1,
+          limit: 10
+        };
+        this.getDataList();
+      },
+
+      // 检验结论改变事件
+      resultChange () {
+        if (this.detailData.inspectionResult === '不合格') {
+          this.detailData.passQty = 0
+        }
+      },
+      // 数据采集
+      dataAcquisition () {
+        this.loadFlag = true
+        let tempDate = {
+          site: this.detailData.site,
+          buNo: this.detailData.buNo,
+          inspectionNo: this.detailData.inspectionNo,
+          flag: 'iqc'
+        }
+        dataAcquisition(tempDate).then(({data}) => {
+          if (data.code === 0) {
+            // this.acquisitionList = data.rows
+            this.changeMyString(data.rows)
+            this.$message({
+              message: '数据采集成功',
+              type: 'success',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'warning',
+              duration: 1500
+            })
+          }
+          this.loadFlag = false
+        })
+      },
+
+      // 获取用户角色
+      getUserRoleList () {
+        getUserRoleList().then(({data}) => {
+          if (data.code === 0) {
+            this.roleList = data.rows
+          } else {
+            this.roleList = []
+          }
+        })
+      },
+
+      // 获取协同人员列表
+      getOperatorList () {
+        this.operatorData.flag = '1'
+        this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
+        if (this.roleList.length > 0) {
+          let filterList = this.roleList.filter(item => item.roleName === '机修人员')
+          if (filterList.length > 0) {
+            this.operatorData.roleId = filterList[0].roleId
+          } else {
+            this.operatorData.roleId = this.roleList[0].roleId
+          }
+        } else {
+          this.operatorData.roleId = ''
+        }
+        // 先清空缓存选中
+        this.$nextTick(() => this.$refs.operatorTable.clearSelection())
+        // 拿到选中的人员编号
+        let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
+        getOperatorList(this.operatorData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operatorList = data.rows
+            this.operatorList.forEach(val => {
+              // 回显选中
+              if (tempDataList.includes(val.adminID)) {
+                this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
+              }
+            })
+            this.operatorModelFlag = true
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 获取责任人员列表
+      getResponsiblePersonList () {
+        this.operatorData.flag = '2'
+        this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
+        if (this.roleList.length > 0) {
+          let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
+          if (filterList.length > 0) {
+            this.operatorData.roleId = filterList[0].roleId
+          } else {
+            this.operatorData.roleId = this.roleList[0].roleId
+          }
+        } else {
+          this.operatorData.roleId = ''
+        }
+        // 先清空缓存选中
+        this.$nextTick(() => this.$refs.operatorTable.clearSelection())
+        // 拿到选中的人员编号
+        let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
+        getOperatorList(this.operatorData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operatorList = data.rows
+            this.operatorList.forEach(val => {
+              // 回显选中
+              if (tempDataList.includes(val.adminID)) {
+                this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
+              }
+            })
+            this.operatorModelFlag = true
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 查询机修人员列表
+      getOperatorList2 () {
+        if (this.operatorData.flag === '1') {
+          // 拿到选中的人员编号
+          let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
+          getOperatorList(this.operatorData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.operatorList = data.rows
+              this.operatorList.forEach(val => {
+                // 回显选中的部门
+                if (tempDataList.includes(val.adminID)) {
+                  this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
+                }
+              })
+            } else {
+              this.operatorList = []
+            }
+          })
+        } else {
+          // 拿到选中的人员编号
+          let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
+          getOperatorList(this.operatorData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.operatorList = data.rows
+              this.operatorList.forEach(val => {
+                // 回显选中的部门
+                if (tempDataList.includes(val.adminID)) {
+                  this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
+                }
+              })
+            } else {
+              this.operatorList = []
+            }
+          })
+        }
+      },
+
+      // 点击行选中复选框
+      operatorClickRow (row) {
+        this.$refs.operatorTable.toggleRowSelection(row)
+      },
+
+      // 多选
+      selectionChangeHandle2 (val) {
+        this.dataListSelections2 = val
+      },
+
+      // 确认多选协同人员
+      confirmOperator () {
+        if (this.dataListSelections2.length === 0) {
+          this.$message.warning('请勾选人员！')
+          return
+        }
+        if (this.operatorData.flag === '1') {
+          for (let i = 0; i < this.dataListSelections2.length; i++) {
+            if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
+              this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
+              this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
+            }
+          }
+          if (this.detailData.operator.charAt(0) === ';') {
+            this.detailData.operator = this.detailData.operator.substring(1)
+            this.detailData.operatorName = this.detailData.operatorName.substring(1)
+          }
+        } else {
+          for (let i = 0; i < this.dataListSelections2.length; i++) {
+            if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
+              this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
+              this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
+            }
+          }
+          if (this.detailData.responsiblePerson.charAt(0) === ';') {
+            this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
+            this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
+          }
+        }
+        this.operatorData = {
+          flag: '',
+          site: '',
+          bu: '',
+          adminID: '',
+          adminName: '',
+          roleName: '',
+          roleId: '',
+        }
+        this.operatorModelFlag = false
+      },
+
+
+      // // 实测值内容改变事件
+      // changeValue (row) {
+      //   if (row.minValue == null && row.maxValue != null) {
+      //     if (row.numberValue > row.maxValue) {
+      //       row.itemResult = 'N'
+      //     } else {
+      //       row.itemResult = 'Y'
+      //     }
+      //   } else if (row.maxValue == null && row.minValue != null) {
+      //     if (row.numberValue < row.minValue) {
+      //       row.itemResult = 'N'
+      //     } else {
+      //       row.itemResult = 'Y'
+      //     }
+      //   } else if (row.minValue != null && row.maxValue != null) {
+      //     if (row.numberValue < row.minValue || row.numberValue > row.maxValue) {
+      //       row.itemResult = 'N'
+      //     } else {
+      //       row.itemResult = 'Y'
+      //     }
+      //   }
+      // },
+
+      // 获取用户的bu
+      getSiteAndBuByUserName () {
+        let tempData = {
+          username: this.$store.state.user.name,
+        }
+        getSiteAndBuByUserName(tempData).then(({data}) => {
+          if (data.code === 0) {
+            this.userBuList = data.rows
+          }
+        })
+      },
+
+      // ======= 正则校验 =======
+      handleInput (value, type) {
+        // 大于等于0，且只能输入4位小数
+        let val = value.replace(/^\D*([0-9]\d*\.?\d{0,4})?.*$/,'$1')
+        if (val === null || val === undefined || val === '') {
+          val = 0
+        }
+        if (type === 1) {
+          this.detailData.unqualifiedQty = val
+        } else if (type === 2) {
+          this.detailData.passQty = val
+        }
+      },
+
+      // 子明细导入
+      subDetailUpload () {
+        let currentData = {
+          flag: 'FQAS',
+          site: this.detailData.site,
+          buNo: this.detailData.buNo,
+          inspectionNo: this.detailData.inspectionNo
+        }
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.subDetailUpload.init(currentData)
+        })
+      },
+
+      // 获取处置措施列表
+      disposalMeasuresSearch () {
+        let tempData = {
+          inspectionTypeNo: '110'
+        }
+        disposalMeasuresSearch(tempData).then(({data}) => {
+          if (data.code === 0) {
+            this.disposalMeasuresOptions = data.rows
+          }
+        })
+      },
+
+      // 单机选中
+      FQASClickRow (row) {
+        this.currentRow = JSON.parse(JSON.stringify(row))
+      },
+
+      // 复选
+      selectionFQAS (val) {
+        this.FQASSelections = val
+      },
+
+      // 刷新派设备文档的列表
+      getFileContentData (row) {
+        this.currentFileRow = row
+        this.fileActiveTab = 'qcFile'
+        this.fileData = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          partNo: row.partNo,
+          inspectionTypeNo: '110'
+        }
+        getFileContentList2(this.fileData).then(({data}) => {
+          if (data && data.code == 200) {
+            this.fileContentList = data.rows
+          } else {
+            this.fileContentList = []
+          }
+        })
+        //this.getSopFileList(row)
+        this.fileFlag = true
+      },
+
+      // 打开文件清单外部链接（按物料编码）
+      openFileExternalLink () {
+        const partNo = (this.currentFileRow && this.currentFileRow.partNo) || this.detailData.partNo
+        if (!partNo) {
+          this.$message.error('物料号不能为空')
+          return false
+        }
+        const baseUrl = window.SITE_CONFIG['materialSopUrl'] || 'http://pdm.bt.in/#/public/materialSop'
+        const targetUrl = `${baseUrl}/${partNo}`
+        window.open(targetUrl, '_blank')
+      },
+
+      // 获取SOP文件列表（OQC传site、partNo和orderNo）
+      getSopFileList(row) {
+        this.sopFileLoading = true
+        this.sopFileList = []
+        searchQcSopFileList({
+          site: row.site,
+          partNo: row.partNo || '',
+          orderNo: row.orderNo || ''
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.sopFileList = data.rows || []
+          } else {
+            this.sopFileList = []
+          }
+          this.sopFileLoading = false
+        }).catch(() => {
+          this.sopFileList = []
+          this.sopFileLoading = false
+        })
+      },
+
+      previewSopFile(row) {
+        if (!row.sopUrl) {
+          this.$message.warning('该文件暂无预览路径')
+          return
+        }
+        const fileName = row.sopName || row.sopUrl
+        downloadSopFile(row.sopUrl).then(({ data }) => {
+          this.$filePreview.previewFile(data, fileName).then(result => {
+            if (result.message) {
+              this.$message.success(result.message)
+            }
+          }).catch(error => {
+            this.$message.error('文件预览失败：' + (error.message || '未知错误'))
+          })
+        }).catch(() => {
+          this.$message.error('文件下载失败，请稍后重试')
+        })
+      },
+
+      // 新增文件的modal
+      addUploadFileModal () {
+        let currentData = {
+          titleCon: 'OQC文件上传',
+          site: this.detailData.site,
+          buNo: this.detailData.buNo,
+          createBy: this.$store.state.user.name,
+          inspectionNo: this.detailData.inspectionNo,
+          remark: '',
+          folder: 'qcFQAS',
+        }
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcFAIUploadFile.init(currentData)
+        })
+      },
+
+      // 上传项目图片
+      uploadImageModal (row) {
+        const openImage = () => {
+          let currentData = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            createBy: this.$store.state.user.name,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: row.itemNo,
+            folder: 'FQASItemImageFile'
+          }
+          this.$nextTick(() => {
+            this.$refs.comQcItemImageUploadFile.init(currentData)
+          })
+        }
+        if (this.detailData.state !== '待检验') {
+          openImage()
+          return
+        }
+        this.saveDetailInformation('1', {
+          skipSuccessMessage: true,
+          afterSuccess: openImage
+        })
+      },
+
+      // 文件下载
+      downloadFile (row) {
+        downLoadObjectFile(row)
+          .then(({data}) => {
+          // 不限制文件下载类型
+          const blob = new Blob([data], {type: "application/octet-stream"})
+          // 下载文件名称
+          const fileName = row.fileName
+          // a标签下载
+          const linkNode = document.createElement('a')
+          // a标签的download属性规定下载文件的名称
+          linkNode.download = fileName
+          linkNode.style.display = 'none'
+          // 生成一个Blob URL
+          linkNode.href = URL.createObjectURL(blob)
+          document.body.appendChild(linkNode)
+          // 模拟在按钮上的一次鼠标单击
+          linkNode.click()
+          // 释放URL 对象
+          URL.revokeObjectURL(linkNode.href)
+          document.body.removeChild(linkNode)
+        })
+      },
+
+      // 预览
+      previewFile (row) {
+        const fileName = row.fileName || row.fileType
+        downLoadObjectFile(row).then(({data}) => {
+          this.$filePreview.previewFile(data, fileName).then(result => {
+            if (result.message) {
+              this.$message.success(result.message)
+            }
+          }).catch(error => {
+            this.$message.error('文件预览失败：' + (error.message || '未知错误'))
+          })
+        }).catch(() => {
+          this.$message.error('文件下载失败，请稍后重试')
+        })
+      },
+
+      // 删除文件
+      deleteFile (row) {
+        let tempData = {
+          site: row.orderRef1,
+          inspectionNo: row.orderRef2,
+          buNo: row.orderRef4,
+          partNo: this.fileData.partNo,
+          inspectionTypeNo: '110'
+        }
+        this.$confirm('确定要删除此文件?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteObjectFile(row).then(({data}) => {
+            if (data && data.code == 0) {
+              this.getFileContentData(tempData)
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          let conSql = ''
+          if (val === 1037) {
+            strVal = this.modalData.detailCodeNo
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 1040) {
+            strVal = this.modalData.inspectorNo
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 207) {
+            strVal = this.changeData.samplingProgrammeNo
+            conSql = " and bu_no = '" + this.changeData.buNo + "'"
+            this.$refs.baseList.init(val, strVal, conSql)
+          }
+          if (val === 208) {
+            strVal = this.changeData.samplingLevelNo
+            conSql = " and bu_no = '" + this.changeData.buNo + "'"
+            this.$refs.baseList.init(val, strVal, conSql)
+          }
+          if (val === 509) {
+            strVal = this.detailData.responsiblePerson
+            this.$refs.baseList.init(val, strVal)
+          }
+        })
+      },
+
+      // 列表方法的回调
+      getBaseData (val) {
+        if (this.tagNo === 1037) {
+          this.modalData.detailCodeNo = val.code_no
+          this.modalData.detailCodeDesc = val.code_desc
+        }
+        if (this.tagNo === 1040) {
+          this.modalData.inspectorNo = val.inspector_no
+          this.modalData.inspectorName = val.inspector_name
+        }
+        if (this.tagNo === 207) {
+          this.changeData.samplingProgrammeNo = val.sampling_programme_no
+          this.changeData.samplingProgrammeDesc = val.sampling_programme_desc
+        }
+        if (this.tagNo === 208) {
+          this.changeData.samplingLevelNo = val.sampling_level_no
+          this.changeData.samplingLevelDesc = val.sampling_level_desc
+        }
+        if (this.tagNo === 509) {
+          this.detailData.responsiblePerson = val.SupplierID
+        }
+      },
+
+      // 获取主信息数据列表
+      getDataList () {
+        this.searchLoading = true
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        qcOQCInspectionSearch(this.searchData).then(({data}) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            this.searchLoading = false
+          } else {
+            this.searchLoading = false
+          }
+        }).catch(() => {
+          this.searchLoading = false
+        })
+      },
+
+      fields () {
+        const result = { '状态': 'state' }
+        this.columnList1.forEach((item) => {
+          result[item.columnLabel] = item.columnProp
+        })
+        return result
+      },
+
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      // 导出excel - 获取所有数据
+      async createExportData () {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        const { data } = await qcOQCInspectionSearch(this.searchData)
+        return data.page.list || []
+      },
+
+      startDownload () {
+        this._exportLoading = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+      },
+
+      finishDownload () {
+        if (this._exportLoading) {
+          this._exportLoading.close()
+          this._exportLoading = null
+        }
+      },
+
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+
+      async Transfer (type) {
+        if (type === '2') {
+          if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
+            this.$message.warning('请选择检验结论！')
+            return
+          }
+          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 = ''
+          }
+        }
+        this.saveDetailInformation(type)
+      },
+
+      // 新增明细信息
+      saveDetailInformation (type, options = {}) {
+        this.saveInformationData.site = this.detailData.site
+        this.saveInformationData.buNo = this.detailData.buNo
+        this.saveInformationData.inspectionNo = this.detailData.inspectionNo
+        this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures
+        this.saveInformationData.disposalRemark = this.detailData.disposalRemark
+        this.saveInformationData.inspectorNo = this.$store.state.user.name
+        this.saveInformationData.inspectionResult = this.detailData.inspectionResult
+        this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
+        this.saveInformationData.rollCount = this.detailData.rollCount
+        this.saveInformationData.samplingQty = this.detailData.samplingQty
+        this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
+        this.saveInformationData.partNo = this.detailData.partNo
+        this.saveInformationData.partDesc = this.detailData.partDesc
+        this.saveInformationData.operator = this.detailData.operator
+        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
+        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+        this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+        this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+        this.saveInformationData.type = type
+        this.transferLoadFlag = true
+        saveFQASDetailedRecord(this.saveInformationData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.searchData.inspectionNo = ''
+            this.getDataList()
+            // 应用时(type=1)不关闭对话框，只刷新数据
+            if (type === '1') {
+              this.getInspectionFormData()
+            } else {
+              this.detailInformationFlag = false
+            }
+            if (!options.skipSuccessMessage) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+            if (typeof options.afterSuccess === 'function') {
+              options.afterSuccess()
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).finally(()=>{
+          this.transferLoadFlag = false
+        })
+      },
+
+      // 开始检验
+      actionModal (row) {
+        this.$confirm(`确认开始检验?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: row.site,
+            buNo: row.buNo,
+            inspectionNo: row.inspectionNo,
+            actionBy: this.$store.state.user.name,
+            state: '待检验'
+          }
+          actionFQASInspection(tempData).then(async ({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+              this.searchData.inspectionNo = row.inspectionNo
+              row.state = tempData.state
+              await this.getDataList()
+              this.detailModal(row)
+            } else {
+              await this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+      // 明细记录信息查询
+      detailModal (row) {
+        this.detailData.site = row.site
+        this.detailData.buNo = row.buNo
+        this.detailData.inspectionNo = row.inspectionNo
+        this.detailData.partNo = row.partNo
+        this.detailData.partDesc = row.partDesc
+        this.detailData.rollQty = row.rollQty
+        this.detailData.samplingQty = row.samplingQty
+        this.detailData.unqualifiedQty = row.unqualifiedQty
+        this.detailData.unqualifiedQuantity = row.unqualifiedQuantity
+        this.detailData.submitFlag = row.submitFlag
+        this.detailData.disposalMeasures = row.disposalMeasures
+        this.detailData.disposalRemark = row.disposalRemark
+        this.detailData.inspectionResult = row.inspectionResult
+        this.detailData.inspectorNo = row.inspectorNo
+        this.detailData.inspectionRemark = row.inspectionRemark
+        this.detailData.umId = row.umId
+        this.detailData.umName = row.umName
+        this.detailData.rollCount = row.rollCount
+        this.detailData.operator = row.operator
+        this.detailData.operatorName = row.operatorName
+        this.detailData.responsiblePerson = row.responsiblePerson
+        this.detailData.responsiblePersonName = row.responsiblePersonName
+        this.detailData.state = row.state
+        this.detailData.spec = row.spec
+        if (row.state === '待检验') {
+          this.detailData.passQty = row.samplingQty
+        } else {
+          this.detailData.passQty = row.passQty
+          this.detailData.notPassQty = row.notPassQty
+        }
+        this.getInspectionFormData()
+        // this.acquisitionList = []
+        this.detailInformationFlag = true
+      },
+
+      // 检验单明细
+      getInspectionFormData () {
+        fqasDetailSearch(this.detailData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.detailList = data.rows
+          } else {
+            this.detailList = []
+          }
+        })
+      },
+
+      // 子明细记录信息查询
+      subDetailModal (row) {
+        this.subDetailData = row
+        this.pageIndex2 = 1
+        selectFQASSubDetailedRecord(this.subDetailData).then(({data}) => {
+          this.tableData = data.rows
+        })
+        this.batchAddData = {
+          samplingLocation: '',
+          samplingLocationB: '',
+          samplingNumber: ''
+        }
+        this.subDetailFlag = true
+      },
+
+      // 删除检验记录
+      deleteModal () {
+        if (this.FQASSelections.length === 0) {
+          this.$message.warning('请勾选要删除的检验单！')
+          return
+        }
+        this.$confirm(`是否删除该 `+ this.FQASSelections.length +` 条检验记录?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: '',
+            submitList: this.FQASSelections
+          }
+          fqasRecordDelete(tempData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.FQASSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      // 任务重载
+      overLoadModal () {
+        if (this.FQASSelections.length === 0) {
+          this.$message.warning('请勾选要重载的检验单！')
+          return
+        }
+        if (this.FQASSelections.every(val => val.state === '待检验' || val.state === '未开始')) {
+          this.$confirm(`是否重载该 `+ this.FQASSelections.length +` 条检验单?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let tempData = {
+              site: '',
+              submitList: this.FQASSelections
+            }
+            this.overLoading = true
+            fqasRecordOverLoad(tempData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.getDataList()
+                this.FQASSelections = []
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+                this.overLoading = false
+              } else {
+                this.overLoading = false
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            }).catch(() => {
+              this.overLoading = false
+            })
+          })
+        } else {
+          this.$message.warning('检验单必须为待检验状态！')
+          return
+        }
+
+      },
+
+      // 审核按钮
+      submitResult () {
+        let tempData1 = '' // 记录不是待审核状态的单号
+        let tempData2 = '' // 记录处置措施未填写的单号
+        if (this.FQASSelections.length === 0) {
+          this.$message.warning('请勾选要审核的检验单！')
+          return
+        }
+        for (let i = 0; i < this.FQASSelections.length; i++) {
+          if (this.FQASSelections[i].state !== '待审核'){
+            tempData1 = tempData1 + this.FQASSelections[i].inspectionNo + '、'
+          }
+          if (this.FQASSelections[i].inspectionResult === '不合格' && (this.FQASSelections[i].disposalMeasures === '' || this.FQASSelections[i].disposalMeasures == null)) {
+            tempData2 = tempData2 + this.FQASSelections[i].inspectionNo + '、'
+          }
+        }
+        if (tempData1 !== '') {
+          tempData1 = tempData1.substring(0, tempData1.length - 1)
+          this.$message.warning('检验单号 ' + tempData1 + ' 不是待审核状态！')
+          return
+        }
+        if (tempData2 !== '') {
+          tempData2 = tempData2.substring(0, tempData2.length - 1)
+          this.$message.warning('检验单号 ' + tempData2 + ' 的处置措施未选择！')
+          return
+        }
+        this.$confirm(`已确认单据信息无误，确定审核该 ` + this.FQASSelections.length + ` 条记录`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.submitData.submitList = this.FQASSelections
+          saveFQASSubmitResult(this.submitData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.FQASSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      cancelSubmitResult () {
+        let tempData1 = ''
+        if (this.FQASSelections.length === 0) {
+          this.$message.warning('请勾选要取消审核的检验单！')
+          return
+        }
+        for (let i = 0; i < this.FQASSelections.length; i++) {
+          if (this.FQASSelections[i].state !== '已完成') {
+            tempData1 = tempData1 + this.FQASSelections[i].inspectionNo + '、'
+          }
+        }
+        if (tempData1 !== '') {
+          tempData1 = tempData1.substring(0, tempData1.length - 1)
+          this.$message.warning('检验单号 ' + tempData1 + ' 不是已完成状态，无法取消审核！')
+          return
+        }
+        this.$confirm(`确定取消审核该 ` + this.FQASSelections.length + ` 条记录？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const payload = {
+            submitList: this.FQASSelections,
+            updateBy: this.$store.state.user.name
+          }
+          cancelFQASSubmitResult(payload).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.FQASSelections = []
+              this.$message({
+                message: '取消审核成功',
+                type: 'success',
+                duration: 1500
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {})
+      },
+
+      // 子明细每页数
+      sizeChangeHandle2 (val) {
+        this.pageSize2 = val
+      },
+
+      // 子明细当前页
+      currentChangeHandle2 (val) {
+        this.pageIndex2 = val
+      },
+
+      // 子明细方法
+      // 表格的新增
+      rowClassName ({ row, rowIndex }) {
+        row.xh = rowIndex + 1
+        row.rowI = this.tableData.indexOf(row) + 1
+      },
+
+      // 单选框选中数据
+      handleDetailSelectionChange(selection) {
+        this.checkedDetail = selection
+      },
+
+      // 点击新增更多
+      handleAddBtn (td) {
+        checkFQASIsSubmit(td).then(({data}) => {
+          if (data.flag !== 1) {
+            let obj = {
+              subDetailValue: '',
+              samplingLocation: '',
+              samplingLocationB: '',
+              subDetailValueB: '',
+              subDetailValueC: '',
+              subDetailValueD: '',
+              subDetailValueE: '',
+            }
+            this.tableData.push(obj)
+          } else {
+            this.$message.error('记录已提交')
+          }
+        })
+      },
+
+      // 批量新增操作
+      batchHandleAdd (td) {
+        checkFQASIsSubmit(td).then(({data}) => {
+          if (data.flag !== 1) {
+            this.batchHandleAddModalFlag = true
+          } else {
+            this.$alert("记录已提交！", '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 批量新增行
+      batchHandleAddModal () {
+        for (let i = 0; i < this.batchAddData.samplingNumber; i++) {
+          let obj = {
+            samplingLocation: this.batchAddData.samplingLocation,
+            samplingLocationB: this.batchAddData.samplingLocationB,
+            subDetailValue: '',
+            subDetailValueB: '',
+            subDetailValueC: '',
+            subDetailValueD: '',
+            subDetailValueE: '',
+          }
+          this.tableData.push(obj)
+        }
+        this.batchHandleAddModalFlag = false
+      },
+
+      // 回车事件
+      nextFocus1 (index) {
+        let a1 = `${index + 1}` + `a`
+        this.$nextTick(() => {
+          this.$refs[a1].focus()
+        })
+      },
+      nextFocus2 (index) {
+        let a2 = `${index + 1}` + `b`
+        this.$nextTick(() => {
+          this.$refs[a2].focus()
+        })
+      },
+      nextFocus3 (index) {
+        let a3 = `${index + 1}` + `c`
+        this.$nextTick(() => {
+          this.$refs[a3].focus()
+        })
+      },
+      nextFocus4 (index) {
+        let a = `${index + 1}` + `d`
+        this.$nextTick(() => {
+          this.$refs[a].focus()
+        })
+      },
+      nextFocus5 (index) {
+        let a = `${index + 1}` + `e`
+        this.$nextTick(() => {
+          this.$refs[a].focus()
+        })
+      },
+      nextFocus6 (index) {
+        let a = `${index + 1}` + `f`
+        this.$nextTick(() => {
+          this.$refs[a].focus()
+        })
+      },
+      nextFocus7 (index) {
+        let a = `${index + 1}` + `g`
+        this.$nextTick(() => {
+          this.$refs[a].focus()
+        })
+      },
+
+      focusNextInput (index, type) {
+        let aaa = ''
+        if (this.detailList.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
+
+      //删除
+      handleDeleteBtn (td) {
+        checkFQASIsSubmit(td).then(({data}) => {
+          if (data.flag !== 1) {
+            if (this.checkedDetail.length === 0) {
+              this.$alert("请先选择要删除的数据", "提示", {
+                confirmButtonText: "确定",
+              })
+            } else {
+              this.$confirm("请是否确认删除该子明细记录?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                callback: (action) => {
+                  if (action === "confirm") {
+                    let val = this.checkedDetail
+                    val.forEach((val, index) => {
+                      this.tableData.splice(this.tableData.indexOf(val), 1)
+                      if (this.templateTableData.length === 0) {
+                        this.pageIndex2--
+                      }
+                    })
+                    this.$message({
+                      message: "删除成功！",
+                      type: "success",
+                    })
+                    return
+                  } else {
+                    this.$message({
+                      message: "已取消删除操作",
+                      type: "warning",
+                    })
+                    return
+                  }
+                },
+              })
+            }
+          } else {
+            this.$alert("记录已提交！", '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 新增子明细记录
+      saveSubDetailResult () {
+        for (let i = 0; i < this.tableData.length; i++) {
+          if(this.tableData[i].subDetailValue === '' || this.tableData[i].subDetailValue == null){
+            this.$message.warning('序号' + (i+1) +'未填写实测值！')
+            return
+          }
+        }
+        this.subDetailData.subDetailValues = this.tableData
+        saveFQASSubDetailed(this.subDetailData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.count > 0) {
+              this.subDetailData.itemResult = 'N'
+              this.subDetailData.unqualifiedQuantity = data.count
+            }
+            if (this.subDetailData.subDetailValues.length > 0) {
+              this.subDetailData.subDetailRecordNum = 1
+            } else {
+              this.subDetailData.subDetailRecordNum = -1
+              this.subDetailData.unqualifiedQuantity = 0
+              this.subDetailData.itemResult = 'Y'
+            }
+            this.subDetailFlag = false
+            this.tableData = []
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 更改检验方式
+      changeInspectionModal (row) {
+        this.changeData = {
+          site: row.site,
+          buNo: row.buNo,
+          inspectionNo: row.inspectionNo,
+          rollCount: row.rollCount,
+          inspectCode: '',
+          qtySample: '',
+          percentSample: '',
+          samplingProgrammeNo: '',
+          samplingProgrammeDesc: '',
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
+          receiptNo: row.receiptNo,
+          receiptItemNo: row.receiptItemNo,
+          inspectionTypeNo: '108'
+        }
+        this.changeModalFlag = true
+      },
+
+      // 保存修改
+      changeInspectionWay () {
+        if (this.changeData.inspectCode === '' || this.changeData.inspectCode == null) {
+          this.$message.warning('请选择检验方式！')
+          return
+        }
+        if (this.changeData.inspectCode === '数量抽检' && (this.changeData.qtySample == null || this.changeData.qtySample === '' || this.changeData.qtySample === 0)) {
+          this.$message.warning('请填写抽检数量！')
+          return
+        }
+        if (this.changeData.inspectCode === '比例抽检' && (this.changeData.percentSample == null || this.changeData.percentSample === '' || this.changeData.percentSample === 0)) {
+          this.$message.warning('请填写抽检比例！')
+          return
+        }
+        if (this.changeData.inspectCode === '不固定抽检' && (this.changeData.samplingProgrammeNo == null || this.changeData.samplingProgrammeNo === '')) {
+          this.$message.warning('请选择抽样方案！')
+          return
+        }
+        if (this.changeData.inspectCode === '不固定抽检' && (this.changeData.samplingLevelNo === null || this.changeData.samplingLevelNo === '')) {
+          this.$message.warning('请选择检验水平！')
+          return
+        }
+        if (this.changeData.inspectCode === '数量抽检' && this.changeData.qtySample > this.changeData.rollCount) {
+          this.$message.warning('抽检数量不能大于送检数量，当前检验单送检数量为[]！')
+          return
+        }
+        changeInspectionWay(this.changeData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.changeModalFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 校验用户是否收藏
+      favoriteIsOk () {
+        let userFavorite = {
+          userId: this.$store.state.user.id,
+          languageCode: this.$i18n.locale
+        }
+        userFavoriteList(userFavorite).then(({data}) => {
+          for (let i = 0; i < data.list.length; i++) {
+            if (this.$route.meta.menuId === data.list[i].menuId) {
+              this.favorite = true
+            }
+          }
+        })
+      },
+
+      // 收藏 OR 取消收藏
+      favoriteFunction () {
+        let userFavorite = {
+          userId: this.$store.state.user.id,
+          functionId: this.$route.meta.menuId,
+        }
+        if (this.favorite) {
+          removeUserFavorite(userFavorite).then(({data}) => {
+            this.$message.success(data.msg)
+            this.favorite = false
+          })
+        } else {
+          // 收藏
+          saveUserFavorite(userFavorite).then(({data}) => {
+            this.$message.success(data.msg)
+            this.favorite = true
+          })
+        }
+      },
+
+      // 动态列开始 获取 用户保存的 格式列
+      async getTableUserColumn (tableId, columnId) {
+        let queryTableUser = {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          status: true,
+          languageCode: this.$i18n.locale
+        }
+        await getTableUserListLanguage(queryTableUser).then(({data}) => {
+          if (data.rows.length > 0) {
+            //this.columnList1 = []
+            switch (columnId) {
+              case 1:
+                this.columnList1 = data.rows
+                break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
+            }
+          } else {
+            this.getColumnList(tableId, columnId)
+          }
+        })
+      },
+
+      // 获取 tableDefault 列
+      async getColumnList (tableId, columnId) {
+        let queryTable = {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
+        }
+        await getTableDefaultListLanguage(queryTable).then(({data}) => {
+          if (!data.rows.length == 0) {
+            switch (columnId) {
+              case 1:
+                this.columnList1 = data.rows
+                break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
+            }
+          }
+        })
+      },
+
+      /**
+       * 明细导入后将返回值回传给父组件
+       * @param val
+       */
+      changeMyString (val) {
+        for (let i = 0; i < this.detailList.length; i++) {
+          if (val[this.detailList[i].itemNo] !== undefined) {
+            this.detailList[i].unqualifiedQuantity = val[this.detailList[i].itemNo]
+            if (val[this.detailList[i].itemNo] != null) {
+              this.detailList[i].subDetailRecordNum = 1
+            }
+            if (val[this.detailList[i].itemNo] > 0) {
+              this.detailList[i].itemResult = 'N'
+            }
+          }
+        }
+      },
+
+      //获取按钮的权限数据
+      getButtonAuthData () {
+        let searchFlag = this.isAuth(this.menuId+":search")
+        let checkFlag = this.isAuth(this.menuId+":check")
+        let cancelCheckFlag = this.isAuth(this.menuId+":cancelCheck")
+        let overLoadFlag = this.isAuth(this.menuId+":overLoad")
+        let deleteFlag = this.isAuth(this.menuId+":delete")
+        let detailFlag = this.isAuth(this.menuId+":detail")
+        let fileFlag = this.isAuth(this.menuId+":file")
+        let changeFlag = this.isAuth(this.menuId+":change")
+        //处理页面的权限数据
+        this.authSearch = !searchFlag
+        this.authCheck = !checkFlag
+        this.authCancelCheck = !cancelCheckFlag
+        this.authOverLoad = !overLoadFlag
+        this.authDelete = !deleteFlag
+        this.authDetail = !detailFlag
+        this.authFile = !fileFlag
+        this.authChange = !changeFlag
+      },
+
+      // ======================== OQC检验项目操作相关方法 ========================
+      openItemOperationDialog() {
+        this.itemOperationQuery = { itemNo: '', itemDesc: '' }
+        this.searchOQCItems()
+        this.itemOperationDialogFlag = true
+      },
+      async searchOQCItems() {
+        try {
+          const params = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: this.itemOperationQuery.itemNo || '',
+            itemDesc: this.itemOperationQuery.itemDesc || ''
+          }
+          const { data } = await getOQCItemList(params)
+          if (data && data.code === 0) {
+            this.availableItemList = data.row1 || []
+            this.selectedItemList = data.row2 || []
+          }
+        } catch (error) {
+          this.$message.error('查询检验项目失败')
+        }
+      },
+      availableItemClickRow(row) {
+        this.$refs.availableItemTable.toggleRowSelection(row)
+      },
+      availableItemSelectionChange(selection) {
+        this.availableItemSelections = selection
+      },
+      selectedItemClickRow(row) {
+        this.$refs.selectedItemTable.toggleRowSelection(row)
+      },
+      selectedItemSelectionChange(selection) {
+        this.selectedItemSelections = selection
+      },
+      async addInspectionItems() {
+        if (!this.availableItemSelections || this.availableItemSelections.length === 0) {
+          this.$message.warning('请选择要添加的项目')
+          return
+        }
+        this.$confirm('确认添加选中的检验项目吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          try {
+            const params = {
+              site: this.detailData.site,
+              buNo: this.detailData.buNo,
+              inspectionNo: this.detailData.inspectionNo,
+              itemList: this.availableItemSelections.map(item => ({ itemNo: item.itemNo }))
+            }
+            const { data } = await addOQCItemDetails(params)
+            if (data && data.code === 0) {
+              this.$message.success('添加成功')
+              this.searchOQCItems()
+            } else {
+              this.$message.error(data.msg || '添加失败')
+            }
+          } catch (error) {
+            this.$message.error('添加失败，请检查')
+          }
+        }).catch(() => {
+          this.$message.info('已取消添加')
+        })
+      },
+      async deleteInspectionItems() {
+        if (!this.selectedItemSelections || this.selectedItemSelections.length === 0) {
+          this.$message.warning('请选择要移除的项目')
+          return
+        }
+        this.$confirm('确认移除选中的检验项目吗？（将同时删除该项目的子明细数据）', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          try {
+            const params = {
+              site: this.detailData.site,
+              buNo: this.detailData.buNo,
+              inspectionNo: this.detailData.inspectionNo,
+              itemList: this.selectedItemSelections.map(item => ({ itemNo: item.itemNo }))
+            }
+            const { data } = await deleteOQCItemDetails(params)
+            if (data && data.code === 0) {
+              this.$message.success('移除成功')
+              this.searchOQCItems()
+            } else {
+              this.$message.error(data.msg || '移除失败')
+            }
+          } catch (error) {
+            this.$message.error('移除失败，请检查')
+          }
+        }).catch(() => {
+          this.$message.info('已取消移除')
+        })
+      },
+      refreshInspectionDetailList() {
+        if (this.detailInformationFlag) {
+          this.getInspectionFormData()
+        }
+      },
+
+      // ======================== OQC模板导入相关方法 ========================
+      openTemplateImportDialog() {
+        this.templateQuery = { templateId: '', templateDesc: '' }
+        this.searchOQCTemplates()
+        this.templateImportDialogFlag = true
+      },
+      async searchOQCTemplates() {
+        try {
+          const params = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            templateId: this.templateQuery.templateId || '',
+            templateDesc: this.templateQuery.templateDesc || ''
+          }
+          const { data } = await getOQCTemplateList(params)
+          if (data && data.code === 0) {
+            this.templateList = data.rows || []
+          }
+        } catch (error) {
+          this.$message.error('查询模板失败')
+        }
+      },
+      templateClickRow(row) {
+        this.$refs.templateTable.toggleRowSelection(row)
+      },
+      templateSelectionChange(selection) {
+        this.templateSelections = selection
+      },
+      confirmImportTemplate() {
+        if (!this.templateSelections || this.templateSelections.length === 0) {
+          this.$message.warning('请选择要导入的模板')
+          return
+        }
+        this.$confirm(`确认导入选中的 ${this.templateSelections.length} 个模板吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          this.importLoading = true
+          try {
+            const params = {
+              site: this.detailData.site,
+              buNo: this.detailData.buNo,
+              inspectionNo: this.detailData.inspectionNo,
+              templateList: this.templateSelections.map(item => ({ templateId: item.templateId }))
+            }
+            const { data } = await importOQCTemplateItems(params)
+            if (data && data.code === 0) {
+              this.$message.success(`导入成功，共导入 ${data.importCount || 0} 个检验项目`)
+              this.templateImportDialogFlag = false
+              this.templateSelections = []
+              this.getInspectionFormData()
+            } else {
+              this.$message.error(data.msg || '导入失败')
+            }
+          } catch (error) {
+            this.$message.error('导入失败，请检查')
+          } finally {
+            this.importLoading = false
+          }
+        }).catch(() => {
+          this.$message.info('已取消导入')
+        })
+      },
+      resetItemQuery() {
+        this.itemOperationQuery = { itemNo: '', itemDesc: '' }
+        this.searchOQCItems()
+      },
+      resetTemplateQuery() {
+        this.templateQuery = { templateId: '', templateDesc: '' }
+        this.searchOQCTemplates()
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.file-dialog-title {
+  display: inline-flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.file-dialog-link {
+  color: #17b3a3;
+  text-decoration: underline;
+  font-size: 13px;
+  cursor: pointer;
+}
+
+.file-dialog-link:visited,
+.file-dialog-link:active,
+.file-dialog-link:hover {
+  color: #17b3a3;
+}
+
+.search-container {
+  margin-bottom: 12px;
+}
+
+.search-container /deep/ .el-form-item {
+  margin-bottom: 0;
+}
+
+.item-operation-content {
+  display: flex;
+  gap: 16px;
+  align-items: stretch;
+}
+
+.item-panel {
+  flex: 1;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.available-panel {
+  flex: 1.5;
+}
+
+.selected-panel {
+  flex: 1;
+}
+
+.operation-buttons {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 16px;
+  padding: 0 8px;
+}
+
+.panel-header {
+  padding: 8px 12px;
+  background: #f5f7fa;
+  border-bottom: 1px solid #ebeef5;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.panel-header i {
+  font-size: 16px;
+  color: #606266;
+}
+
+.panel-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.item-count {
+  margin-left: auto;
+  font-size: 12px;
+  color: #909399;
+}
+
+.template-list-container {
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+@media (max-width: 1200px) {
+  .item-operation-content {
+    flex-direction: column;
+  }
+  .operation-buttons {
+    flex-direction: row;
+    justify-content: center;
+  }
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 12px;
+  padding-top: 12px;
+}
+
+/deep/ .redElSelect .el-input--suffix .el-input__inner{
+  color: red;
+  font-weight: bold;
+}
+/deep/ .greenElSelect .el-input--suffix .el-input__inner{
+  color: rgb(103,194,58);
+  font-weight: bold;
+}
+.numInput /deep/ .el-input__inner{
+  text-align: right;
+}
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue
index 20642d1..298662e 100644
--- a/src/views/modules/qc/PQCResultEntry.vue
+++ b/src/views/modules/qc/PQCResultEntry.vue
@@ -625,8 +625,8 @@
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
diff --git a/src/views/modules/qc/SQCResultEntry.vue b/src/views/modules/qc/SQCResultEntry.vue
index 1837ce2..fd24a69 100644
--- a/src/views/modules/qc/SQCResultEntry.vue
+++ b/src/views/modules/qc/SQCResultEntry.vue
@@ -148,7 +148,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">
+            <template v-if="item.columnProp === 'pictureFlag'">
+              <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+            </template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -311,7 +316,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -379,9 +389,9 @@
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button> 
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
       </el-footer>
     </el-dialog>
 
@@ -506,7 +516,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -534,7 +549,12 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <template v-if="item.columnProp === 'pictureFlag'">
+                  <span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
+                </template>
+                <template v-else>{{ scope.row[item.columnProp] }}</template>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -1410,6 +1430,24 @@
             fixed: '',
             columnWidth: 120
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'pictureFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片是否必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+        },
           {
             userId: this.$store.state.user.name,
             functionId: 301015,
@@ -1824,6 +1862,13 @@
             this.detailData.disposalMeasures = ''
             this.detailData.disposalRemark = ''
           }
+          const picRequiredRow = this.detailList.find(
+            item => item.pictureFlag === 'Y' && !(Number(item.imageDetailNum) > 0)
+          )
+          if (picRequiredRow) {
+            this.$message.warning(`项目编码：${picRequiredRow.itemNo || ''}图片必填，请检查！`)
+            return
+          }
         }
         if (this.detailData.passQty > this.detailData.rollQty) {
           this.$message.warning('合格数量不能大于送检数量！')
@@ -1831,7 +1876,8 @@
         }
         this.saveDetailInformation(type)
       },
-      saveDetailInformation (type) {
+      saveDetailInformation (type, options = {}) {
+        const keepDetailOpen = options.keepDetailOpen === true
         this.saveInformationData.site = this.detailData.site
         this.saveInformationData.buNo = this.detailData.buNo
         this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -1856,8 +1902,18 @@
         saveSQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.detailInformationFlag = false
-            this.$message.success('操作成功')
+            if (keepDetailOpen) {
+              this.getInspectionFormData()
+              if (!options.skipSuccessMessage) {
+                this.$message.success('操作成功')
+              }
+            } else {
+              this.detailInformationFlag = false
+              this.$message.success('操作成功')
+            }
+            if (typeof options.afterSuccess === 'function') {
+              options.afterSuccess()
+            }
           } else {
             this.$message.warning((data && data.msg) || '操作失败')
           }
@@ -2162,16 +2218,31 @@
         }
       },
       uploadImageModal (row) {
-        let currentData = {
-          site: this.detailData.site,
-          buNo: this.detailData.buNo,
-          createBy: this.$store.state.user.name,
-          inspectionNo: this.detailData.inspectionNo,
-          itemNo: row.itemNo,
-          folder: 'SQCItemImageFile'
+        const openImage = () => {
+          let currentData = {
+            site: this.detailData.site,
+            buNo: this.detailData.buNo,
+            createBy: this.$store.state.user.name,
+            inspectionNo: this.detailData.inspectionNo,
+            itemNo: row.itemNo,
+            folder: 'SQCItemImageFile'
+          }
+          this.$nextTick(() => {
+            this.$refs.comQcItemImageUploadFile.init(currentData)
+          })
         }
-        this.$nextTick(() => {
-          this.$refs.comQcItemImageUploadFile.init(currentData)
+        if (this.detailData.state !== '待检验') {
+          openImage()
+          return
+        }
+        if (this.detailData.passQty > this.detailData.rollQty) {
+          this.$message.warning('合格数量不能大于送检数量！')
+          return
+        }
+        this.saveDetailInformation('1', {
+          keepDetailOpen: true,
+          skipSuccessMessage: true,
+          afterSuccess: openImage
         })
       },
       inspectorSearch () {
diff --git a/src/views/modules/qc/com_qc_itemImage_upload_file.vue b/src/views/modules/qc/com_qc_itemImage_upload_file.vue
index ff8452b..7abdc79 100644
--- a/src/views/modules/qc/com_qc_itemImage_upload_file.vue
+++ b/src/views/modules/qc/com_qc_itemImage_upload_file.vue
@@ -155,7 +155,7 @@ export default {
       // 清空文件上传记录
       this.$refs.uploadFile.clearFiles()
       // 刷新报工的页面
-      //this.$emit('refreshPageTables2')
+      this.$emit('refreshPageTables2')
       // 关闭当前的页面
       this.visible = false
     },
diff --git a/src/views/modules/qc/patrol_config_upload.vue b/src/views/modules/qc/patrol_config_upload.vue
new file mode 100644
index 0000000..43cde2b
--- /dev/null
+++ b/src/views/modules/qc/patrol_config_upload.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="customer-css">
+    <el-dialog title="巡检配置导入" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 520px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" label-width="80px">
+        <el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
+        <el-row>
+          <el-col :span="24">
+            <el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile" :limit="1" accept=".xlsx,.xls"
+                       :before-upload="beforeUploadHandle" :on-change="onChange" :auto-upload="false" style="text-align: left;">
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+            </el-upload>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveUploadFile()">保存</el-button>
+        <el-button type="primary" @click="closeDialog">关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  patrolConfigUpload,
+  queryFileId
+} from '@/api/qc/qc.js'
+import { downLoadObjectFile } from '@/api/eam/eam_object_list.js'
+
+export default {
+  data () {
+    return {
+      visible: false,
+      fileList: [],
+      pageData: {
+        site: '',
+        buNo: '',
+        partNo: ''
+      }
+    }
+  },
+  methods: {
+    init (currentRow) {
+      this.pageData = JSON.parse(JSON.stringify(currentRow))
+      this.visible = true
+    },
+    beforeUploadHandle (file) {
+      let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
+      if (!(extName === '.xlsx' || extName === '.xls')) {
+        this.$message.error('数据导入失败，请选择正确的xlsx模板文件')
+        return false
+      }
+    },
+    onChange (file) {
+      this.fileList.push(file)
+    },
+    closeDialog () {
+      this.fileList = []
+      this.visible = false
+    },
+    saveUploadFile () {
+      if (this.fileList == null || this.fileList.length === 0) {
+        this.$message.error('请先上传文件!')
+        return false
+      }
+      const formData = new FormData()
+      formData.append('file', this.fileList[0].raw)
+      formData.append('site', this.pageData.site)
+      formData.append('buNo', this.pageData.buNo)
+      formData.append('partNo', this.pageData.partNo)
+      patrolConfigUpload(formData).then(({ data }) => {
+        if (data.code === 0) {
+          this.$message.success(data.msg)
+          this.$refs.uploadFile.clearFiles()
+          this.fileList = []
+          this.visible = false
+          this.$emit('refreshPatrolConfig')
+        } else {
+          let message = (data.msg || '').split(';')
+          this.$alert(message[0] + '<br/>' + (message[1] || ''), '导入失败', {
+            confirmButtonText: '确定',
+            dangerouslyUseHTMLString: true
+          })
+        }
+      }).catch(() => {
+        this.$message.error('导入失败，请检查文件格式和内容')
+      })
+    },
+    async downloadFile () {
+      let file = {
+        id: 0,
+        fileName: ''
+      }
+      let tempData = {
+        orderRef1: 'qc',
+        orderRef2: 'patrolConfigUpload'
+      }
+      await queryFileId(tempData).then(({ data }) => {
+        if (data && data.code === 0) {
+          file.id = data.data.id
+          file.fileName = data.data.fileName
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+      await downLoadObjectFile(file).then(({ data }) => {
+        const blob = new Blob([data], { type: 'application/octet-stream' })
+        const fileName = file.fileName
+        const linkNode = document.createElement('a')
+        linkNode.download = fileName
+        linkNode.style.display = 'none'
+        linkNode.href = URL.createObjectURL(blob)
+        document.body.appendChild(linkNode)
+        linkNode.click()
+        URL.revokeObjectURL(linkNode.href)
+        document.body.removeChild(linkNode)
+      })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue
index c6edaf8..3d90d5d 100644
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -194,9 +194,9 @@
         <el-form-item label="抽样比例%">
           <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
         </el-form-item>
-<!--        <el-form-item label=" " style="margin-left: 30px">-->
-<!--          <el-checkbox v-model="modalData.collectionFlag" true-label="Y">采集标记</el-checkbox>-->
-<!--        </el-form-item>-->
+        <el-form-item label=" " style="margin-left: 30px">
+          <el-checkbox v-model="modalData.pictureFlag" true-label="Y">需上传图片</el-checkbox>
+        </el-form-item>
       </el-form>
 <!--      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
 <!--        <el-form-item label="采集数据来源">-->
@@ -1272,6 +1272,7 @@
           samplingLevelNo: '',
           samplingLevelDesc: '',
           defaultSamplingProportion: '',
+          pictureFlag:'N',
           collectionFlag: '',
           collectionSource: '',
           collectionSourceList: [],
@@ -1313,6 +1314,7 @@
           samplingLevelNo: row.samplingLevelNo,
           samplingLevelDesc: row.samplingLevelDesc,
           defaultSamplingProportion: row.defaultSamplingProportion,
+          pictureFlag: row.pictureFlag,
           collectionFlag: row.collectionFlag,
           collectionSource: row.collectionSource,
           collectionSourceList: row.collectionSource == null || row.collectionSource === '' ? [] : row.collectionSource.split(','),
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index e88d662..493f5ed 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -83,14 +83,26 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="240"
+        width="160"
         label="操作">
         <template slot-scope="scope">
-          <a v-if="!authDetail" type="text" size="small" @click="detailModal(scope.row)">检验模板</a>
           <a v-if="!authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
-          <a v-if="!authCheckout" type="text" size="small" @click="standardDetailModal(scope.row)">检验标准</a>
-          <a v-if="!authDelete" type="text" size="small" @click="deletePropertiesModel(scope.row)">删除</a>
-          <a v-if="!authFile" type="text" size="small" @click="sopFileList(scope.row)">SOP文件</a>
+          <a v-if="!authDetail" type="text" size="small" @click="detailModal(scope.row)">检验模板</a>
+          <el-dropdown
+            v-if="!authCheckout || !authDelete || !authFile"
+            trigger="click"
+            :show-timeout="0"
+            placement="bottom-end">
+            <span class="qc-more-dropdown-trigger" @click.stop>
+              更多<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-if="!authCheckout" @click.native="standardDetailModal(scope.row)">检验标准</el-dropdown-item>          
+              <el-dropdown-item v-if="!authFile" @click.native="sopFileList(scope.row)">文件清单</el-dropdown-item>
+              <el-dropdown-item @click.native="patrolInspection(scope.row)">巡检配置</el-dropdown-item>
+              <el-dropdown-item v-if="!authDelete" @click.native="deletePropertiesModel(scope.row)">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -124,20 +136,21 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
         <el-form-item label="工厂编码:" prop="partDesc" :rules="rules.site">
-          <el-input v-model="modalData.site" disabled style="width: 250px"></el-input>
+          <el-input v-model="modalData.site" disabled style="width: 184px"></el-input>
         </el-form-item>
-        <el-form-item style="margin-top: 23px;margin-left: 2px">
+        <el-form-item prop="partNo" :rules="rules.partNoType">
+            <span v-if="modalDisableFlag === false" slot="label" @click="searchPartInfo()"><a herf="#">物料编码:</a></span>
+            <span v-if="modalDisableFlag === true" slot="label">物料编码:</span>
+            <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 184px"></el-input>
+          </el-form-item>
+        <!-- <el-form-item style="margin-top: 23px;margin-left: 2px">
           <el-checkbox v-model="modalData.exemptInspection" true-label="Y" false-label="N">是否免检</el-checkbox><br>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="partNo" :rules="rules.partNoType">
-          <span v-if="modalDisableFlag === false" slot="label" @click="searchPartInfo()"><a herf="#">物料编码:</a></span>
-          <span v-if="modalDisableFlag === true" slot="label">物料编码:</span>
-          <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
-        </el-form-item>
+        
         <el-form-item label="物料名称:" prop="partDesc" :rules="rules.partDescType">
-          <el-input v-model="modalData.partDesc" disabled style="width: 250px"></el-input>
+          <el-input v-model="modalData.partDesc" disabled style="width: 380px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
@@ -167,20 +180,20 @@
             <el-col :span="6">
               <el-checkbox v-model="modalData.iqcExempt" true-label="Y" false-label="N">IQC检验</el-checkbox>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-checkbox v-model="modalData.faiExempt" true-label="Y" false-label="N">FAI检验</el-checkbox>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-checkbox v-model="modalData.ipqcExempt" true-label="Y" false-label="N">IPQC检验</el-checkbox>
             </el-col>
             <el-col :span="6">
-              <el-checkbox v-model="modalData.pqcExempt" true-label="Y" false-label="N">PQC检验</el-checkbox>
+              <el-checkbox v-model="modalData.oqcExempt" true-label="Y" false-label="N">OQC检验</el-checkbox>
             </el-col>
-            </el-row>
-            <el-row :gutter="12">
-              <el-col :span="6">
+            <el-col :span="6">
                 <el-checkbox v-model="modalData.fqcExempt" true-label="Y" false-label="N">FQC检验</el-checkbox>
               </el-col>
+            </el-row>
+            <el-row :gutter="12">     
               <el-col :span="6">
                 <el-checkbox v-model="modalData.sqcExempt" true-label="Y" false-label="N">SQC检验</el-checkbox>
               </el-col>
@@ -359,7 +372,12 @@
       </el-footer>
     </el-dialog>
 
-    <!-- 检验模板->快速新增 -->
+    <!-- 检验模板->快速新增（原实现已注释，现与 boying-vue 一致） -->
+    <!--
+    <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1100px">
+      ... 原「可选模板 | 添加>> 删除<< | 已有模板」三栏布局与单工序/单机台逻辑已废弃 ...
+    </el-dialog>
+    -->
     <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1100px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="detailData">
@@ -370,135 +388,125 @@
             <el-input v-model="detailData.templateName" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item label="检验类型">
-            <el-select v-model="detailData.inspectionTypeNo" @change="checkInspectionType()" placeholder="请选择">
+            <el-select v-model="detailData.inspectionTypeNo" @change="checkInspectionType" placeholder="请选择">
               <el-option
-                v-for = "i in options"
-                :key = "i.inspectionTypeNo"
-                :label = "i.inspectionTypeName"
-                :value = "i.inspectionTypeNo">
+                v-for="i in options"
+                :key="i.inspectionTypeNo"
+                :label="i.inspectionTypeName"
+                :value="i.inspectionTypeNo">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="checkInspectionType()">查询</el-button>
+            <el-button type="primary" @click="checkInspectionType2">查询</el-button>
           </el-form-item>
-          <el-form-item style="margin-left: 117px" :label="' '">
-            <el-button type="primary" @click="getOperationList()" style="width: 63px" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107' || this.detailData.inspectionTypeNo === '108'">工序</el-button>
-            <el-button type="primary" @click="getManufacturerList()" v-if="this.detailData.inspectionTypeNo === '105'" style="width: 63px">供应商</el-button>
+          <el-form-item :label="' '" style="margin-left: 63px">
+            <el-button type="primary" @click="getOperationList" v-if="detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '102' || detailData.inspectionTypeNo === '103' || detailData.inspectionTypeNo === '104' || detailData.inspectionTypeNo === '106' || detailData.inspectionTypeNo === '107'" style="width: 63px">工序</el-button>
+            <el-button type="primary" @click="getManufacturerList" v-if="detailData.inspectionTypeNo === '105'" style="width: 63px">供应商</el-button>
+            <el-button type="primary" @click="getCustomerList" v-if="detailData.inspectionTypeNo === '110'" style="width: 63px">客户</el-button>
           </el-form-item>
-          <el-form-item :label="' '">
-            <el-button type="primary" @click="getAllResourceList()" style="width: 63px" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107'">机台</el-button>
+          <el-form-item :label="' '" style="margin-left: 195px">
+            <el-button type="primary" @click="getAllResourceList" v-if="detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '102' || detailData.inspectionTypeNo === '103' || detailData.inspectionTypeNo === '104' || detailData.inspectionTypeNo === '106' || detailData.inspectionTypeNo === '107'" style="width: 63px">机台</el-button>
           </el-form-item>
         </el-form>
       </div>
-      <el-container style="margin-top: 0px;">
-        <el-main style="width: 470px;padding: 1px">
-          <span style="font-size: 12px" >可选模板：</span>
-          <el-table
-            height="400px"
-            :data="itemList1"
-            border
-            ref="itemTable1"
-            @row-click="itemClickRow1"
-            @selection-change="selectionItem1"
-            highlight-current-row
-            style="width: 100%">
-            <el-table-column
-              type="selection"
-              header-align="center"
-              align="center"
-              :selectable="selectFlag"
-              width="50">
-            </el-table-column>
-            <el-table-column
-              prop="templateId"
-              header-align="center"
-              align="center"
-              min-width="80"
-              label="模板编码">
-            </el-table-column>
-            <el-table-column
-              prop="templateName"
-              header-align="center"
-              align="center"
-              min-width="170"
-              label="模板名称">
-            </el-table-column>
-            <el-table-column
-              prop="inspectionTypeName"
-              header-align="center"
-              align="center"
-              min-width="80"
-              label="检验类型">
-            </el-table-column>
-          </el-table>
-        </el-main>
-        <el-main style="width: 100px;padding: 1px">
-          <div style="margin-top: 180px;margin-left: 18px">
-            <el-button type="primary" @click="addItem()">添加>></el-button>
-          </div>
-          <div style="margin-top: 15px;margin-left: 18px">
-            <el-button type="primary" @click="deleteItem()">删除<<</el-button>
+      <el-container>
+        <el-header style="width: 1080px;height: 200px;padding: 0 0 0 0">
+          <el-row :gutter="5">
+            <el-col :span="span1">
+              <span style="font-size: 12px">可选模板:</span>
+              <el-table
+                height="210px"
+                :data="itemList1"
+                v-loading="itemList1Loading"
+                border
+                ref="itemTable1"
+                @row-click="itemClickRow1"
+                @selection-change="selectionItem1"
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+                <el-table-column prop="templateId" header-align="center" align="center" min-width="80" label="模板编码"></el-table-column>
+                <el-table-column prop="templateName" header-align="left" align="left" min-width="200" label="模板名称"></el-table-column>
+                <el-table-column prop="inspectionTypeName" header-align="center" align="center" min-width="60" label="检验类型"></el-table-column>
+              </el-table>
+            </el-col>
+            <el-col v-if="detailData.inspectionTypeNo === '105' || detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '110' || detailData.inspectionTypeNo === '107'" :span="span2" style="margin-top: 25px">
+              <el-table
+                v-if="detailData.inspectionTypeNo === '105'"
+                height="210px"
+                :data="selectionManufacturer2"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column prop="manufacturerID" header-align="center" align="center" min-width="100" label="供应商编码"></el-table-column>
+                <el-table-column prop="manufacturerName" header-align="left" align="left" min-width="150" label="供应商名称"></el-table-column>
+              </el-table>
+              <el-table
+                v-else-if="detailData.inspectionTypeNo === '110'"
+                height="210px"
+                :data="selectionCustomer2"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column prop="customerID" header-align="center" align="center" min-width="100" label="客户编码"></el-table-column>
+                <el-table-column prop="customerName" header-align="left" align="left" min-width="150" label="客户名称"></el-table-column>
+              </el-table>
+              <el-table
+                v-else
+                height="210px"
+                :data="operationSelections"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column prop="operationDesc" header-align="center" align="center" label="工序"></el-table-column>
+              </el-table>
+            </el-col>
+            <el-col v-if="detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '107'" :span="span3" style="margin-top: 25px">
+              <el-table
+                height="210px"
+                :data="resourceSelections"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column prop="resourceId" header-align="center" align="center" min-width="100" label="机台编码"></el-table-column>
+                <el-table-column prop="resourceDesc" header-align="left" align="left" min-width="150" label="机台名称"></el-table-column>
+              </el-table>
+            </el-col>
+          </el-row>
+        </el-header>
+        <el-main style="width: 880px;height: 25px;margin-top: 50px;padding: 0 0 0 0;text-align:center">
+          <div>
+            <el-button type="primary" @click="addItem" :loading="addItemLoading">添加<i class="el-icon-caret-bottom el-icon--right" v-if="!addItemLoading"></i></el-button>
+            <el-button type="primary" @click="deleteItem" :loading="deleteItemLoading">删除<i class="el-icon-caret-top el-icon--right" v-if="!deleteItemLoading"></i></el-button>
           </div>
         </el-main>
-        <el-main style="width: 470px;padding: 1px">
-          <span style="font-size: 12px">已有模板：</span>
-          <el-table
-            height="400px"
-            :data="itemList2"
-            border
-            ref="itemTable2"
-            @row-click="itemClickRow2"
-            @selection-change="selectionItem2"
-            highlight-current-row
-            style="width: 100%">
-            <el-table-column
-              type="selection"
-              header-align="center"
-              align="center"
-              :selectable="selectFlag"
-              width="50">
-            </el-table-column>
-            <el-table-column
-              prop="templateId"
-              header-align="center"
-              align="center"
-              label="模板编码">
-            </el-table-column>
-            <el-table-column
-              prop="templateName"
-              header-align="center"
-              align="center"
-              label="模板名称">
-            </el-table-column>
-            <el-table-column
-              prop="operation"
-              header-align="center"
-              align="center"
-              label="工序">
-            </el-table-column>
-            <el-table-column
-              prop="resourceID"
-              header-align="center"
-              align="center"
-              label="机台">
-            </el-table-column>
-            <el-table-column
-              prop="manufacturerName"
-              header-align="center"
-              align="center"
-              label="供应商">
-            </el-table-column>
-            <el-table-column
-              prop="inspectionTypeName"
-              header-align="center"
-              align="center"
-              label="检验类型">
-            </el-table-column>
-          </el-table>
-        </el-main>
+        <el-footer style="width: 1080px;height: 222px;padding: 0 0 0 0;margin-top: -4px">
+          <span style="font-size: 12px">已有模板:</span>
+          <div class="rq">
+            <el-table
+              height="200px"
+              :data="itemList2"
+              v-loading="itemList2Loading"
+              border
+              ref="itemTable2"
+              @row-click="itemClickRow2"
+              @selection-change="selectionItem2"
+              highlight-current-row
+              style="width: 100%">
+              <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+              <el-table-column prop="templateId" header-align="center" align="center" min-width="80" label="模板编码"></el-table-column>
+              <el-table-column prop="templateName" header-align="center" align="center" min-width="200" label="模板名称"></el-table-column>
+              <el-table-column prop="operation" header-align="center" align="center" min-width="100" label="工序"></el-table-column>
+              <el-table-column prop="resourceID" header-align="center" align="center" min-width="100" label="机台"></el-table-column>
+              <el-table-column prop="manufacturerName" header-align="center" align="center" min-width="200" label="供应商"></el-table-column>
+              <el-table-column prop="customerName" header-align="center" align="center" min-width="200" label="客户"></el-table-column>
+              <el-table-column prop="inspectionTypeName" header-align="center" align="center" min-width="60" label="检验类型"></el-table-column>
+            </el-table>
+          </div>
+        </el-footer>
       </el-container>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 18px;text-align:center">
         <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -687,7 +695,7 @@
       </el-footer>
     </el-dialog>
 
-    <!-- 工序 -->
+    <!-- 工序（与 boying-vue 一致：多选 + reserve-selection） -->
     <el-dialog title="工序清单" :close-on-click-modal="false" v-drag :visible.sync="operationModelFlag" width="420px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="operationData">
@@ -695,33 +703,24 @@
             <el-input v-model="operationData.operationDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getOperationList2()">查询</el-button>
+            <el-button type="primary" @click="getOperationList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
           :height="300"
           :data="operationList"
           ref="operationTable"
-          @row-click="operationClickRow"
           @selection-change="selectionOperationChangeHandle"
+          @select="operationSelect"
+          :row-key="getRowKeys"
           border
-          :row-class-name="operationRowClassName"
           style="width: 100%;">
-          <el-table-column type="index" width="50" align="center">
-            <template slot-scope="scope">
-              <el-radio v-model="operationCurrent" :label="scope.row.index">{{''}}</el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="operationDesc"
-            header-align="center"
-            align="center"
-            label="工序">
-          </el-table-column>
+          <el-table-column type="selection" header-align="center" align="center" :reserve-selection="true" width="50"></el-table-column>
+          <el-table-column prop="operationDesc" header-align="center" align="center" label="工序"></el-table-column>
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="confirmOperation()">确认</el-button>
+        <el-button type="primary" @click="confirmOperation">确认</el-button>
       </el-footer>
     </el-dialog>
 
@@ -736,39 +735,25 @@
             <el-input v-model="resourceData.resourceDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getAllResourceList2()">查询</el-button>
+            <el-button type="primary" @click="getAllResourceList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
           :height="300"
           :data="resourceList"
           ref="resourceTable"
-          @row-click="resourceClickRow"
           @selection-change="selectionResourceChangeHandle"
+          @select="resourceSelect"
+          :row-key="getRowKeys2"
           border
-          :row-class-name="resourceRowClassName"
           style="width: 100%;">
-          <el-table-column type="index" width="50" align="center">
-            <template slot-scope="scope">
-              <el-radio v-model="resourceCurrent" :label="scope.row.index">{{''}}</el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="resourceId"
-            header-align="center"
-            align="center"
-            label="机台编码">
-          </el-table-column>
-          <el-table-column
-            prop="resourceDesc"
-            header-align="center"
-            align="center"
-            label="机台名称">
-          </el-table-column>
+          <el-table-column type="selection" header-align="center" align="center" :reserve-selection="true" width="50"></el-table-column>
+          <el-table-column prop="resourceId" header-align="center" align="center" label="机台编码"></el-table-column>
+          <el-table-column prop="resourceDesc" header-align="center" align="center" label="机台名称"></el-table-column>
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="confirmResource()">确认</el-button>
+        <el-button type="primary" @click="confirmResource">确认</el-button>
       </el-footer>
     </el-dialog>
 
@@ -783,7 +768,7 @@
             <el-input v-model="manufacturerData.manufacturerName" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getManufacturerList()">查询</el-button>
+            <el-button type="primary" @click="getManufacturerList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -792,37 +777,56 @@
           ref="manufacturerTable"
           @row-click="manufacturerClickRow"
           @selection-change="selectionManufacturerChangeHandle"
+          :row-key="getRowKeys3"
           border
           style="width: 100%;">
-          <el-table-column
-            type="selection"
-            header-align="center"
-            align="center"
-            :selectable="selectFlag"
-            width="50">
-          </el-table-column>
-          <el-table-column
-            prop="manufacturerID"
-            header-align="center"
-            align="center"
-            label="供应商编码">
-          </el-table-column>
-          <el-table-column
-            prop="manufacturerName"
-            header-align="center"
-            align="center"
-            label="供应商名称">
-          </el-table-column>
+          <el-table-column type="selection" header-align="center" align="center" :reserve-selection="true" width="50"></el-table-column>
+          <el-table-column prop="manufacturerID" header-align="center" align="center" label="供应商编码"></el-table-column>
+          <el-table-column prop="manufacturerName" header-align="center" align="center" label="供应商名称"></el-table-column>
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="confirmManufacturer()">确认</el-button>
+        <el-button type="primary" @click="confirmManufacturer">确认</el-button>
         <el-button type="primary" @click="manufacturerModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
+    <!-- 客户 -->
+    <el-dialog title="客户清单" :close-on-click-modal="false" v-drag :visible.sync="customerModelFlag" width="520px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="customerData">
+          <el-form-item :label="'客户编码:'">
+            <el-input v-model="customerData.customerID" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'客户名称:'">
+            <el-input v-model="customerData.customerName" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getCustomerList2">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="customerList"
+          ref="customerTable"
+          @row-click="customerClickRow"
+          @selection-change="selectionCustomerChangeHandle"
+          :row-key="getRowKeys4"
+          border
+          style="width: 100%;">
+          <el-table-column type="selection" header-align="center" align="center" :reserve-selection="true" width="50"></el-table-column>
+          <el-table-column prop="customerID" header-align="center" align="center" label="客户编码"></el-table-column>
+          <el-table-column prop="customerName" header-align="center" align="center" label="客户名称"></el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmCustomer">确认</el-button>
+        <el-button type="primary" @click="customerModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- sop文件清单 -->
-    <el-dialog title="SOP文件清单" :close-on-click-modal="false" v-drag :visible.sync="sopFileModelFlag" width="800px">
+    <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="sopFileModelFlag" width="800px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="' '">
           <el-button type="primary" @click="uploadSopFile">上传文件</el-button>
@@ -932,6 +936,63 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 巡检特殊配置（按工序） -->
+    <el-dialog title="巡检特殊配置" :close-on-click-modal="false" v-drag :visible.sync="patrolConfigDialogFlag" width="900px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button type="primary" size="small" icon="el-icon-plus" @click="addPatrolConfig">新增</el-button>
+        <el-button type="danger" size="small" icon="el-icon-delete" @click="deletePatrolConfigRows" :disabled="patrolConfigSelections.length === 0">删除</el-button>
+        <el-button type="success" size="small" icon="el-icon-upload2" @click="openPatrolConfigImport">导入</el-button>
+      </div>
+      <el-table
+        :data="patrolConfigList"
+        border
+        height="400px"
+        v-loading="patrolConfigLoading"
+        @selection-change="patrolConfigSelectionChange"
+        highlight-current-row
+        style="width: 100%">
+        <el-table-column type="selection" width="50" align="center"></el-table-column>
+        <el-table-column prop="operationDesc" label="工序" header-align="center" align="left" min-width="150">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.operationDesc" size="small" placeholder="请选择工序" filterable clearable style="width: 100%">
+              <el-option v-for="item in operationDescList" :key="item" :label="item" :value="item"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="firstInspectionDuration" label="首次巡检时长(h)" header-align="center" align="right" width="140">
+          <template slot-scope="scope">
+            <el-input-number :controls="false" :step="0" v-model="scope.row.firstInspectionDuration" size="small" style="width: 100%"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nextInspectionDuration" label="下次巡检时长(h)" header-align="center" align="right" width="140">
+          <template slot-scope="scope">
+            <el-input-number :controls="false" :step="0" v-model="scope.row.nextInspectionDuration" size="small" style="width: 100%"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalInspectionDuration" label="累计巡检时长(h)" header-align="center" align="right" width="140">
+          <template slot-scope="scope">
+            <el-input-number :controls="false" :step="0" v-model="scope.row.totalInspectionDuration" size="small" style="width: 100%"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column prop="defaultFlag" label="是否默认" header-align="center" align="center" width="100">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.defaultFlag" active-value="Y" inactive-value="N" @change="handleDefaultFlagChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" header-align="center" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="savePatrolConfigRow(scope.row)">保存</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:35px;margin-top: 15px;text-align:center">
+        <el-button type="primary" @click="batchSavePatrolConfig" :loading="patrolConfigSaveLoading">保存</el-button>
+        <el-button @click="patrolConfigDialogFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <patrol-config-upload ref="patrolConfigUpload" @refreshPatrolConfig="getPatrolConfigList" v-drag></patrol-config-upload>
+
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传sop文件的modal -->
@@ -956,6 +1017,7 @@
     inspectionTypeSearch, // 搜索所有检验类型
     getOperationDescList, // 查询工序列表
     getManufacturerList, // 查询供应商列表
+    getCustomerList, // 查询客户列表
     getAllResourceList, // 查询机台列表
     getSiteAndBuByUserName,
     searchPartInfo, // 查询物料信息
@@ -966,7 +1028,12 @@
     delPartAttrItemDetails,
     savePartAttrDetailed,
     goUpPartAttrItem,
-    goDownPartAttrItem
+    goDownPartAttrItem,
+    getPatrolConfigList as fetchPatrolConfigListApi,
+    savePatrolConfig as savePatrolConfigApi,
+    updatePatrolConfig as updatePatrolConfigApi,
+    deletePatrolConfig as deletePatrolConfigApi,
+    getPatrolOperationDescList as getPatrolOperationDescListApi
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -975,11 +1042,13 @@
   import {deleteObjectFile} from '@/api/eam/eam.js'
   import qcUpload from "./qc_upload"
   import qcSOPUploadFile from "./qc_SOP_upload_file"
+  import PatrolConfigUpload from './patrol_config_upload'
   export default {
     components: {
       qcSOPUploadFile,
       Chooselist,
-      qcUpload
+      qcUpload,
+      PatrolConfigUpload
     },
     data () {
       return {
@@ -994,6 +1063,17 @@
         exportList: [],
         // 导出 end
         tagNo: '',
+        patrolConfigDialogFlag: false,
+        patrolConfigLoading: false,
+        patrolConfigList: [],
+        patrolConfigSelections: [],
+        operationDescList: [],
+        patrolConfigSaveLoading: false,
+        patrolContextRow: {
+          site: '',
+          buNo: '',
+          partNo: ''
+        },
         searchData: {
           site: '',
           userName: this.$store.state.user.name,
@@ -1658,11 +1738,33 @@
             fixed: '',
             columnWidth: 200,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table2CustomerName',
+            tableId: "301003Table2",
+            tableName: "检验模板清单表",
+            columnProp: 'customerName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '客户',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
         ],
         // 快速添加
         fastAddFlag: false,
         itemList1: [],
         itemList2: [],
+        itemList1Loading: false,
+        itemList2Loading: false,
+        addItemLoading: false,
+        deleteItemLoading: false,
         itemListRow1: {},
         itemListRow2: {},
         tempLevelRow: '',
@@ -1707,7 +1809,8 @@
         resourceModelFlag: false,
         dataListOperationSelections: [],
         operationData: {
-          operationDesc: ''
+          operationDesc: '',
+          inspectionTypeNo: ''
         },
         resourceData: {
           site: '',
@@ -1717,6 +1820,14 @@
         operation: '',
         resourceId: '',
         selectionManufacturer: [],
+        selectionManufacturer2: [],
+        selectionCustomer: [],
+        selectionCustomer2: [],
+        span1: 12,
+        span2: 12,
+        span3: 12,
+        operationSelections: [],
+        resourceSelections: [],
         // 供应商
         manufacturerList: [],
         manufacturerModelFlag: false,
@@ -1726,6 +1837,14 @@
           manufacturerID: '',
           manufacturerName: ''
         },
+        customerData: {
+          site: '',
+          customerID: '',
+          customerName: ''
+        },
+        customerModelFlag: false,
+        customerList: [],
+        dataListCustomerSelections: [],
         // 单选框绑定的值
         operationCurrent: -1,
         resourceCurrent: -1,
@@ -1985,6 +2104,221 @@
         })
       },
 
+      patrolInspection (row) {
+        this.patrolContextRow = {
+          site: row.site,
+          buNo: row.buNo,
+          partNo: row.partNo
+        }
+        this.patrolConfigDialogFlag = true
+        this.getPatrolConfigList()
+        this.loadPatrolOperationDescList()
+      },
+
+      loadPatrolOperationDescList () {
+        const params = {
+          site: this.patrolContextRow.site,
+          userName: this.$store.state.user.name
+        }
+        getPatrolOperationDescListApi(params).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.operationDescList = data.rows || []
+          }
+        })
+      },
+
+      getPatrolConfigList () {
+        this.patrolConfigLoading = true
+        const params = {
+          site: this.patrolContextRow.site,
+          buNo: this.patrolContextRow.buNo,
+          partNo: this.patrolContextRow.partNo
+        }
+        fetchPatrolConfigListApi(params).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.patrolConfigList = data.rows || []
+          } else {
+            this.$message.error((data && data.msg) || '获取巡检配置失败')
+          }
+          this.patrolConfigLoading = false
+        }).catch(() => {
+          this.patrolConfigLoading = false
+        })
+      },
+
+      patrolConfigSelectionChange (selections) {
+        this.patrolConfigSelections = selections
+      },
+
+      addPatrolConfig () {
+        this.patrolConfigList.push({
+          site: this.patrolContextRow.site,
+          buNo: this.patrolContextRow.buNo,
+          partNo: this.patrolContextRow.partNo,
+          operationDesc: '',
+          firstInspectionDuration: 0,
+          nextInspectionDuration: 0,
+          totalInspectionDuration: 0,
+          defaultFlag: 'N',
+          isNew: true
+        })
+      },
+
+      savePatrolConfigRow (row) {
+        if (!row.operationDesc) {
+          this.$message.warning('请输入工序')
+          return
+        }
+        const params = {
+          site: row.site,
+          buNo: row.buNo,
+          partNo: row.partNo,
+          operationDesc: row.operationDesc,
+          firstInspectionDuration: row.firstInspectionDuration,
+          nextInspectionDuration: row.nextInspectionDuration,
+          totalInspectionDuration: row.totalInspectionDuration,
+          defaultFlag: row.defaultFlag
+        }
+        if (row.isNew) {
+          savePatrolConfigApi(params).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message.success('保存成功')
+              this.getPatrolConfigList()
+            } else {
+              this.$message.error((data && data.msg) || '保存失败')
+            }
+          })
+        } else {
+          updatePatrolConfigApi(params).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message.success('更新成功')
+              this.getPatrolConfigList()
+            } else {
+              this.$message.error((data && data.msg) || '更新失败')
+            }
+          })
+        }
+      },
+
+      deletePatrolConfigRows () {
+        if (this.patrolConfigSelections.length === 0) {
+          this.$message.warning('请选择要删除的数据')
+          return
+        }
+        this.$confirm('确定删除选中的配置吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const deleteList = this.patrolConfigSelections.filter(item => !item.isNew)
+          if (deleteList.length === 0) {
+            this.patrolConfigSelections.forEach(item => {
+              const index = this.patrolConfigList.indexOf(item)
+              if (index > -1) {
+                this.patrolConfigList.splice(index, 1)
+              }
+            })
+            this.patrolConfigSelections = []
+            return
+          }
+          const params = {
+            list: deleteList.map(item => ({
+              site: item.site,
+              buNo: item.buNo,
+              partNo: item.partNo,
+              operationDesc: item.operationDesc
+            }))
+          }
+          deletePatrolConfigApi(params).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message.success('删除成功')
+              this.getPatrolConfigList()
+            } else {
+              this.$message.error((data && data.msg) || '删除失败')
+            }
+          })
+        }).catch(() => {})
+      },
+
+      handleDefaultFlagChange (row) {
+        if (row.defaultFlag === 'Y') {
+          this.patrolConfigList.forEach(item => {
+            if (item !== row) {
+              item.defaultFlag = 'N'
+            }
+          })
+        }
+      },
+
+      batchSavePatrolConfig () {
+        if (this.patrolConfigList.length === 0) {
+          this.$message.warning('没有需要保存的数据')
+          return
+        }
+        for (let i = 0; i < this.patrolConfigList.length; i++) {
+          const item = this.patrolConfigList[i]
+          if (!item.operationDesc) {
+            this.$message.warning(`第${i + 1}行工序不能为空`)
+            return
+          }
+        }
+        this.patrolConfigSaveLoading = true
+        let successCount = 0
+        let errorCount = 0
+        const promises = this.patrolConfigList.map(row => {
+          const params = {
+            site: row.site,
+            buNo: row.buNo,
+            partNo: row.partNo,
+            operationDesc: row.operationDesc,
+            firstInspectionDuration: row.firstInspectionDuration,
+            nextInspectionDuration: row.nextInspectionDuration,
+            totalInspectionDuration: row.totalInspectionDuration,
+            defaultFlag: row.defaultFlag || 'N'
+          }
+          if (row.isNew) {
+            return savePatrolConfigApi(params).then(({ data }) => {
+              if (data && data.code === 0) {
+                successCount++
+                row.isNew = false
+              } else {
+                errorCount++
+              }
+            }).catch(() => {
+              errorCount++
+            })
+          } else {
+            return updatePatrolConfigApi(params).then(({ data }) => {
+              if (data && data.code === 0) {
+                successCount++
+              } else {
+                errorCount++
+              }
+            }).catch(() => {
+              errorCount++
+            })
+          }
+        })
+        Promise.all(promises).then(() => {
+          this.patrolConfigSaveLoading = false
+          if (errorCount === 0) {
+            this.$message.success('保存成功')
+          } else {
+            this.$message.warning(`保存完成，成功${successCount}条，失败${errorCount}条`)
+          }
+          this.getPatrolConfigList()
+        })
+      },
+
+      openPatrolConfigImport () {
+        const params = {
+          site: this.patrolContextRow.site,
+          buNo: this.patrolContextRow.buNo,
+          partNo: this.patrolContextRow.partNo
+        }
+        this.$refs.patrolConfigUpload.init(params)
+      },
+
       getRowData1 (row) {
         this.modalData.sku = row.sku
         this.modalData.cinvSourceCode = row.cinvSourceCode
@@ -2213,46 +2547,92 @@
       },
 
       checkInspectionType () {
-        this.operationData.inspectionTypeNo = this.detailData.inspectionTypeNo
+        this.refreshTemplateLists()
+        if (this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '107') {
+          this.span1 = 12
+          this.span2 = 6
+          this.span3 = 6
+        } else if (this.detailData.inspectionTypeNo === '105' || this.detailData.inspectionTypeNo === '110') {
+          this.span1 = 12
+          this.span2 = 12
+        } else {
+          this.span1 = 24
+        }
+      },
+
+      checkInspectionType2 () {
+        this.refreshTemplateLists()
+      },
+
+      refreshTemplateLists () {
+        this.itemList1Loading = true
+        this.itemList2Loading = true
         getPartTemplateLists(this.detailData).then(({data}) => {
-          this.operation = ''
-          this.resourceId = ''
-          this.itemList1 = data.row1
-          this.itemList2 = data.row2
+          if (data) {
+            this.itemList1 = data.row1 || []
+            this.itemList2 = data.row2 || []
+          }
+        }).catch(err => {
+          console.error('加载模板列表失败:', err)
+        }).finally(() => {
+          this.itemList1Loading = false
+          this.itemList2Loading = false
         })
       },
 
-      // 快速新增
+      // 快速新增（与 boying-vue 一致）
       addFastModal () {
-        this.itemSelections1 = null
-        this.itemSelections2 = null
-        getPartTemplateLists(this.detailData).then(({data}) => {
-          this.itemList1 = data.row1
-          this.itemList2 = data.row2
-        })
+        if (!this.detailData.partNo || !this.detailData.site) {
+          this.$message.warning('请先选择要设置模板的物料！')
+          return
+        }
+        if (!this.options || this.options.length === 0) {
+          this.$message.warning('检验类型数据加载中，请稍后再试')
+          return
+        }
+        this.itemSelections1 = []
+        this.itemSelections2 = []
         this.detailData.inspectionTypeNo = this.options[0].inspectionTypeNo
-        this.checkInspectionType()
+        if (this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '107') {
+          this.span1 = 12
+          this.span2 = 6
+          this.span3 = 6
+        } else if (this.detailData.inspectionTypeNo === '105' || this.detailData.inspectionTypeNo === '110') {
+          this.span1 = 12
+          this.span2 = 12
+        } else {
+          this.span1 = 24
+        }
+        this.operationSelections = []
+        this.resourceSelections = []
         this.dataListOperationSelections = []
-        this.operation = ''
-        this.resourceId = ''
         this.operationData.operationDesc = ''
         this.resourceData.resourceId = ''
         this.resourceData.resourceDesc = ''
-        this.operationCurrent = -1
-        this.resourceCurrent = -1
         this.selectionManufacturer = []
+        this.selectionManufacturer2 = []
         this.dataListManufacturerSelections = []
+        this.selectionCustomer = []
+        this.selectionCustomer2 = []
+        this.dataListCustomerSelections = []
         this.fastAddFlag = true
+        this.$nextTick(() => {
+          this.refreshTemplateLists()
+        })
       },
 
       // 可选项目
       itemClickRow1 (row) {
-        this.$refs.itemTable1.toggleRowSelection(row)
+        if (this.$refs.itemTable1) {
+          this.$refs.itemTable1.toggleRowSelection(row)
+        }
       },
 
       // 已有项目
       itemClickRow2 (row) {
-        this.$refs.itemTable2.toggleRowSelection(row)
+        if (this.$refs.itemTable2) {
+          this.$refs.itemTable2.toggleRowSelection(row)
+        }
       },
 
       selectFlag () {
@@ -2273,44 +2653,43 @@
           this.$message.warning('请选择可选模板！')
           return
         }
-        /* if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107' || this.detailData.inspectionTypeNo === '108') && (this.operation == null || this.operation === '')) {
-          this.$message.warning('请选择工序！')
-          return
-        }
-        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107') && (this.resourceId == null || this.resourceId === '')) {
-          this.$message.warning('请选择机台！')
-          return
-        } */
-        if ((this.detailData.inspectionTypeNo === '105') && (this.selectionManufacturer == null || this.selectionManufacturer.length === 0)) {
-          this.$message.warning('请选择供应商！')
-          return
+        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107')) {
+          if (this.resourceSelections.length > 0 && this.operationSelections.length === 0) {
+            this.$message.warning('如果选择机台，必须要选择工序！')
+            return
+          }
         }
+        this.addItemLoading = true
         let inData = {
           site: this.detailData.site,
           buNo: this.detailData.buNo,
           attributeNo: this.detailData.partNo,
           itemList: this.itemSelections1,
-          operation: this.operation,
-          resourceID: this.resourceId,
-          manufacturerList: this.selectionManufacturer,
+          operationList: this.operationSelections.map(item => item.operationDesc),
+          resourceIDList: this.resourceSelections.map(item => item.resourceId),
+          manufacturerList: this.selectionManufacturer || [],
+          customerList: this.selectionCustomer || [],
           attributeType: this.detailData.attributeType,
           inspectionTypeNo: this.detailData.inspectionTypeNo
         }
         savePartAttributeDetails(inData).then(({data}) => {
           if (data && data.code === 0) {
-            getPartTemplateLists(this.detailData).then(({data}) => {
-              this.itemList1 = data.row1
-              this.itemList2 = data.row2
-            })
+            this.$message.success('添加成功！')
+            this.refreshTemplateLists()
             this.itemSelections1 = []
-            this.operation = ''
-            this.resourceId = ''
+            this.operationSelections = []
+            this.resourceSelections = []
             this.selectionManufacturer = []
+            this.selectionManufacturer2 = []
+            this.selectionCustomer = []
+            this.selectionCustomer2 = []
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data && data.msg ? data.msg : '添加失败')
           }
+        }).catch(err => {
+          this.$message.error('添加失败：' + (err.message || '未知错误'))
+        }).finally(() => {
+          this.addItemLoading = false
         })
       },
 
@@ -2320,8 +2699,9 @@
           this.$message.warning('请选择已有模板！')
           return
         }
+        this.deleteItemLoading = true
         let inData = {
-          attributeNo:this.detailData.partNo,
+          attributeNo: this.detailData.partNo,
           itemList: this.itemSelections2,
           attributeType: this.detailData.attributeType,
           site: this.detailData.site,
@@ -2329,16 +2709,16 @@
         }
         deletePartAttributeDetails(inData).then(({data}) => {
           if (data && data.code === 0) {
-            getPartTemplateLists(this.detailData).then(({data}) => {
-              this.itemList1 = data.row1
-              this.itemList2 = data.row2
-            })
+            this.$message.success('删除成功！')
+            this.refreshTemplateLists()
             this.itemSelections2 = []
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data && data.msg ? data.msg : '删除失败')
           }
+        }).catch(err => {
+          this.$message.error('删除失败：' + (err.message || '未知错误'))
+        }).finally(() => {
+          this.deleteItemLoading = false
         })
       },
 
@@ -2712,25 +3092,13 @@
 
       // 获取工序列表
       getOperationList () {
+        this.operationData.inspectionTypeNo = this.detailData.inspectionTypeNo
         getOperationDescList(this.operationData).then(({data}) => {
           if (data && data.code === 0) {
             this.operationList = data.rows
-            // // 回显数据
-            // // 先清空缓存选中
-            // this.$nextTick(() => this.$refs.operationTable.clearSelection())
-            // // 拿到选中的工序
-            // let tempDataList = this.operationDesc
-            // this.operationList.forEach(val => {
-            //   // 回显选中的工序
-            //   if (tempDataList === val.operationDesc) {
-            //     this.$nextTick(() => this.$refs.operationTable.toggleRowSelection(val, true))
-            //   }
-            // })
             this.operationModelFlag = true
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data.msg)
           }
         })
       },
@@ -2743,140 +3111,177 @@
             this.resourceList = data.rows
             this.resourceModelFlag = true
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data.msg)
           }
         })
       },
 
-      // 条件查询获取工序列表
       getOperationList2 () {
+        this.operationData.inspectionTypeNo = this.detailData.inspectionTypeNo
         getOperationDescList(this.operationData).then(({data}) => {
           if (data && data.code === 0) {
             this.operationList = data.rows
-            this.operationCurrent = -1
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data.msg)
           }
         })
       },
 
-      // 条件查询获取机台列表
       getAllResourceList2 () {
         this.resourceData.site = this.detailData.site
         getAllResourceList(this.resourceData).then(({data}) => {
           if (data && data.code === 0) {
             this.resourceList = data.rows
-            this.resourceCurrent = -1
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
+            this.$message.error(data.msg)
           }
         })
       },
 
-      // 点击行选中工序复选框
-      operationClickRow (row) {
-        this.$refs.operationTable.toggleRowSelection(row)
+      selectionOperationChangeHandle (val) {
+        this.operationSelections = val
       },
 
-      // 点击行选中机台复选框
-      resourceClickRow (row) {
-        this.$refs.resourceTable.toggleRowSelection(row)
-      },
+      operationSelect () {},
 
-      // 多选工序
-      selectionOperationChangeHandle (val) {
-        this.operation = val[0].operationDesc
-        if (val) {
-          this.operationCurrent = val.index
-        }
+      getRowKeys (row) {
+        return row.operationDesc
       },
 
-      // 多选机台
       selectionResourceChangeHandle (val) {
-        this.resourceId = val[0].resourceId
-        if (val) {
-          this.resourceCurrent = val.index
-        }
+        this.resourceSelections = val
       },
 
-      operationRowClassName ({row, rowIndex}) {
-        row.index = rowIndex // 在原有的数据上加一个index
-      },
+      resourceSelect () {},
 
-      resourceRowClassName ({row, rowIndex}) {
-        row.index = rowIndex // 在原有的数据上加一个index
+      getRowKeys2 (row) {
+        return row.resourceId
       },
-      // // 单选
-      // clickChange (row) {
-      //   this.radioOperation = row.operationDesc
-      // },
-      // 确认选择工序
+
       confirmOperation () {
-        //this.operationDesc = ''
-        // this.operationDesc = this.radioOperation
-        // this.radioOperation = ''
-        // for (let i = 0; i < this.dataListOperationSelections.length; i++) {
-        //   this.selectionOperation.push(this.dataListOperationSelections[i].operationDesc)
-        // }
         this.operationModelFlag = false
       },
 
-      // 确认选择工序
       confirmResource () {
         this.resourceModelFlag = false
       },
 
-      // 获取供应商列表
       getManufacturerList () {
         this.manufacturerData.site = this.detailData.site
         getManufacturerList(this.manufacturerData).then(({data}) => {
           if (data && data.code === 0) {
             this.manufacturerList = data.rows
-            // 回显数据
-            // 先清空缓存选中
             this.$nextTick(() => this.$refs.manufacturerTable.clearSelection())
-            // 拿到选中的供应商
             let tempDataList = this.selectionManufacturer
             this.manufacturerList.forEach(val => {
-              // 回显选中的供应商
               if (tempDataList.includes(val.manufacturerID)) {
                 this.$nextTick(() => this.$refs.manufacturerTable.toggleRowSelection(val, true))
               }
             })
             this.manufacturerModelFlag = true
           } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
+            this.$message.error(data.msg)
+          }
+        })
+      },
+
+      getManufacturerList2 () {
+        this.manufacturerData.site = this.detailData.site
+        getManufacturerList(this.manufacturerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.manufacturerList = data.rows
+            let tempDataList = this.selectionManufacturer
+            this.manufacturerList.forEach(val => {
+              if (tempDataList.includes(val.manufacturerID)) {
+                this.$nextTick(() => this.$refs.manufacturerTable.toggleRowSelection(val, true))
+              }
             })
+          } else {
+            this.manufacturerList = []
           }
         })
       },
 
-      // 点击行选中复选框
+      getRowKeys3 (row) {
+        return row.manufacturerID
+      },
+
       manufacturerClickRow (row) {
         this.$refs.manufacturerTable.toggleRowSelection(row)
       },
 
-      // 多选
       selectionManufacturerChangeHandle (val) {
         this.dataListManufacturerSelections = val
       },
 
-      // 确认多选供应商
       confirmManufacturer () {
         this.selectionManufacturer = []
+        this.selectionManufacturer2 = []
         for (let i = 0; i < this.dataListManufacturerSelections.length; i++) {
           this.selectionManufacturer.push(this.dataListManufacturerSelections[i].manufacturerID)
+          this.selectionManufacturer2.push(this.dataListManufacturerSelections[i])
         }
         this.manufacturerModelFlag = false
       },
 
+      getCustomerList () {
+        this.customerData.site = this.detailData.site
+        getCustomerList(this.customerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.customerList = data.rows
+            this.$nextTick(() => this.$refs.customerTable.clearSelection())
+            let tempDataList = this.selectionCustomer
+            this.customerList.forEach(val => {
+              if (tempDataList.includes(val.customerID)) {
+                this.$nextTick(() => this.$refs.customerTable.toggleRowSelection(val, true))
+              }
+            })
+            this.customerModelFlag = true
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
+
+      getCustomerList2 () {
+        this.customerData.site = this.detailData.site
+        getCustomerList(this.customerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.customerList = data.rows
+            let tempDataList = this.selectionCustomer
+            this.customerList.forEach(val => {
+              if (tempDataList.includes(val.customerID)) {
+                this.$nextTick(() => this.$refs.customerTable.toggleRowSelection(val, true))
+              }
+            })
+          } else {
+            this.customerList = []
+          }
+        })
+      },
+
+      customerClickRow (row) {
+        this.$refs.customerTable.toggleRowSelection(row)
+      },
+
+      selectionCustomerChangeHandle (val) {
+        this.dataListCustomerSelections = val
+      },
+
+      getRowKeys4 (row) {
+        return row.customerID
+      },
+
+      confirmCustomer () {
+        this.selectionCustomer = []
+        this.selectionCustomer2 = []
+        for (let i = 0; i < this.dataListCustomerSelections.length; i++) {
+          this.selectionCustomer.push(this.dataListCustomerSelections[i].customerID)
+          this.selectionCustomer2.push(this.dataListCustomerSelections[i])
+        }
+        this.customerModelFlag = false
+      },
+
       // sop文件列表
       sopFileList (row) {
         this.sopData = {
@@ -2908,7 +3313,7 @@
       // 上传sop文件模态框
       uploadSopFile () {
         let currentData = {
-          titleCon: 'SOP文件上传',
+          titleCon: '文件上传',
           site: this.sopData.site,
           buNo: this.sopData.buNo,
           createBy: this.$store.state.user.name,
@@ -3067,4 +3472,11 @@
   height: auto;
   line-height: 1.5;
 }
+.qc-more-dropdown-trigger {
+  cursor: pointer;
+  color: #45C2B5;
+  margin-left: 1px;
+  font-size: 12px;
+  white-space: nowrap;
+}
 </style>