diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index 24fd2bc..f092505 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -1,48 +1,19 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
 // ===================================== 检验方法 =====================================
-export const qcCheckOutMethodSearch = data => createAPI(`/pms/qc/qcCheckOutMethodSearch`,'post',data)
-export const qcCheckOutMethodSave = data => createAPI(`/pms/qc/qcCheckOutMethodSave`,'post',data)
-export const qcCheckOutMethodUpdate = data => createAPI(`/pms/qc/qcCheckOutMethodUpdate`,'post',data)
-export const qcCheckOutMethodDelete = data => createAPI(`/pms/qc/qcCheckOutMethodDelete`,'post',data)
-
+export const qcMethodSearch = data => createAPI(`/pms/qc/qcMethodSearch`,'post',data)
+export const qcMethodSave = data => createAPI(`/pms/qc/qcMethodSave`,'post',data)
+export const qcMethodUpdate = data => createAPI(`/pms/qc/qcMethodUpdate`,'post',data)
+export const qcMethodDelete = data => createAPI(`/pms/qc/qcMethodDelete`,'post',data)
 
 // ===================================== 检验项目 =====================================
-export const qcCheckOutItemSearch = data => createAPI(`/pms/qc/qcCheckOutItemSearch`,'post',data)
-export const qcCheckOutItemSave = data => createAPI(`/pms/qc/qcCheckOutItemSave`,'post',data)
-export const qcCheckOutItemUpdate = data => createAPI(`/pms/qc/qcCheckOutItemUpdate`,'post',data)
-export const qcCheckOutItemDelete = data => createAPI(`/pms/qc/qcCheckOutItemDelete`,'post',data)
+export const qcItemSearch = data => createAPI(`/pms/qc/qcItemSearch`,'post',data)
+export const qcItemSave = data => createAPI(`/pms/qc/qcItemSave`,'post',data)
+export const qcItemUpdate = data => createAPI(`/pms/qc/qcItemUpdate`,'post',data)
+export const qcItemDelete = data => createAPI(`/pms/qc/qcItemDelete`,'post',data)
 export const uploadExcel = data => createAPI(`/pms/qc/uploadExcel`,'post',data)
-
-// ===================================== 根据物料设置检验模板 =====================================
-export const qcPartModelSearch = data => createAPI(`/pms/qc/qcPartModelSearch`,'post',data)
-export const qcPartModelSave = data => createAPI(`/pms/qc/qcPartModelSave`,'post',data)
-export const qcPartModelUpdate = data => createAPI(`/pms/qc/qcPartModelUpdate`,'post',data)
-export const qcPartModelDelete = data => createAPI(`/pms/qc/qcPartModelDelete`,'post',data)
-
-// ===================================== 根据分类设置检验模板 =====================================
-export const qcCheckOutModelSearch = data => createAPI(`/pms/qc/qcCheckOutModelSearch`,'post',data)
-export const qcCheckOutModelSave = data => createAPI(`/pms/qc/qcCheckOutModelSave`,'post',data)
-export const qcCheckOutModelUpdate = data => createAPI(`/pms/qc/qcCheckOutModelUpdate`,'post',data)
-export const qcCheckOutModelDelete = data => createAPI(`/pms/qc/qcCheckOutModelDelete`,'post',data)
-export const searchModalDetails = data => createAPI(`/pms/qc/searchModalDetails`,'post',data)
-export const saveModalDetails = data => createAPI(`/pms/qc/saveModalDetails`,'post',data)
-export const deleteModalDetails = data => createAPI(`/pms/qc/deleteModalDetails`,'post',data)
 export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data)
 
-// ===================================== 检验录入 =====================================
-export const qcInspectionInformationSearch = data => createAPI(`/pms/qc/qcInspectionInformationSearch`,'post',data)
-export const modalCodeBlur = data => createAPI(`/pms/qc/modalCodeBlur`,'post',data)
-export const qcInspectionInformationSave = data => createAPI(`/pms/qc/qcInspectionInformationSave`,'post',data)
-export const masterInformationSearch = data => createAPI(`/pms/qc/masterInformationSearch`,'post',data)
-export const saveMasterInformationValue = data => createAPI(`/pms/qc/saveMasterInformationValue`,'post',data)
-export const searchModelTree = data => createAPI(`/pms/qc/searchModelTree`,'post',data)
-export const detailInformationSearch = data => createAPI(`/pms/qc/detailInformationSearch`,'post',data)
-export const checkCompleted = data => createAPI(`/pms/qc/checkCompleted`,'post',data)
-export const selectModelByPartNo = data => createAPI(`/pms/qc/selectModelByPartNo`,'post',data)
-export const workOrderSearch = data => createAPI(`/pms/qc/workOrderSearch`,'post',data)
-export const selectInformationByWorkOrderNo = data => createAPI(`/pms/qc/selectInformationByWorkOrderNo`,'post',data)
-
 // ===================================== 质检员信息 =====================================
 export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data)
 export const inspectorSave = data => createAPI(`/pms/qc/inspectorSave`,'post',data)
@@ -56,7 +27,7 @@ export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',
 export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data)
 export const InspectionTypeSearch = data => createAPI(`/pms/qc/InspectionTypeSearch`,'post',data)
 export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data)
-export const ItemDetailsSearch = data => createAPI(`/pms/qc/ItemDetailsSearch`,'post',data)
+export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data)
 export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data)
 export const getItemList = data => createAPI(`/pms/qc/getItemList`,'post',data)
 export const delItemDetails = data => createAPI(`/pms/qc/delItemDetails`,'post',data)
@@ -139,8 +110,16 @@ export const getResourceList = data => createAPI(`/pms/qc/getResourceList`,'post
 export const getPartList = data => createAPI(`/pms/qc/getPartList`,'post',data)
 export const saveOsInspection = data => createAPI(`/pms/qc/saveOsInspection`,'post',data)
 
-
-
+// ===================================== IQC检验 =====================================
+export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)
+export const iqcDetailSearch = data => createAPI(`/pms/qc/iqcDetailSearch`,'post',data)
+export const selectIQCSubDetailedRecord = data => createAPI(`/pms/qc/selectIQCSubDetailedRecord`,'post',data)
+export const checkIQCSubDetailValue = data => createAPI(`/pms/qc/checkIQCSubDetailValue`,'post',data)
+export const saveIQCDetailedRecord = data => createAPI(`/pms/qc/saveIQCDetailedRecord`,'post',data)
+export const checkIQCIsSubmit = data => createAPI(`/pms/qc/checkIQCIsSubmit`,'post',data)
+export const saveIQCSubDetailed = data => createAPI(`/pms/qc/saveIQCSubDetailed`,'post',data)
+export const saveIQCSubmitResult = data => createAPI(`/pms/qc/saveIQCSubmitResult`,'post',data)
+export const iqcRecordDelete = data => createAPI(`/pms/qc/iqcRecordDelete`,'post',data)
 
 
 
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index cf6ab1d..b6f3f25 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -329,7 +329,6 @@
       </el-table>
     </el-dialog>
 
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
     <!-- 上传文件的modal -->
     <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList()" v-drag></qcFAIUploadFile>
   </div>
@@ -1192,6 +1191,7 @@
             obj.subDetailValue = "";
             obj.samplingLocation = "";
             this.tableData.push(obj);
+            console.log(this.tableData)
           } else {
             this.$alert("记录已提交！", '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index ed6fa60..39be636 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -1407,6 +1407,7 @@
             obj.subDetailValue = "";
             obj.samplingLocation = "";
             this.tableData.push(obj);
+            console.log(this.tableData)
           } else {
             this.$alert("记录已提交！", '错误', {
               confirmButtonText: '确定'
@@ -1441,7 +1442,6 @@
                       message: "删除成功，记得保存修改喔！",
                       type: "success",
                     });
-                    //this.$refs.tb.clearSelection();
                     return;
                   } else {
                     this.$message({
@@ -1459,7 +1459,6 @@
             })
           }
         })
-
       },
       // 新增子明细记录
       saveSubDetailResult(){
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index c4e7cb9..8a1583f 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -8,11 +8,23 @@
     </div>
     <!-- 条件查询 -->
     <el-form :inline="true"  label-position="top" :model="searchData" >
-      <el-form-item :label="'检验编码'">
+      <el-form-item :label="'检验单号'">
         <el-input v-model="searchData.inspectionNo" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'质检员编码'">
-        <el-input v-model="searchData.inspectorNo" style="width: 120px"></el-input>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.state" style="width: 100px">
+          <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-select v-model="searchData.inspectionResult" style="width: 100px">
+          <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.partNo" style="width: 120px"></el-input>
@@ -29,18 +41,9 @@
           <el-input v-model="searchData.endDate" type="date"></el-input>
         </el-col>
       </el-form-item>
-      <el-form-item :label="'是否合格'">
-        <el-select filterable v-model="searchData.isQualified" style="width: 130px">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="合格" value="Y"></el-option>
-          <el-option label="不合格" value="N"></el-option>
-          <el-option label="待提交" value="D"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-button @click="doEmpty()">清空</el-button>
         <el-button type="primary" @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addInspectionRecords()">新增检验记录</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -84,11 +87,12 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="230"
+        width="200"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="detailModal(scope.row)">明细信息</a>
-          <a type="text" v-if = "scope.row.isQualified == 'D'" size="small" @click="submitResult(scope.row)">提交</a>
+          <a type="text" size="small" @click="detailModal(scope.row)">检验单</a>
+          <a type="text" size="small" @click="getFileContentData(scope.row)">工作文件</a>
+          <a type="text" size="small" @click="submitResult(scope.row)">审核</a>
           <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
         </template>
       </el-table-column>
@@ -105,74 +109,157 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <!-- 新增检验记录 -->
-    <el-dialog title="检验记录" :close-on-click-modal="false" v-drag :visible.sync="inspectionRecordsFlag" width="430px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
-<!--        <el-form-item label="检验编码:">-->
-<!--          <el-input v-model="modalData.inspectionNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>-->
-<!--        </el-form-item>-->
-        <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1040)"><a herf="#">质检员</a></span>
-          <el-input v-model="modalData.inspectorNo"  style="width: 120px"></el-input>
+    <!-- 检验单详情页 -->
+    <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1700px">
+      <el-form :inline="true"  label-position="top" @keyup.enter.native = "getDataList()">
+        <el-form-item :label="'物料编码'">
+          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item label="质检员名称:">
-          <el-input v-model="modalData.inspectorName" disabled style="width: 120px"></el-input>
+        <el-form-item :label="'物料名称'">
+          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
         </el-form-item>
-      </el-form>
-
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
-        <el-form-item label="工单号:">
-          <el-input v-model="modalData.workOrderNumber" @blur="workOrderBlur" style="width: 120px">
-          </el-input>
+        <el-form-item :label="'送检数量'">
+          <el-input v-model="detailData.rollQty" disabled style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item label="工单数量:">
-          <el-input v-model="modalData.workOrderQuantity" type="number" disabled style="width: 120px"></el-input>
+        <el-form-item :label="'抽样数量'">
+          <el-input v-model="detailData.samplingQty" disabled style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item label="产品料号:">
-          <el-input v-model="modalData.partNo" disabled style="width: 120px"></el-input>
+        <el-form-item :label="'不合格项目数量'">
+          <el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 100px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 100px"></el-input>
         </el-form-item>
-      </el-form>
-
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
-        <el-form-item label="卷号:">
-          <el-input v-model="modalData.reelNumber" style="width: 120px"></el-input>
+        <el-form-item :label="'处置措施'">
+          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
+            <el-option label="请选择" value=""></el-option>
+            <el-option label="特采" value="特采"></el-option>
+            <el-option label="拒收" value="拒收"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalMeasures" style="width: 100px">
+            <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="modalData.rollingQuantity" type="number" style="width: 120px"></el-input>
+        <el-form-item :label="'处置说明'">
+          <el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
         </el-form-item>
-        <el-form-item label="首件取样数量:">
-          <el-input v-model="modalData.sampleQuantity" type="number" style="width: 120px"></el-input>
+        <el-form-item :label="'检验结论'">
+          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
         </el-form-item>
-      </el-form>
-
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
-
-      </el-form>
-
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="saveData()">保存</el-button>
-        <el-button type="primary" @click="inspectionRecordsFlag = false">关闭</el-button>
-      </el-footer>
-    </el-dialog>
-
-    <!-- 明细信息清单 -->
-    <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.inspectionNo" readonly style="width: 170px"></el-input>
+        <el-form-item label="检验员">
+          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
+            <el-option
+              v-for = "i in options"
+              :key = "i.inspectorNo"
+              :label = "i.inspectorName"
+              :value = "i.inspectorNo">
+            </el-option>
+          </el-select>
+          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectorNo" placeholder="请选择" style="width: 100px">
+            <el-option
+              v-for = "i in options"
+              :key = "i.inspectorNo"
+              :label = "i.inspectorName"
+              :value = "i.inspectorNo">
+            </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: 200px"></el-input>
+          <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 200px"></el-input>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
         </el-form-item>
         <el-form-item  :label="' '"></el-form-item>
       </el-form>
       <!-- 展示列表 -->
       <div class="rq ">
+        <el-table
+          :height="700"
+          :data="detailList"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <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">
+              <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
+            prop=""
+            header-align="center"
+            align="center"
+            min-width="80"
+            label="子明细">
+            <template slot-scope="scope">
+              <el-button 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 v-if="detailData.submitFlag == 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="75"
+            label="项目检验结论">
+            <template slot-scope="scope">
+              <el-select 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 v-if="detailData.submitFlag != 'Y'" v-model="scope.row.itemResult" 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>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="Transfer()">保存</el-button>
+        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 文件清单 -->
+    <el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="1000px">
       <el-table
-        :height="200"
-        :data="detailList"
+        :height="400"
+        :data="fileContentList"
         border
         v-loading="dataListLoading"
-        style="width: 100%;">
+        style="width: 100%; ">
         <el-table-column
-          v-for="(item,index) in detailColumnList" :key="index"
+          v-for="(item,index) in fileColumnList" :key="index"
           :sortable="item.columnSortable"
           :prop="item.columnProp"
           :header-align="item.headerAlign"
@@ -187,109 +274,55 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop=""
+          fixed="right"
           header-align="center"
-          align="right"
-          min-width="80"
-          label="实测值">
+          align="center"
+          width="100"
+          label="操作">
           <template slot-scope="scope">
-            <el-input v-if="scope.row.valueTypeDb=='T' && scope.row.isSubmit=='Y'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " readonly filterable allow-create>;width:98%"></el-input>
-            <el-input v-if="scope.row.valueTypeDb=='T' && scope.row.isSubmit!='Y'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
-            <el-input v-if="scope.row.valueTypeDb=='N' && scope.row.isSubmit=='Y'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " readonly filterable allow-create>;width:98%"></el-input>
-            <el-input v-if="scope.row.valueTypeDb=='N' && scope.row.isSubmit!='Y'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop=""
-          header-align="center"
-          align="right"
-          min-width="55"
-          label="子明细">
-          <template slot-scope="scope">
-            <el-button 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-select v-if="scope.row.isSubmit=='Y'" disabled="disabled" filterable v-model="scope.row.isQualified" style="height: 11px;padding: 0px ">
-              <el-option label="是" value="Y"></el-option>
-              <el-option label="否" value="N"></el-option>
-            </el-select>
-            <el-select v-if="scope.row.isSubmit!='Y'" filterable v-model="scope.row.isQualified" style="height: 11px;padding: 0px ">
-              <el-option label="是" value="Y"></el-option>
-              <el-option label="否" value="N"></el-option>
-            </el-select>
+            <a  @click="downloadFile(scope.row)" >下载</a>
+            <a type="text" size="small"  @click="deleteFile(scope.row)">删除</a>
           </template>
         </el-table-column>
       </el-table>
-      </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="Transfer()">保存</el-button>
-        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
-      </el-footer>
     </el-dialog>
 
-    <!-- 提交 -->
-    <el-dialog title="提交检测结果" :close-on-click-modal="false" v-drag :visible.sync="submitFlag" width="200px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item :label="'请选择检验结果'">
-          <el-select filterable v-model="submitData.isQualified" style="width: 130px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="合格" value="Y"></el-option>
-            <el-option label="不合格" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-
-      </el-form>
+    <!-- 审核 -->
+    <el-dialog title="审核" :close-on-click-modal="false" v-drag :visible.sync="examineFlag" width="200px">
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
-        <el-button type="primary" @click="submitFlag = false">关闭</el-button>
+        <el-button type="primary" @click="saveSubmitResult()">确认</el-button>
+        <el-button type="primary" @click="examineFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
-
     <!-- 子明细信息 -->
     <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="471px">
       <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>
-
       <div class="rq ">
-      <el-table
-        :height="300"
-        :data="tableData.dataArray"
-        border
-        :header-cell-class-name="starAdd"
-        :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="valueIndex" width="50"></el-table-column>
-
-        <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="抽样位置" width="150">
-          <template slot-scope="{row}">
-            <el-input v-if="tableData.dataArray[row.valueIndex-1].isSubmit=='Y'" v-model="tableData.dataArray[row.valueIndex-1].samplingLocation" readonly placeholder="请输入抽样位置"></el-input>
-            <el-input v-if="tableData.dataArray[row.valueIndex-1].isSubmit!='Y'" v-model="tableData.dataArray[row.valueIndex-1].samplingLocation" placeholder="请输入抽样位置"></el-input>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
-          <template slot-scope="{row}">
-            <el-input v-if="tableData.dataArray[row.valueIndex-1].isSubmit=='Y'" v-model="tableData.dataArray[row.valueIndex-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
-            <el-input v-if="tableData.dataArray[row.valueIndex-1].isSubmit!='Y'" v-model="tableData.dataArray[row.valueIndex-1].subDetailValue" placeholder="请输入实测值"></el-input>
-          </template>
-        </el-table-column>
-
-      </el-table>
+        <el-table
+          :height="300"
+          :data="tableData"
+          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="xh" width="50"></el-table-column>
+          <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="抽样位置" width="150">
+            <template slot-scope="{row}">
+              <el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置"></el-input>
+              <el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocation" placeholder="请输入抽样位置"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
+            <template slot-scope="{row}">
+              <el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
+              <el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" placeholder="请输入实测值"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
-
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveSubDetailResult()">保存</el-button>
         <el-button type="primary" @click="subDetailFlag = false">关闭</el-button>
@@ -297,103 +330,71 @@
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 上传文件的modal -->
+    <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList()" v-drag></qcFAIUploadFile>
 
   </div>
 </template>
 
 <script>
   import {
-    qcInspectionInformationSearch, // 检验记录查询
-    qcInspectionInformationSave, // 新增检验记录
-    qcInspectionInformationDelete, // 删除检验记录
-    masterInformationSearch, // 查询主信息
-    detailInformationSearch, // 查询明细信息
-    modalCodeBlur, // 模板信息
-    saveMasterInformationValue, // 新增主信息
-    saveIPQCDetailedRecord, // 新增明细信息
-    searchModelTree, // 明细信息的分类级联
-    saveIPQCSubmitResult, // 保存检验结果
-    checkCompleted, // 判断主信息和明细信息是否已填写
-    selectModelByPartNo, // 物料编码失去焦点事件
-    saveIPQCSubDetailed, // 新增子明细信息
-    selectIPQCSubDetailedRecord,
-    checkIPQCIsSubmit, // 检查是否已提交
-    workOrderSearch, // 查询工单列表
-    selectInformationByWorkOrderNo, // 工单号失去焦点事件
-    checkIPQCSubDetailValue // 检查子明细中的实测值是否在规定范围
+    qcIQCInspectionSearch, // IQC检验记录查询
+    iqcDetailSearch, // iqc检验记录查询
+    inspectorSearch, // 检验员查询
+    selectIQCSubDetailedRecord, // 查询子明细记录
+    checkIQCSubDetailValue, // 检查子明细中的实测值是否在规定范围
+    saveIQCDetailedRecord, // 新增明细信息
+    checkIQCIsSubmit, // 检查是否已提交
+    saveIQCSubDetailed, // 新增子明细信息
+    saveIQCSubmitResult, // 审核
+    iqcRecordDelete, // 删除检验记录
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
+  import {getFileContentList} from '@/api/eam/eam_object_list.js';
+  import {deleteObjectFile} from '@/api/eam/eam.js';
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcFAIUploadFile from "./qc_FAI_upload_file";
+  import axios from 'axios'
+  import Vue from 'vue'
   export default {
     components: {
-      Chooselist
+      Chooselist,
+      qcFAIUploadFile
     },
     watch: {
-      searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.isQualified = this.searchData.isQualified.toUpperCase()
-          //
-          this.searchData.inspectionNo = this.searchData.inspectionNo.toUpperCase()
-        }
-      },
-      modalData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.modalData.isQualified = this.modalData.isQualified.toUpperCase()
-          this.modalData.inspectionNo = this.modalData.inspectionNo.toUpperCase()
-        }
-      },
-      detailData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.modalData.isQualified = this.modalData.isQualified.toUpperCase()
-          this.modalData.inspectionNo = this.modalData.inspectionNo.toUpperCase()
-        }
-      },
 
     },
     data () {
       return {
         // 是否收藏
         favorite: false,
-
         // 导出 start
         exportData: [],
-        exportName: "IPQC检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["IPQC检验录入"],
+        exportName: "IQC检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["IQC检验录入"],
         exportFooter: [],
         exportList:[],
         // 导出 end
-
-        checkCompletedData:{
-          inspectionNo: ''
-        },
         submitData:{
           site:'',
           inspectionNo: '',
           isQualified: '',
           isQualifiedChinese: '',
         },
-
         tagNo:'',
         searchData: {
           site: this.$store.state.user.site,
           inspectionNo: '',
           inspectionTypeNo:'103',
-          inspectorNo: '',
           isQualified: '',
-          familyType:'D',
+          startDate: '',
+          endDate: '',
           partNo:'',
           partDesc:'',
+          state: '',
           page: 1,
           limit: 10,
         },
-        workOrderData: {
-          site: this.$store.state.user.site,
-          // page: 1,
-          // limit: 10,
-        },
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
@@ -401,8 +402,6 @@
         dataList: [],
         dataListLoading: false,
         dataListSelections: [],
-        inspectionRecordsFlag: false,
-        modalDisableFlag: false,
         submitFlag: false,
         modalData: {
           flag:'',
@@ -427,83 +426,78 @@
         // 展示列集
         columnList: [
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TableSite',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'site',
+            columnProp: 'inspectionNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '工厂编码',
+            columnLabel: '检验单号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 40,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanID',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'inspectionNo',
+            columnProp: 'state',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'inspectionResult',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'taskDate',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验编码',
+            columnLabel: '任务生成日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanDesc',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'workOrderNumber',
+            columnProp: 'inspectionCycle',
             headerAlign: "center",
             align: "left",
-            columnLabel: '工单号',
+            columnLabel: '检验周期(h)',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanDesc',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'reelNumber',
+            columnProp: 'rollNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '取样所在卷号',
+            columnLabel: '标签条码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanDesc',
-            tableId: "301005Table",
-            tableName: "检验记录表",
             columnProp: 'partNo',
             headerAlign: "center",
             align: "left",
@@ -514,14 +508,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanDesc',
-            tableId: "301005Table",
-            tableName: "检验记录表",
             columnProp: 'partDesc',
             headerAlign: "center",
             align: "left",
@@ -532,51 +520,69 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 180,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePlanDesc',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'inspectionTypeName',
+            columnProp: 'rollQty',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验类型',
+            columnLabel: '送检数量',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TableObjectID',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'inspectorName',
+            columnProp: 'samplingQty',
             headerAlign: "center",
             align: "left",
-            columnLabel: '质检员',
+            columnLabel: '抽样数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'supplierNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '供应商',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置措施',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePropertiesCode',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'createTime',
+            columnProp: 'disposalRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'inspectorDate',
             headerAlign: "center",
             align: "left",
             columnLabel: '检验时间',
@@ -586,213 +592,262 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005TablePropertiesCode',
-            tableId: "301005Table",
-            tableName: "检验记录表",
-            columnProp: 'isQualifiedChinese',
+            columnProp: 'inspectorNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '是否合格',
+            columnLabel: '质检员',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80,
-          }
+          },
+          {
+            columnProp: 'inspectionRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '质检备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
         ],
-        detailData:{
-          site:'',
-          inspectionNo:'',
-          functionType:'',
-          familyType:'',
-          detailCodeNo:'',
-          subDetailCodeNo:'',
-          inspectorNo:'',
-          userId:this.$store.state.user.name
-        },
-        masterInformationFlag:false,
-        detailInformationFlag:false,
-        masterList: [],
-        detailList:[],
-        saveInformationData:{
-          inspectionNo:'',
-          itemList:[],
-        },
         detailColumnList: [
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemID',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
-            columnProp: 'itemNo',
+            columnProp: 'itemDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '项目编码',
+            columnLabel: '检验项目',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 90,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
-            columnProp: 'itemDesc',
+            columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '项目名称',
+            columnLabel: '检验水平',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 90,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
-            columnProp: 'valueType',
+            columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '项目类型',
+            columnLabel: '检验方案',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 50,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
-            columnProp: 'methodName',
+            columnProp: 'objectDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '方法名称',
+            columnLabel: '检测仪器',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 90,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
-            columnProp: 'methodRemark',
+            columnProp: 'aql',
             headerAlign: "center",
             align: "left",
-            columnLabel: '方法描述',
+            columnLabel: 'AQL',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'ac',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: 'AC',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 're',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: 'RE',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 90,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
             columnProp: 'defaultValue',
             headerAlign: "center",
             align: "left",
-            columnLabel: '默认值',
+            columnLabel: '标准值',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 50,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
             columnProp: 'maxValue',
             headerAlign: "center",
             align: "left",
-            columnLabel: '最大值',
+            columnLabel: '上限值',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 50,
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 301005,
-            serialNumber: '301005Table3EamPropertiesItemDesc',
-            tableId: "301005Table3",
-            tableName: "明细信息表",
             columnProp: 'minValue',
             headerAlign: "center",
             align: "left",
-            columnLabel: '最小值',
+            columnLabel: '下限值',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 50,
-          }
+          },
+          {
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检测值类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
         ],
-
-        // 子明细数据对象
-        tableData: {
-          defaultValue: '',
-          maxValue: '',
-          minValue: '',
-          valueTypeDb: '',
-          dataArray:[]
+        fileColumnList: [
+          {
+            columnProp: 'fileName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '文件名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'createdBy',
+            headerAlign: "center",
+            align: 'left',
+            columnLabel: '上传人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            columnProp: 'createDate',
+            headerAlign: "center",
+            align: 'left',
+            columnLabel: '上传时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            columnProp: 'orderRef3',
+            headerAlign: "center",
+            align: 'left',
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+        ],
+        detailData:{
+          site: this.$store.state.user.site,
+          inspectionNo: '',
+          partNo: '',
+          partDesc: '',
+          rollQty: '',
+          samplingQty: '',
+          unqualifiedQty: 0,
+          unqualifiedQuantity: '',
+          disposalMeasures: '',
+          disposalRemark: '',
+          inspectionResult: '',
+          inspectorNo: '',
+          inspectionRemark: '',
+          submitFlag: '',
+          supplierNo: '',
         },
+        detailInformationFlag: false,
+        detailList:[],
+        saveInformationData:{
+          site: this.$store.state.user.site,
+          inspectionNo:'',
+          disposalMeasures: '',
+          disposalRemark: '',
+          inspectorNo: '',
+          inspectionRemark: '',
+          itemList:[],
+        },
+        // 子明细数据对象
+        tableData: [],
         checkedDetail: [],
         subDetailFlag: false,
         subDetailData: {
+          site: this.$store.state.user.site,
           inspectionNo: '',
           itemNo: '',
           itemDesc: '',
-          methodName: '',
-          methodRemark: '',
           defaultValue: '',
           maxValue: '',
           minValue: '',
           subDetailValues:[]
-        }
+        },
+        options: [],
+        fileFlag: false,
+        fileContentList: [],
+        examineFlag: false,
       }
     },
     mounted () {
@@ -805,22 +860,102 @@
       this.favoriteIsOk()
     },
     methods: {
-
+      //刷新派设备文档的列表
+      getFileContentData(row) {
+        let currentData = {
+          orderRef2: row.inspectionNo
+        };
+        getFileContentList(currentData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 200) {
+            this.fileContentList = data.rows;
+          } else {
+            this.fileContentList = [];
+          }
+        })
+        this.fileFlag = true;
+      },
+      /*新增文件的modal*/
+      addUploadFileModal(){
+        let currentData = {
+          site: this.$store.state.user.site,
+          createBy: this.$store.state.user.name,
+          inspectionNo: this.detailData.inspectionNo,
+          remark: '',
+        };
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcFAIUploadFile.init(currentData);
+        })
+      },
+      downloadFile(row){
+        axios.get('/proxyApi/pms/eamObject/downLoadObjectFile/' + row.id, {
+          responseType: 'blob',
+          headers: {
+            'Content-Type': 'application/json',
+            'token': Vue.cookie.get('token')
+          }
+        }).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)
+        })
+      },
+      // 删除文件
+      deleteFile(row){
+        this.$confirm('确定要删除此文件?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteObjectFile(row).then(({data}) => {
+            if (data && data.code == 0) {
+              this.getFileContentData(row);
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
 
       // 清空搜索栏
       doEmpty(){
         this.searchData = {
           site: this.$store.state.user.site,
           inspectionNo: '',
-          inspectionTypeNo: '103',
-          inspectorNo: '',
+          inspectionTypeNo:'103',
           isQualified: '',
-          familyType:'D',
-          page: 1,
-          limit: 10,
+          startDate: '',
+          endDate: '',
+          partNo:'',
+          partDesc:'',
+          state: '',
         }
       },
-
       // 获取基础数据列表S
       getBaseList (val,type) {
         this.tagNo = val
@@ -847,12 +982,11 @@
           this.modalData.inspectorName = val.inspector_name
         }
       },
-
       // 获取主信息数据列表
       getDataList () {
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
-        qcInspectionInformationSearch(this.searchData).then(({data}) => {
+        qcIQCInspectionSearch(this.searchData).then(({data}) => {
           if (data.code == 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
@@ -862,7 +996,6 @@
           this.dataListLoading = false
         })
       },
-
       // 每页数
       sizeChangeHandle (val) {
         this.pageSize = val
@@ -878,28 +1011,14 @@
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },
-      // 新增检验记录
-      addInspectionRecords(){
-        this.modalData={
-          flag:'1',
-          //functionType:'E',
-          site: this.$store.state.user.site,
-          inspectionNo: '',
-          workOrderNumber: '',
-          workOrderQuantity: '',
-          reelNumber: '',
-          partNo: '',
-          rollingQuantity: '',
-          sampleQuantity: '',
-          subDetailCodeNo:'',
-          inspectionTypeNo:'103',
-          inspectorNo:'',
-          isQualified:''
-        };
-        this.modalDisableFlag = false;
-        this.inspectionRecordsFlag = true;
+      // 查询检验类型
+      inspectorSearch(){
+        inspectorSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.options = data.rows
+          }
+        })
       },
-
       // 删除检验记录
       deleteModal (row) {
         this.$confirm(`是否删除这条检验记录?`, '提示', {
@@ -907,7 +1026,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          faiRecordDelete(row).then(({data}) => {
+          iqcRecordDelete(row).then(({data}) => {
             if (data && data.code ==0) {
               this.getDataList()
               this.$message({
@@ -926,68 +1045,36 @@
         }).catch(() => {
         })
       },
-
-      // 新增检验记录
-      saveData(){
-        if (this.modalData.detailCodeNo == '' || this.modalData.detailCodeNo == null) {
-          this.$alert('该工单的物料和分类模板不存在，请维护！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
-        if (this.modalData.inspectorNo == '' || this.modalData.inspectorNo == null) {
-          this.$alert('请选择质检员！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
-        if (this.modalData.reelNumber == '' || this.modalData.reelNumber == null) {
-          this.$alert('请填写卷号！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
-        if (this.modalData.rollingQuantity == '' || this.modalData.rollingQuantity == null) {
-          this.$alert('请填写收卷数量！', '错误', {
+      Transfer(){
+        if (this.detailData.inspectionResult == '' || this.detailData.inspectionResult == null) {
+          this.$alert('请选择检验结论！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.sampleQuantity == '' || this.modalData.sampleQuantity == null) {
-          this.$alert('请填写首件取样数量！', '错误', {
+        if (this.detailData.inspectorNo == '' || this.detailData.inspectorNo == null) {
+          this.$alert('请选择检验员！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if(this.modalData.flag == '1'){
-          this.modalData.isQualified = 'D'
-          this.modalData.isQualifiedChinese = '待提交'
-          qcInspectionInformationSave(this.modalData).then(({data}) => {
-            if (data && data.code === 0) {
-              this.getDataList()
-              this.inspectionRecordsFlag = false
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                }
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        }
-      },
-
-      Transfer(){
+        // if (this.detailData.inspectionResult == 'Y' && (this.detailData.disposalMeasures == '特采' || this.detailData.disposalMeasures == '拒收')) {
+        //   this.$alert('合格不予处置措施，请查看！', '错误', {
+        //     confirmButtonText: '确定'
+        //   })
+        //   return false
+        // }
         for (let i = 0; i < this.detailList.length; i++) {
+          if(this.detailList[i].itemResult == '' || this.detailList[i].itemResult == null){
+            this.$alert(this.detailList[i].itemDesc+'是否合格未确认！', '错误', {
+              confirmButtonText: '确定'
+            })
+            return false
+          }
           if(this.detailList[i].valueTypeDb == 'N') {
-            checkIPQCSubDetailValue(this.detailList[i]).then(({data}) => {
-              if (data.flag == 2 && this.detailList[i].isQualified == 'Y') {
-                this.$confirm(this.detailList[i].itemDesc + '子明细中实测值不在合格范围！是否保存为合格', '提示', {
+            checkIQCSubDetailValue(this.detailList[i]).then(({data}) => {
+              if (data.flag == 2 && this.detailList[i].itemResult == 'Y') {
+                this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', {
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning'
@@ -996,46 +1083,23 @@
                 }).then(() => {
                   return false
                 })
+              }else {
+                this.saveDetailInformation()
               }
             })
           }
         }
       },
-
       // 新增明细信息
-      async saveDetailInformation(){
-        for (let i = 0; i < this.detailList.length; i++) {
-          if(this.detailList[i].isQualified == '' || this.detailList[i].isQualified == null){
-            this.$alert(this.detailList[i].itemDesc+'是否合格未确认！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
-          }
-          if(this.detailList[i].valueTypeDb == 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){
-            if(this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue && this.detailList[i].isQualified == 'Y'){
-              await this.$confirm(this.detailList[i].itemDesc+'实测值小于最小值！是否保存为合格', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }).then(() => {
-              }).then(() =>{
-                return false
-              })
-            }
-            if(this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue && this.detailList[i].isQualified == 'Y'){
-              await this.$confirm(this.detailList[i].itemDesc+'实测值大于最大值！是否保存为合格', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }).then(() => {
-              }).then(() =>{
-                return false
-              })
-            }
-          }
-        }
+      saveDetailInformation(){
+        this.saveInformationData.inspectionNo = this.detailData.inspectionNo
+        this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures
+        this.saveInformationData.disposalRemark = this.detailData.disposalRemark
+        this.saveInformationData.inspectorNo = this.detailData.inspectorNo
+        this.saveInformationData.inspectionResult = this.detailData.inspectionResult
+        this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
-        saveIPQCDetailedRecord(this.saveInformationData.itemList).then(({data}) => {
+        saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code == '0') {
             this.getDataList()
             this.detailInformationFlag = false
@@ -1053,95 +1117,86 @@
           }
         })
       },
-
       // 明细记录信息查询
       detailModal(row){
-        this.detailData.site = row.site
-        this.detailData.detailCodeNo = row.detailCodeNo
+        this.detailData.site = this.$store.state.user.site
         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
-        detailInformationSearch(this.detailData).then(({data}) => {
+        this.detailData.inspectionRemark = row.inspectionRemark
+        iqcDetailSearch(this.detailData).then(({data}) => {
           this.detailList = data.rows
         })
+        this.inspectorSearch();
         this.detailInformationFlag = true;
       },
-
       // 子明细记录信息查询
       subDetailModal(row){
         this.subDetailData.inspectionNo = row.inspectionNo;
         this.subDetailData.itemNo = row.itemNo;
         this.subDetailData.itemDesc = row.itemDesc;
-        this.subDetailData.methodName = row.methodName;
-        this.subDetailData.methodRemark = row.methodRemark;
         this.subDetailData.defaultValue = row.defaultValue;
         this.subDetailData.maxValue = row.maxValue;
         this.subDetailData.minValue = row.minValue;
-        this.tableData.defaultValue = row.defaultValue;
-        this.tableData.maxValue = row.maxValue;
-        this.tableData.minValue = row.minValue;
-        this.tableData.valueTypeDb = row.valueTypeDb;
-        selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => {
-          this.tableData.dataArray = data.rows
+        selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => {
+          this.tableData = data.rows
         })
         this.subDetailFlag = true;
       },
-
       // 提交按钮
       submitResult(row){
+        if (row.inspectionResult == '不合格' && (row.disposalMeasures == '' || row.disposalMeasures == null)){
+          this.$alert('处置措施未选择！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         this.submitData.site = row.site
-        this.submitData.inspectionNo = row.inspectionNo;
-        this.checkCompletedData.inspectionNo = row.inspectionNo;
-        // 判断主信息和明细信息是否已填写
-        checkCompleted(this.checkCompletedData).then(({data}) =>{
-          if (data && data.code == '1') {
-            this.submitFlag = true;
-          }else {
-            this.$alert(data.msg, '错误！', {
-              confirmButtonText: '确定'
-            })
-          }
-        })
+        this.submitData.inspectionNo = row.inspectionNo
+        this.submitData.inspectionResult = row.inspectionResult
+        this.examineFlag = true
       },
-
       // 保存提交结果
       saveSubmitResult(){
-        if (this.submitData.isQualified == '' || this.submitData.isQualified == null){
-          this.$alert('请选择是否合格！', '错误', {
-            confirmButtonText: '确定'
+        this.$confirm( '是否将该记录保存为 ' + this.submitData.inspectionResult + '？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          saveIQCSubmitResult(this.submitData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.examineFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
           })
+        }).then(() => {
           return false
-        }
-        if (this.submitData.isQualified == 'Y'){
-          this.submitData.isQualifiedChinese = '合格'
-        }
-        if (this.submitData.isQualified == 'N'){
-          this.submitData.isQualifiedChinese = '不合格'
-        }
-        saveIPQCSubmitResult(this.submitData).then(({data}) => {
-          if (data && data.code === 0) {
-            this.getDataList()
-            this.submitFlag = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-              }
-            })
-          } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
-          }
         })
       },
-
-
       // 子明细方法
-
       //表格的新增
       rowClassName({ row, rowIndex }) {
-        row.valueIndex = rowIndex + 1;
+        row.xh = rowIndex + 1;
       },
       //单选框选中数据
       handleDetailSelectionChange(selection) {
@@ -1149,12 +1204,13 @@
       },
       //点击新增更多
       handleAddBtn(td) {
-        checkIPQCIsSubmit(td).then(({data}) => {
+        checkIQCIsSubmit(td).then(({data}) => {
           if (data.flag != 1) {
             let obj = {};
             obj.subDetailValue = "";
             obj.samplingLocation = "";
-            this.tableData.dataArray.push(obj);
+            this.tableData.push(obj);
+            console.log(this.tableData)
           } else {
             this.$alert("记录已提交！", '错误', {
               confirmButtonText: '确定'
@@ -1164,7 +1220,7 @@
       },
       //删除
       handleDeleteBtn(td) {
-        checkIPQCIsSubmit(td).then(({data}) => {
+        checkIQCIsSubmit(td).then(({data}) => {
           if (data.flag != 1) {
             if (this.checkedDetail.length == 0) {
               this.$alert("请先选择要删除的数据", "提示", {
@@ -1179,9 +1235,9 @@
                   if (action === "confirm") {
                     let val = this.checkedDetail;
                     val.forEach((val, index) => {
-                      this.tableData.dataArray.forEach((v, i) => {
-                        if (val.valueIndex === v.valueIndex) {
-                          this.tableData.dataArray.splice(i, 1);
+                      this.tableData.forEach((v, i) => {
+                        if (val.xh === v.xh) {
+                          this.tableData.splice(i, 1);
                         }
                       });
                     });
@@ -1189,7 +1245,6 @@
                       message: "删除成功，记得保存修改喔！",
                       type: "success",
                     });
-                    //this.$refs.tb.clearSelection();
                     return;
                   } else {
                     this.$message({
@@ -1207,23 +1262,15 @@
             })
           }
         })
-
-
       },
-      //红色五角星提示
-      starAdd(obj) {
-        if (obj.columnIndex === 2 || obj.columnIndex === 3) {
-          return "star";
-        }
-      },
-
+      // 新增子明细记录
       saveSubDetailResult(){
-        this.subDetailData.subDetailValues = this.tableData.dataArray
-        saveIPQCSubDetailed(this.subDetailData).then(({data}) => {
+        this.subDetailData.subDetailValues = this.tableData
+        saveIQCSubDetailed(this.subDetailData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
             this.subDetailFlag = false
-            this.tableData.dataArray = []
+            this.tableData = []
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1239,34 +1286,6 @@
         })
       },
 
-      // 工单号失去焦点事件
-      workOrderBlur(){
-        let inData = {
-          site: this.modalData.site,
-          workOrderNumber: this.modalData.workOrderNumber
-        }
-        selectInformationByWorkOrderNo(inData).then(({data}) => {
-          if(data.rows.length > 0){
-            this.modalData.partNo = data.rows[0].partNo
-            this.modalData.workOrderQuantity = data.rows[0].lotSize
-            selectModelByPartNo(this.modalData).then(({data}) => {
-              if(data.rows != null){
-                this.modalData.detailCodeNo = data.rows[0].codeNo
-                this.modalData.detailCodeDesc = data.rows[0].detailCodeDesc
-                this.detailData.functionType = data.rows[0].functionType
-              }else {
-                this.modalData.detailCodeNo = ''
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
-          }else {
-            this.modalData.partNo = ''
-          }
-        })
-      },
-
       // 校验用户是否收藏
       favoriteIsOk() {
         let userFavorite = {
@@ -1282,7 +1301,6 @@
               // flag=true;
             }
           }
-
         })
       },
       // 收藏 OR 取消收藏
@@ -1316,15 +1334,13 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await qcInspectionInformationSearch(this.searchData).then(({data}) => {
+        await qcIQCInspectionSearch(this.searchData).then(({data}) => {
           this.exportList= data.page.list;
         })
-
         return this.exportList;
       },
       startDownload() {
         //  this.exportData = this.dataList
-
       },
       finishDownload() {
 
@@ -1340,11 +1356,9 @@
         })
         json += "}"
         let s = eval("(" + json + ")")
-
         return s
       },
       // 导出 end
-
     }
   }
 </script>
diff --git a/src/views/modules/qc/qcFamilyAttribute.vue b/src/views/modules/qc/qcFamilyAttribute.vue
index b059250..9e0e43b 100644
--- a/src/views/modules/qc/qcFamilyAttribute.vue
+++ b/src/views/modules/qc/qcFamilyAttribute.vue
@@ -20,8 +20,7 @@
         <el-button type="primary" @click="addModal()">新增</el-button>
       </el-form-item>
       <el-form-item  :label="' '">
-        <input ref="file" type="file" accept=".xlsx,.xls" style="display: none;" @change="uploadFile">
-        <el-button type="primary" icon="el-icon-upload" @click="clickFile">导入</el-button>
+        <el-button type="primary" icon="el-icon-upload" @click="qcUpload()">导入</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -316,6 +315,8 @@
       </el-footer>
     </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 导入 -->
+    <qcUpload ref="qcUpload" @refreshPageTables="getDataList()" v-drag></qcUpload>
   </div>
 </template>
 
@@ -329,15 +330,15 @@
     deletePartAttributeDetails, // 删除分类属性模板
     searchPartAttributeDetails, // 查询物料属性模板
     saveAttributeDetailed, // 新增物料属性模板详情
-    uploadFamilyAttributeExcel, // 导入
-    searchModalDetails,
     getItemLists // 获取模板列表
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcUpload from "./qc_upload";
   export default {
     components: {
-      Chooselist
+      Chooselist,
+      qcUpload
     },
     watch: {
 
@@ -390,11 +391,23 @@
           createBy: this.$store.state.user.name
         },
         columnList: [
+          {
+            columnProp: 'familyID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料类别编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'familyName',
             headerAlign: "center",
             align: "left",
-            columnLabel: '物料分类名称',
+            columnLabel: '物料类别名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -811,47 +824,6 @@
           this.detailList = data.rows
         })
       },
-      // // 保存模板中的项目明细
-      // saveModalDetails(){
-      //   if(this.detailData.itemNo == "" || this.detailData.itemNo == null){
-      //     this.$alert('请选择检验项目编码！', '错误', {
-      //       confirmButtonText: '确定'
-      //     })
-      //     return false
-      //   }
-      //   saveModalDetails(this.detailData).then(({data}) => {
-      //     if (data && data.code == 0) {
-      //       searchModalDetails(this.detailData).then(({data}) => {
-      //         this.detailList = data.rows
-      //       })
-      //       this.addDetailModalFlag=false;
-      //       this.$message({
-      //         message: '操作成功',
-      //         type: 'success',
-      //         duration: 1500,
-      //         onClose: () => {
-      //         }
-      //       })
-      //     } else {
-      //       this.$alert(data.msg, '错误', {
-      //         confirmButtonText: '确定'
-      //       })
-      //     }
-      //   })
-      // },
-      // itemNoBlur(){
-      //   let inData={
-      //     itemType:'D',
-      //     itemNo:this.detailData.itemNo
-      //   }
-      //   qcCheckOutItemSearch(inData).then(({data}) => {
-      //    if(data.rows.length>0){
-      //      this.detailData.itemDesc = data.rows[0].itemDesc
-      //    }else {
-      //      this.detailData.itemDesc=''
-      //    }
-      //   })
-      // },
       // 删除物料属性中的模板
       deletePartAttributeDetails(row){
         this.$confirm(`是否删除这个检验模板?`, '提示', {
@@ -960,33 +932,14 @@
       // 导出 end
 
       // 导入
-      clickFile() {
-        this.$refs.file.dispatchEvent(new MouseEvent('click'))
-      },
-      async uploadFile() {
-        const file = this.$refs.file.files
-        let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
-        if (extName === '.xlsx' || extName === '.xls') {
-          let formData = new FormData()
-          formData.append('file', file[0])
-          uploadFamilyAttributeExcel(formData).then(({data}) => {
-            if(data.code === 0) {
-              this.getDataList()
-              this.$message({
-                type: 'success',
-                message: '数据导入成功!'
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        }
-        else {
-          this.$message.error('数据导入失败，请选择正确的xlsx模板文件')
-        }
-        this.load();
+      qcUpload(){
+        let currentData = {
+          flag: 'familyAttribute',
+        };
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcUpload.init(currentData);
+        })
       },
 
     }
diff --git a/src/views/modules/qc/qcItemMaintenance.vue b/src/views/modules/qc/qcItem.vue
similarity index 82%
rename from src/views/modules/qc/qcItemMaintenance.vue
rename to src/views/modules/qc/qcItem.vue
index 1f6853e..fd76b42 100644
--- a/src/views/modules/qc/qcItemMaintenance.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -8,19 +8,15 @@
     </div>
     <!-- 条件查询 -->
     <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'项目编码'">
-        <el-input v-model="searchData.itemNo"  style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'项目名称'">
         <el-input v-model="searchData.itemDesc"  style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-button type="primary" @click="getDataList()">查询</el-button>
         <el-button  type="primary" @click="addModal()">新增</el-button>
       </el-form-item>
       <el-form-item :label="' '">
-        <input ref="file" type="file" accept=".xlsx,.xls" style="display: none;" @change="uploadFile">
-        <el-button type="primary" icon="el-icon-upload" @click="clickFile">导入</el-button>
+        <el-button type="primary" icon="el-icon-upload" @click="qcUpload()">导入</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -68,7 +64,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="updateModal(scope.row)">编辑</a>
-          <a type="text" size="small" @click="deleteEamPropertiesItem(scope.row)">删除</a>
+          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
         </template>
       </el-table-column>
     </el-table>
@@ -86,6 +82,15 @@
           </el-select>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(1036)"><a herf="#">检验方法编码</a></span>
+          <el-input v-model="modalData.methodNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验方法名称:">
+          <el-input v-model="modalData.methodName" disabled style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="参照值:">
           <el-input v-if="modalData.valueTypeDb == 'T'" v-model="modalData.defaultValue" style="width: 120px"></el-input>
@@ -100,31 +105,32 @@
           <el-input v-if="modalData.valueTypeDb == 'N'" v-model="modalData.minValue" type="number" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验方法说明:">
-          <el-input v-model="modalData.itemRemark" style="width: 390px"></el-input>
-        </el-form-item>
-      </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 导入 -->
+    <qcUpload ref="qcUpload" @refreshPageTables="getDataList()" v-drag></qcUpload>
   </div>
 </template>
 
 <script>
   import {
-    qcCheckOutItemSearch, // 查询项目
-    qcCheckOutItemSave, // 新增项目
-    qcCheckOutItemUpdate, // 修改项目
-    qcCheckOutItemDelete, // 删除项目
-    uploadExcel // 导入文件
+    qcItemSearch, // 查询项目
+    qcItemSave, // 新增项目
+    qcItemUpdate, // 修改项目
+    qcItemDelete, // 删除项目
   } from "@/api/qc/qc.js"
+  import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcUpload from "./qc_upload";
   export default {
     components: {
-
+      Chooselist,
+      qcUpload
     },
     watch: {
       searchData: {
@@ -142,10 +148,8 @@
     },
     data () {
       return {
-
         // 是否收藏
         favorite: false,
-
         // 导出 start
         exportData: [],
         exportName: "检验项目" + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -153,7 +157,6 @@
         exportFooter: [],
         exportList:[],
         // 导出 end
-
         searchData: {
           itemNo: '',
           itemDesc: '',
@@ -175,6 +178,8 @@
           minValue: '',
           itemRemark: '',
           itemType: 'D',
+          methodNo: '',
+          methodName: ''
         },
         // 检验项目展示标头
         columnList: [
@@ -182,7 +187,7 @@
             columnProp: 'itemNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '检验明细编码',
+            columnLabel: '检验项目编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -194,7 +199,7 @@
             columnProp: 'itemDesc',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '检验明细名称',
+            columnLabel: '检验项目名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -203,7 +208,19 @@
             fixed: '',
           },
           {
-            columnProp: 'itemRemark',
+            columnProp: 'methodName',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '检验方法',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'methodRemark',
             headerAlign: 'center',
             align: 'left',
             columnLabel: '检验方法说明',
@@ -275,30 +292,48 @@
       this.favoriteIsOk()
     },
     methods: {
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1036) {
+            strVal = this.modalData.methodNo
+            this.$refs.baseList.init(val, strVal)
+          }
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1036) {
+          this.modalData.methodNo = val.method_no
+          this.modalData.methodName = val.method_name
+        }
+      },
       // 获取数据列表
       getDataList () {
-        qcCheckOutItemSearch(this.searchData).then(({data}) => {
+        qcItemSearch(this.searchData).then(({data}) => {
           this.dataList = data.rows
         })
       },
-
       addModal () {
         this.modalData = {
           flag: '1',
+          createdBy: this.$store.state.user.name,
           itemNo: '',
           itemDesc: '',
           valueTypeDb: 'T',
           defaultValue: '',
-          createdBy: this.$store.state.user.name,
           maxValue: '',
           minValue: '',
           itemRemark: '',
-          itemType: 'D'
+          itemType: 'D',
+          methodNo: '',
+          methodName: ''
         }
         this.modalDisableFlag = false
         this.modalFlag = true
       },
-
       updateModal (row) {
         this.modalData = {
           flag: '2',
@@ -311,19 +346,21 @@
           minValue: row.minValue,
           itemRemark: row.itemRemark,
           itemType: 'D',
+          methodNo: row.methodNo,
+          methodName: row.methodName
         }
         this.modalDisableFlag = true
         this.modalFlag = true
       },
       // 删除
-      deleteEamPropertiesItem (row) {
+      deleteModal (row) {
         this.$confirm(`是否删除这个检验项目?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          qcCheckOutItemDelete(row).then(({data}) => {
-            if (data && data.code === '0') {
+          qcItemDelete(row).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.$message({
                 message: '操作成功',
@@ -354,9 +391,15 @@
           })
           return false
         }
+        if (this.modalData.methodNo == '' || this.modalData.methodNo == null) {
+          this.$alert('请选择检验方法！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         if (this.modalData.flag == '1') {
-          qcCheckOutItemSave(this.modalData).then(({data}) => {
-            if (data && data.code === '0') {
+          qcItemSave(this.modalData).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.modalFlag = false
               this.$message({
@@ -373,8 +416,8 @@
             }
           })
         } else {
-          qcCheckOutItemUpdate(this.modalData).then(({data}) => {
-            if (data && data.code === '0') {
+          qcItemUpdate(this.modalData).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.modalFlag = false
               this.$message({
@@ -442,15 +485,13 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await qcCheckOutItemSearch(this.searchData).then(({data}) => {
+        await qcItemSearch(this.searchData).then(({data}) => {
           this.exportList= data.rows;
         })
-
         return this.exportList;
       },
       startDownload() {
         //  this.exportData = this.dataList
-
       },
       finishDownload() {
 
@@ -466,39 +507,19 @@
         })
         json += "}"
         let s = eval("(" + json + ")")
-
         return s
       },
       // 导出 end
 
       // 导入
-      clickFile() {
-        this.$refs.file.dispatchEvent(new MouseEvent('click'))
-      },
-      async uploadFile() {
-        const file = this.$refs.file.files
-        let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
-        if (extName === '.xlsx' || extName === '.xls') {
-          let formData = new FormData()
-          formData.append('file', file[0])
-          uploadExcel(formData).then(({data}) => {
-            if(data.code === 0) {
-              this.getDataList()
-              this.$message({
-                type: 'success',
-                message: '数据导入成功!'
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        }
-        else {
-          this.$message.error('数据导入失败，请选择正确的xlsx模板文件')
-        }
-        this.load();
+      qcUpload(){
+        let currentData = {
+          flag: 'item',
+        };
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcUpload.init(currentData);
+        })
       },
 
     }
diff --git a/src/views/modules/qc/qcCheckOutMethod.vue b/src/views/modules/qc/qcMethod.vue
similarity index 77%
rename from src/views/modules/qc/qcCheckOutMethod.vue
rename to src/views/modules/qc/qcMethod.vue
index dcf6c2f..ac70636 100644
--- a/src/views/modules/qc/qcCheckOutMethod.vue
+++ b/src/views/modules/qc/qcMethod.vue
@@ -8,13 +8,10 @@
     </div>
     <!-- 条件查询 -->
     <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'检验方法编码'">
-        <el-input v-model="searchData.methodNo"  style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'检验方法名称'">
+      <el-form-item :label="'检验方法'">
         <el-input v-model="searchData.methodName"  style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-button type="primary" @click="getDataList()">查询</el-button>
         <el-button type="primary" @click="addModal()">新增</el-button>
         <download-excel
@@ -64,7 +61,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
-          <a type="text" size="small" @click="deleteEamPropertiesItem(scope.row)">删除</a>
+          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
         </template>
       </el-table-column>
     </el-table>
@@ -72,9 +69,6 @@
     <!-- 新增和修改 -->
     <el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验方法编码:">
-          <el-input v-model="modalData.methodNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item label="检验方法名称:">
           <el-input v-model="modalData.methodName"  style="width: 120px"></el-input>
         </el-form-item>
@@ -94,39 +88,20 @@
 
 <script>
   import {
-    qcCheckOutMethodSearch,
-    qcCheckOutMethodSave,
-    qcCheckOutMethodUpdate,
-    qcCheckOutMethodDelete,
+    qcMethodSearch, // 检验方法查询
+    qcMethodSave, // 检验方法新增
+    qcMethodUpdate, // 检验方法修改
+    qcMethodDelete, // 检验方法删除
   } from "@/api/qc/qc.js"
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
   export default {
     watch: {
-      searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.methodNo = this.searchData.methodNo.toUpperCase()
-        }
-      },
 
-      methodData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.methodData.methodNo = this.methodData.methodNo.toUpperCase()
-        }
-      },
-      modalData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.modalData.methodNo = this.modalData.methodNo.toUpperCase()
-        }
-      }
     },
     data () {
       return {
         // 是否收藏
         favorite: false,
-
         // 导出 start
         exportData: [],
         exportName: "检验方法" + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -134,11 +109,9 @@
         exportFooter: [],
         exportList:[],
         // 导出 end
-
         searchData: {
           methodNo: '',
           methodName: '',
-          methodType: 'D'
         },
         height: 200,
         dataList: [],
@@ -149,7 +122,6 @@
           methodNo: '',
           valueNo: '',
           availableValue: '',
-          methodType: 'D',
           createBy: this.$store.state.user.name
         },
         modalData: {
@@ -158,63 +130,68 @@
           methodName: '',
           createBy: this.$store.state.user.name,
           methodRemark: '',
-          methodType: 'D'
         },
         // 标头展示
         columnList: [
           {
-            userId: this.$store.state.user.name,
-            functionId: 101008,
-            serialNumber: '101008TableEamPropertiesItemID',
-            tableId: '101008Table',
-            tableName: 'common',
             columnProp: 'methodNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '检验方法编码',
+            columnLabel: '方法编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 101008,
-            serialNumber: '101008TableEamPropertiesItemDesc',
-            tableId: '101008Table',
-            tableName: 'common',
             columnProp: 'methodName',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '检验方法名称',
+            columnLabel: '方法名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
           },
           {
-            userId: this.$store.state.user.name,
-            functionId: 101008,
-            serialNumber: '101008TableEamPropertiesItemRemark',
-            tableId: '101008Table',
-            tableName: 'common',
             columnProp: 'methodRemark',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '检验方法说明',
+            columnLabel: '方法说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '创建时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'createBy',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '创建人',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
           },
         ]
       }
@@ -229,10 +206,9 @@
       this.favoriteIsOk()
     },
     methods: {
-
       // 查询获取数据列表
       getDataList () {
-        qcCheckOutMethodSearch(this.searchData).then(({data}) => {
+        qcMethodSearch(this.searchData).then(({data}) => {
           this.dataList = data.rows
         })
       },
@@ -240,11 +216,10 @@
       addModal () {
         this.modalData = {
           flag: '1',
+          createBy: this.$store.state.user.name,
           methodNo: '',
           methodName: '',
-          createBy: this.$store.state.user.name,
           methodRemark: '',
-          methodType: 'D'
         }
         this.modalDisableFlag = false
         this.modalFlag = true
@@ -253,24 +228,23 @@
       updateModal (row) {
         this.modalData = {
           flag: '2',
+          createBy: this.$store.state.user.name,
           methodNo: row.methodNo,
           methodName: row.methodName,
-          createBy: this.$store.state.user.name,
           methodRemark: row.methodRemark,
-          methodType: 'D'
         }
         this.modalDisableFlag = true
         this.modalFlag = true
       },
       // 删除方法
-      deleteEamPropertiesItem (row) {
-        this.$confirm(`是否删除这个点检方法?`, '提示', {
+      deleteModal (row) {
+        this.$confirm(`是否删除这个检验方法?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          qcCheckOutMethodDelete(row).then(({data}) => {
-            if (data && data.code === '0') {
+          qcMethodDelete(row).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.$message({
                 message: '操作成功',
@@ -290,13 +264,6 @@
       },
       // 新增/修改方法
       saveData () {
-        console.log(this.modalData)
-        if (this.modalData.methodNo == '' || this.modalData.methodNo == null) {
-          this.$alert('请输入检验方法编码！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
         if (this.modalData.methodName == '' || this.modalData.methodName == null) {
           this.$alert('请输入检验方法名称！', '错误', {
             confirmButtonText: '确定'
@@ -304,8 +271,8 @@
           return false
         }
         if (this.modalData.flag == '1') { // 新增
-          qcCheckOutMethodSave(this.modalData).then(({data}) => {
-            if (data && data.code === '0') {
+          qcMethodSave(this.modalData).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.modalFlag = false
               this.$message({
@@ -322,8 +289,8 @@
             }
           })
         } else { // 修改
-          qcCheckOutMethodUpdate(this.modalData).then(({data}) => {
-            if (data && data.code === '0') {
+          qcMethodUpdate(this.modalData).then(({data}) => {
+            if (data && data.code == 0) {
               this.getDataList()
               this.modalFlag = false
               this.$message({
@@ -342,7 +309,6 @@
         }
       },
 
-
       // 校验用户是否收藏
       favoriteIsOk() {
         let userFavorite = {
@@ -358,7 +324,6 @@
               // flag=true;
             }
           }
-
         })
       },
       // 收藏 OR 取消收藏
@@ -392,15 +357,13 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await qcCheckOutMethodSearch(this.searchData).then(({data}) => {
+        await qcMethodSearch(this.searchData).then(({data}) => {
           this.exportList= data.rows;
         })
-
         return this.exportList;
       },
       startDownload() {
         //  this.exportData = this.dataList
-
       },
       finishDownload() {
 
@@ -416,7 +379,6 @@
         })
         json += "}"
         let s = eval("(" + json + ")")
-
         return s
       },
       // 导出 end
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 560189d..105b361 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -23,8 +23,7 @@
         <el-button type="primary" @click="addModal()">新增</el-button>
       </el-form-item>
       <el-form-item  :label="' '">
-        <input ref="file" type="file" accept=".xlsx,.xls" style="display: none;" @change="uploadFile">
-        <el-button type="primary" icon="el-icon-upload" @click="clickFile">导入</el-button>
+        <el-button type="primary" icon="el-icon-upload" @click="qcUpload()">导入</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -330,6 +329,8 @@
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 导入 -->
+    <qcUpload ref="qcUpload" @refreshPageTables="getDataList()" v-drag></qcUpload>
   </div>
 </template>
 
@@ -344,13 +345,14 @@
     saveAttributeDetailed, // 新增物料属性模板详情
     getItemLists, // 获取项目列表
     InspectionTypeSearch, // 搜索所有检验类型
-    uploadPartAttributeExcel // 导入文件
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcUpload from "./qc_upload";
   export default {
     components: {
-      Chooselist
+      Chooselist,
+      qcUpload
     },
     watch: {
 
@@ -359,7 +361,6 @@
       return {
         // 是否收藏
         favorite: false,
-
         // 导出 start
         exportData: [],
         exportName: "根据物料设置检验模板" + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -367,7 +368,6 @@
         exportFooter: [],
         exportList:[],
         // 导出 end
-
         tagNo: '',
         searchData: {
           partNo: '',
@@ -382,9 +382,8 @@
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
-        // addDetailModalFlag:false,
-        modalFlag:false,
-        modalDisableFlag:false,
+        modalFlag: false,
+        modalDisableFlag: false,
         modalData:{
           flag: '',
           partNo: '',
@@ -985,35 +984,15 @@
       },
       // 导出 end
 
-
       // 导入
-      clickFile() {
-        this.$refs.file.dispatchEvent(new MouseEvent('click'))
-      },
-      async uploadFile() {
-        const file = this.$refs.file.files
-        let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
-        if (extName === '.xlsx' || extName === '.xls') {
-          let formData = new FormData()
-          formData.append('file', file[0])
-          uploadPartAttributeExcel(formData).then(({data}) => {
-            if(data.code === 0) {
-              this.getDataList()
-              this.$message({
-                type: 'success',
-                message: '数据导入成功!'
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        }
-        else {
-          this.$message.error('数据导入失败，请选择正确的xlsx模板文件')
-        }
-        this.load();
+      qcUpload(){
+        let currentData = {
+          flag: 'partAttribute',
+        };
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcUpload.init(currentData);
+        })
       },
 
     }
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index 9450b3b..9c1e746 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -31,8 +31,7 @@
         <el-button type="primary" @click="addModal()">新增</el-button>
       </el-form-item>
       <el-form-item  :label="' '">
-        <input ref="file" type="file" accept=".xlsx,.xls" style="display: none;" @change="uploadFile">
-        <el-button type="primary" icon="el-icon-upload" @click="clickFile">导入</el-button>
+        <el-button type="primary" icon="el-icon-upload" @click="qcUpload()">导入</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -355,6 +354,8 @@
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 导入 -->
+    <qcUpload ref="qcUpload" @refreshPageTables="getDataList()" v-drag></qcUpload>
   </div>
 </template>
 
@@ -366,18 +367,19 @@
     templateDelete, // 删除模板
     InspectionTypeSearch, // 搜索所有检验类型
     objectSearch, // 搜索所有设备
-    ItemDetailsSearch, // 查询明细列表
+    templateDetailsSearch, // 查询明细列表
     addItemDetails, // 新增项目的检验明细
     getItemList, // 获取明细列表
     delItemDetails, // 删除项目的检验明细
     saveItemDetailed, // 新增项目明细的最大最小值
-    uploadTemplateExcel, // 导入文件
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcUpload from "./qc_upload";
   export default {
     components: {
-      Chooselist
+      Chooselist,
+      qcUpload
     },
     watch: {
 
@@ -929,7 +931,7 @@
       detailModal(row){
         this.detailData.templateId = row.templateId
         this.detailData.templateName = row.templateName
-        ItemDetailsSearch(this.detailData).then(({data}) => {
+        templateDetailsSearch(this.detailData).then(({data}) => {
           this.detailList = data.rows
           this.objectSearch()
         })
@@ -1035,7 +1037,7 @@
       },
       // 关闭后刷新列表
       refreshDetailList(){
-        ItemDetailsSearch(this.detailData).then(({data}) => {
+        templateDetailsSearch(this.detailData).then(({data}) => {
           this.detailList = data.rows
         })
       },
@@ -1049,7 +1051,7 @@
         }).then(() => {
           delItemDetails(row).then(({data}) => {
             if (data && data.code === 0) {
-              ItemDetailsSearch(this.detailData).then(({data}) => {
+              templateDetailsSearch(this.detailData).then(({data}) => {
                 this.detailList = data.rows
               })
               this.$message({
@@ -1124,7 +1126,6 @@
       },
       startDownload() {
         //  this.exportData = this.dataList
-
       },
       finishDownload() {
 
@@ -1145,33 +1146,14 @@
       // 导出 end
 
       // 导入
-      clickFile() {
-        this.$refs.file.dispatchEvent(new MouseEvent('click'))
-      },
-      async uploadFile() {
-        const file = this.$refs.file.files
-        let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
-        if (extName === '.xlsx' || extName === '.xls') {
-          let formData = new FormData()
-          formData.append('file', file[0])
-          uploadTemplateExcel(formData).then(({data}) => {
-            if(data.code === 0) {
-              this.getDataList()
-              this.$message({
-                type: 'success',
-                message: '数据导入成功!'
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        }
-        else {
-          this.$message.error('数据导入失败，请选择正确的xlsx模板文件')
-        }
-        this.load();
+      qcUpload(){
+        let currentData = {
+          flag: 'template',
+        };
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.qcUpload.init(currentData);
+        })
       },
 
     }
diff --git a/src/views/modules/qc/qc_upload.vue b/src/views/modules/qc/qc_upload.vue
new file mode 100644
index 0000000..593dd16
--- /dev/null
+++ b/src/views/modules/qc/qc_upload.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="customer-css">
+    <el-dialog :title="titleCon" :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-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 {
+  uploadExcel, // 导入项目文件
+  uploadTemplateExcel, // 导入模板文件
+  uploadPartAttributeExcel, // 导入物料属性文件
+  uploadFamilyAttributeExcel, // 导入类别属性文件
+} from "@/api/qc/qc.js"
+export default {
+  data() {
+    return {
+      titleCon: '文件导入',
+      visible: false,
+      fileList: [],
+      pageData: {
+        flag: '',
+      },
+    }
+  },
+  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);
+    },
+    /*关闭modal*/
+    closeDialog(){
+      // 刷新报工的页面
+      this.$emit('refreshPageTables');
+      // 关闭当前的页面
+      this.visible = false;
+    },
+    /*保修当前的数据*/
+    saveUploadFile(){
+      /*判断文件是否上传*/
+      if(null == this.fileList || 0 == this.fileList.length){
+        this.$message.error("请先上传文件!");
+        return false;
+      }
+      const formData = new FormData();
+      formData.append("file", this.fileList[0].raw);
+      if (this.pageData.flag == 'item'){
+        uploadExcel(formData).then(({data}) => {
+          if (data.code === 0) {
+            this.$message.success(data.msg);
+            // 清空文件上传记录
+            this.$refs.uploadFile.clearFiles();
+            // 关闭窗口并刷新页面
+            this.closeDialog();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        })
+      } else if (this.pageData.flag == 'template'){
+        uploadTemplateExcel(formData).then(({data}) => {
+          if (data.code === 0) {
+            this.$message.success(data.msg);
+            // 清空文件上传记录
+            this.$refs.uploadFile.clearFiles();
+            // 关闭窗口并刷新页面
+            this.closeDialog();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        })
+      }else if (this.pageData.flag == 'partAttribute'){
+        uploadPartAttributeExcel(formData).then(({data}) => {
+          if (data.code === 0) {
+            this.$message.success(data.msg);
+            // 清空文件上传记录
+            this.$refs.uploadFile.clearFiles();
+            // 关闭窗口并刷新页面
+            this.closeDialog();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        })
+      }else if (this.pageData.flag == 'familyAttribute'){
+        uploadFamilyAttributeExcel(formData).then(({data}) => {
+          if (data.code === 0) {
+            this.$message.success(data.msg);
+            // 清空文件上传记录
+            this.$refs.uploadFile.clearFiles();
+            // 关闭窗口并刷新页面
+            this.closeDialog();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        })
+      }
+
+    }
+  },
+  created() {
+
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>