diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index b901ee6..397b43a 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -158,6 +158,8 @@ export const imageDelete = data => createAPI(`/pms/qc/imageDelete`,'post',data)
 export const iqcRecordOverLoad = data => createAPI(`/pms/qc/iqcRecordOverLoad`,'post',data)
 export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data)
 export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data)
+export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',data)
+export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data)
 
 
 
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 30d86ec..683e81a 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -16,15 +16,23 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'SKU'">
+        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
       </el-form-item>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
       <el-form-item :label="'工序'">
         <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true"  label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -33,8 +41,6 @@
           <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" :model="searchData">
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -481,6 +487,62 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 派工单号 -->
+    <el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="工单号">
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="派工单号">
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="PN">
+          <el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="seqInfoList"
+        @row-dblclick="getRowData1"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="center"
+          label="工单号">
+        </el-table-column>
+        <el-table-column
+          prop="seqNo"
+          header-align="center"
+          align="center"
+          label="派工单号">
+        </el-table-column>
+        <el-table-column
+          prop="sku"
+          header-align="center"
+          align="center"
+          label="SKU">
+        </el-table-column>
+        <el-table-column
+          prop="cinvSourceCode"
+          header-align="center"
+          align="center"
+          label="PN">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 子明细信息 -->
     <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="572px">
       <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
@@ -599,13 +661,16 @@
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="partData">
           <el-form-item :label="'物料编码'">
-            <el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'物料名称'">
-            <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'SKU'">
-            <el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'PN'">
+            <el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryPartList()">查询</el-button>
@@ -715,7 +780,8 @@
     rollNoEnter, // 标签号回车事件
     queryPartList, // 查询物料集合
     umSearch, // 查询单位列表
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    searchSeqInfo, // 派工单号查询
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -784,6 +850,8 @@
           endDate: '',
           partNo: '',
           partDesc: '',
+          cinvSourceCode: '',
+          sku: '',
           disposalMeasures: '',
           page: 1,
           limit: 10,
@@ -810,7 +878,9 @@
           seqNo: '',
           batchRollNo: '',
           spec: '',
+          orderNo: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -1598,6 +1668,15 @@
             fixed: false
           },
         ],
+        // 派工单号
+        seqInfoList: [],
+        seqDetailFlag: false,
+        seqDetailData: {
+          orderNo: '',
+          seqNo: '',
+          sku: '',
+          partNo: '',
+        },
         // 子明细数据对象
         tableData: [],
         checkedDetail: [],
@@ -1749,7 +1828,8 @@
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: '',
         },
         partDetailList: [
           {
@@ -1788,6 +1868,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
         ],
         partModelFlag: false,
         umList: [],
@@ -1832,6 +1924,7 @@
           this.modalData.partDesc = ''
           this.modalData.spec = ''
           this.modalData.sku = ''
+          this.modalData.cinvSourceCode = ''
           this.modalData.templateId = ''
           this.modalData.templateName = ''
         }
@@ -1909,6 +2002,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -1995,8 +2089,8 @@
         this.$nextTick(() => {
           let strVal = ''
           if (val === 1052) {
-            strVal = this.modalData.seqNo
-            this.$refs.baseList.init(val, strVal)
+            this.searchSeqInfo()
+            this.seqDetailFlag = true
           }
           if (val === 505) {
             strVal = this.modalData.resourceDesc
@@ -2080,6 +2174,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2097,6 +2192,7 @@
             this.modalData.partDesc = this.partList[0].partDesc
             this.modalData.spec = this.partList[0].spec
             this.modalData.sku = this.partList[0].sku
+            this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2130,6 +2226,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2269,6 +2366,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2305,7 +2403,7 @@
       queryPartList () {
         this.partData.bu = this.modalData.bu
         // 查询所有物料
-        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
+        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
           this.partList = []
           this.partModelFlag = true
         } else {
@@ -2329,18 +2427,30 @@
         this.templateModelFlag = false
       },
 
+      // 选中派工单号
+      getRowData1 (row) {
+        this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
+        this.modalData.orderNo = row.orderNo
+        this.modalData.seqNo = row.seqNo
+        this.getOperationList()
+        this.seqDetailFlag = false
+      },
+
       // 选中物料
       getRowData2 (row) {
         this.modalData.partNo = row.partNo
         this.modalData.partDesc = row.partDesc
         this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
         this.modalData.spec = row.spec
         this.partData = {
           site: '',
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: '',
         }
         this.partModelFlag = false
       },
@@ -3001,8 +3111,26 @@
           }
         }
       },
+      searchSeqInfo () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          seqNo: this.seqDetailData.seqNo,
+          orderNo: this.seqDetailData.orderNo,
+          sku: this.seqDetailData.sku,
+          cinvSourceCode: this.seqDetailData.cinvSourceCode,
+        }
+        searchSeqInfo(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.seqInfoList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+            })
+          }
 
-    }
+      },
   }
 </script>
 
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index b679aa7..1b7f773 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -16,15 +16,23 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'SKU'">
+        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
       </el-form-item>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
       <el-form-item :label="'工序'">
         <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -33,8 +41,6 @@
           <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -599,13 +605,16 @@
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="partData">
           <el-form-item :label="'物料编码'">
-            <el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'物料名称'">
-            <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'SKU'">
-            <el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'PN'">
+            <el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryPartList()">查询</el-button>
@@ -677,6 +686,62 @@
       </el-table>
     </el-dialog>
 
+    <!-- 派工单号 -->
+    <el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="工单号">
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="派工单号">
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="PN">
+          <el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="seqInfoList"
+        @row-dblclick="getRowData1"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="center"
+          label="工单号">
+        </el-table-column>
+        <el-table-column
+          prop="seqNo"
+          header-align="center"
+          align="center"
+          label="派工单号">
+        </el-table-column>
+        <el-table-column
+          prop="sku"
+          header-align="center"
+          align="center"
+          label="SKU">
+        </el-table-column>
+        <el-table-column
+          prop="cinvSourceCode"
+          header-align="center"
+          align="center"
+          label="PN">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- chooseList模态框 -->
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
@@ -716,7 +781,8 @@
     rollNoEnter, // 标签号回车事件
     queryPartList, // 查询物料集合
     umSearch, // 查询单位列表
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    searchSeqInfo, // 查询派工单号
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -785,6 +851,8 @@
           endDate: '',
           partNo: '',
           partDesc: '',
+          cinvSourceCode: '',
+          sku: '',
           disposalMeasures: '',
           page: 1,
           limit: 10,
@@ -1599,6 +1667,15 @@
             fixed: false
           },
         ],
+        // 派工单号
+        seqInfoList: [],
+        seqDetailFlag: false,
+        seqDetailData: {
+          orderNo: '',
+          seqNo: '',
+          sku: '',
+          partNo: '',
+        },
         // 子明细数据对象
         tableData: [],
         checkedDetail: [],
@@ -1750,7 +1827,8 @@
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: ''
         },
         partDetailList: [
           {
@@ -1789,6 +1867,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
         ],
         partModelFlag: false,
         umList: [],
@@ -1833,6 +1923,7 @@
           this.modalData.partDesc = ''
           this.modalData.spec = ''
           this.modalData.sku = ''
+          this.modalData.cinvSourceCode = ''
           this.modalData.templateId = ''
           this.modalData.templateName = ''
         }
@@ -1910,6 +2001,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -1996,8 +2088,8 @@
         this.$nextTick(() => {
           let strVal = ''
           if (val === 1052) {
-            strVal = this.modalData.seqNo
-            this.$refs.baseList.init(val, strVal)
+            this.searchSeqInfo()
+            this.seqDetailFlag = true
           }
           if (val === 505) {
             strVal = this.modalData.resourceDesc
@@ -2081,6 +2173,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2098,6 +2191,7 @@
             this.modalData.partDesc = this.partList[0].partDesc
             this.modalData.spec = this.partList[0].spec
             this.modalData.sku = this.partList[0].sku
+            this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2131,6 +2225,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2270,6 +2365,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2306,7 +2402,7 @@
       queryPartList () {
         this.partData.bu = this.modalData.bu
         // 查询所有物料
-        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
+        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
           this.partList = []
           this.partModelFlag = true
         } else {
@@ -2330,18 +2426,30 @@
         this.templateModelFlag = false
       },
 
+      // 选中派工单号
+      getRowData1 (row) {
+        this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
+        this.modalData.orderNo = row.orderNo
+        this.modalData.seqNo = row.seqNo
+        this.getOperationList()
+        this.seqDetailFlag = false
+      },
+
       // 选中物料
       getRowData2 (row) {
         this.modalData.partNo = row.partNo
         this.modalData.partDesc = row.partDesc
         this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
         this.modalData.spec = row.spec
         this.partData = {
           site: '',
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: ''
         }
         this.partModelFlag = false
       },
@@ -3012,7 +3120,26 @@
           }
         }
       },
-    }
+      searchSeqInfo () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          seqNo: this.seqDetailData.seqNo,
+          orderNo: this.seqDetailData.orderNo,
+          sku: this.seqDetailData.sku,
+          cinvSourceCode: this.seqDetailData.cinvSourceCode,
+        }
+        searchSeqInfo(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.seqInfoList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+
   }
 </script>
 
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 3911c30..8f78aeb 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -16,15 +16,23 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'SKU'">
+        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
       </el-form-item>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
       <el-form-item :label="'工序'">
         <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 100px">
           <el-option label="全部" value=""></el-option>
@@ -40,8 +48,6 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'检验类型'">
         <el-select v-model="searchData.inspectionTypeNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -538,6 +544,62 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 派工单号 -->
+    <el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
+      <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="工单号">
+          <el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="派工单号">
+          <el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="PN">
+          <el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="seqInfoList"
+        @row-dblclick="getRowData1"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="center"
+          label="工单号">
+        </el-table-column>
+        <el-table-column
+          prop="seqNo"
+          header-align="center"
+          align="center"
+          label="派工单号">
+        </el-table-column>
+        <el-table-column
+          prop="sku"
+          header-align="center"
+          align="center"
+          label="SKU">
+        </el-table-column>
+        <el-table-column
+          prop="cinvSourceCode"
+          header-align="center"
+          align="center"
+          label="PN">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 批量新增子明细操作-->
     <el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="510px">
       <el-form :inline="true" label-position="top">
@@ -615,13 +677,16 @@
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="partData">
           <el-form-item :label="'物料编码'">
-            <el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'物料名称'">
-            <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
           </el-form-item>
           <el-form-item :label="'SKU'">
-            <el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
+            <el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'PN'">
+            <el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryPartList()">查询</el-button>
@@ -730,7 +795,8 @@
     rollNoEnter, // 标签号回车事件
     queryPartList, // 查询物料集合
     umSearch, // 查询单位列表
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    searchSeqInfo, // 派工单号查询
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -800,6 +866,8 @@
           inspectionTypeNo: '',
           partNo: '',
           partDesc: '',
+          cinvSourceCode: '',
+          sku: '',
           disposalMeasures: '',
           page: 1,
           limit: 10,
@@ -833,6 +901,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -1638,6 +1707,15 @@
             fixed: false
           },
         ],
+        // 派工单号
+        seqInfoList: [],
+        seqDetailFlag: false,
+        seqDetailData: {
+          orderNo: '',
+          seqNo: '',
+          sku: '',
+          partNo: '',
+        },
         // 子明细数据对象
         tableData: [],
         checkedDetail: [],
@@ -1753,7 +1831,8 @@
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: '',
         },
         templateList: [],
         templateModelFlag: false,
@@ -1832,6 +1911,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          }
         ],
         checked: false,
         typeOptions: [],
@@ -1880,6 +1971,7 @@
           this.modalData.partDesc = ''
           this.modalData.spec = ''
           this.modalData.sku = ''
+          this.modalData.cinvSourceCode = ''
           this.modalData.templateId = ''
           this.modalData.templateName = ''
         }
@@ -1957,6 +2049,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2170,8 +2263,8 @@
         this.$nextTick(() => {
           let strVal = ''
           if (val === 1052) {
-            strVal = this.modalData.seqNo
-            this.$refs.baseList.init(val, strVal)
+            this.searchSeqInfo()
+            this.seqDetailFlag = true
           }
           if (val === 505) {
             strVal = this.modalData.resourceDesc
@@ -2233,6 +2326,7 @@
             this.modalData.partDesc = data.rows[0].partDesc
             this.modalData.spec = data.rows[0].spec
             this.modalData.sku = data.rows[0].sku
+            this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2271,6 +2365,7 @@
             this.modalData.partDesc = this.partList[0].partDesc
             this.modalData.spec = this.partList[0].spec
             this.modalData.sku = this.partList[0].sku
+            this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -2319,6 +2414,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2356,7 +2452,7 @@
       queryPartList () {
         this.partData.bu = this.modalData.bu
         // 查询所有物料
-        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
+        if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
           this.partList = []
           this.partModelFlag = true
         } else {
@@ -2380,18 +2476,31 @@
         this.templateModelFlag = false
       },
 
+      // 选中派工单号
+      getRowData1 (row) {
+        this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
+        this.modalData.orderNo = row.orderNo
+        this.modalData.seqNo = row.seqNo
+        this.getOperationList()
+        this.seqDetailFlag = false
+      },
+
+
       // 选中物料
       getRowData2 (row) {
         this.modalData.partNo = row.partNo
         this.modalData.partDesc = row.partDesc
         this.modalData.sku = row.sku
         this.modalData.spec = row.spec
+        this.modalData.cinvSourceCode = row.cinvSourceCode
         this.partData = {
           site: '',
           bu: '',
           partNo: '',
           partDesc: '',
-          sku: ''
+          sku: '',
+          cinvSourceCode: '',
         }
         this.partModelFlag = false
       },
@@ -2421,6 +2530,7 @@
           batchRollNo: '',
           spec: '',
           sku: '',
+          cinvSourceCode: '',
           specialRequirements: '',
           templateId: '',
           templateName: '',
@@ -2658,6 +2768,7 @@
         this.detailData.inspectionRemark = row.inspectionRemark
         this.detailData.cinvSourceCode = row.cinvSourceCode
         this.detailData.sku = row.sku
+        this.detailData.cinvSourceCode = row.cinvSourceCode
         this.detailData.spec = row.spec
         this.detailData.umId = row.umId
         this.detailData.umName = row.umName
@@ -3064,7 +3175,24 @@
           }
         }
       },
-
+      searchSeqInfo () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          seqNo: this.seqDetailData.seqNo,
+          orderNo: this.seqDetailData.orderNo,
+          sku: this.seqDetailData.sku,
+          cinvSourceCode: this.seqDetailData.cinvSourceCode,
+        }
+        searchSeqInfo(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.seqInfoList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
     }
   }
 </script>
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 8aa454c..fc36874 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -16,9 +16,15 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'SKU'">
+        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 233px"></el-input>
       </el-form-item>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'供应商'">
         <el-input v-model="searchData.supplierDesc" clearable style="width: 221px"></el-input>
       </el-form-item>
@@ -520,6 +526,8 @@
           endDate: '',
           partNo:'',
           partDesc:'',
+          cinvSourceCode:'',
+          sku:'',
           state: '待检验',
           inspectionResult: '',
           supplierDesc: '',
@@ -545,6 +553,7 @@
           workOrderQuantity: '',
           reelNumber: '',
           partNo: '',
+          cinvSourceCode:'',
           rollingQuantity: '',
           sampleQuantity: '',
           detailCodeNo:'',
@@ -557,369 +566,405 @@
           isQualifiedChinese:''
         },
         // 展示列集
-        columnList1: [],
-        // columnList1: [
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1BuDesc',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'buDesc',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: 'BU',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 100,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectionNo',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectionNo',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '检验单号',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 120,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectionResult',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectionResult',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '检验结论',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1TaskDate',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'taskDate',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '任务生成日期',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 120,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectionCycle',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectionCycle',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '检验周期(h)',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1RollNo',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'rollNo',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '标签条码',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 120,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1PartNo',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'partNo',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '物料编码',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 100,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1PartDesc',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'partDesc',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '物料名称',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 150,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1Umid',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'umId',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '计量单位',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1RollQty',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'rollQty',
-        //     headerAlign: "center",
-        //     align: "right",
-        //     columnLabel: '到货数量',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1RollCount',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'rollCount',
-        //     headerAlign: "center",
-        //     align: "right",
-        //     columnLabel: '送检数量',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1SamplingQty',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'samplingQty',
-        //     headerAlign: "center",
-        //     align: "right",
-        //     columnLabel: '抽样数量',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1PoOrderNo',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'poOrderNo',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '单据号',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 130,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1PoItemNo',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'poItemNo',
-        //     headerAlign: "center",
-        //     align: "right",
-        //     columnLabel: '单据行号',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 80,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1SupplierDesc',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'supplierDesc',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '供应商',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 150,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectionRemark',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectionRemark',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '质检备注',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 150,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1DisposalMeasures',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'disposalMeasures',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '处置措施',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 120,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1DisposalRemark',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'disposalRemark',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '处置说明',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 150,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectorDate',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectorDate',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '检验时间',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 130,
-        //   },
-        //   {
-        //     userId: this.$store.state.user.name,
-        //     functionId: 301006,
-        //     serialNumber: '301006Table1InspectorName',
-        //     tableId: "301006Table1",
-        //     tableName: "IQC检验记录表",
-        //     columnProp: 'inspectorName',
-        //     headerAlign: "center",
-        //     align: "center",
-        //     columnLabel: '质检员',
-        //     columnHidden: false,
-        //     columnImage: false,
-        //     columnSortable: false,
-        //     sortLv: 0,
-        //     status: true,
-        //     fixed: '',
-        //     columnWidth: 120,
-        //   },
-        // ],
+        // columnList1: [],
+        columnList1: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1BuDesc',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'buDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'BU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectionNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验单号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionResult',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectionResult',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1TaskDate',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'taskDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '任务生成日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionCycle',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectionCycle',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验周期(h)',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RollNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'rollNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '标签条码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PartNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'partNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PartDesc',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'partDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SKU',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'sku',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'SKU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1CinvSourceCode',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1Umid',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'umId',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '计量单位',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RollQty',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'rollQty',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '到货数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RollCount',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'rollCount',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '送检数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SamplingQty',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'samplingQty',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '抽样数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PoOrderNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'poOrderNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '单据号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PoItemNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'poItemNo',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '单据行号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SupplierDesc',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'supplierDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '供应商',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionRemark',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectionRemark',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '质检备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1DisposalMeasures',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1DisposalRemark',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'disposalRemark',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '处置说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectorDate',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectorDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectorName',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'inspectorName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '质检员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+        ],
         detailColumnList: [
           {
             userId: this.$store.state.user.name,
@@ -1212,6 +1257,8 @@
           inspectionNo: '',
           partNo: '',
           partDesc: '',
+          cinvSourceCode:'',
+          sku:'',
           rollQty: '',
           samplingQty: '',
           unqualifiedQty: 0,
@@ -1231,6 +1278,7 @@
         saveInformationData: {
           site: '',
           buNo: '',
+          cinvSourceCode:'',
           inspectionNo:'',
           disposalMeasures: '',
           disposalRemark: '',
@@ -1576,6 +1624,8 @@
         this.detailData.inspectionNo = row.inspectionNo
         this.detailData.partNo = row.partNo
         this.detailData.partDesc = row.partDesc
+        this.detailData.cinvSourceCode = row.cinvSourceCode
+        this.detailData.sku = row.sku
         this.detailData.rollQty = row.rollQty
         this.detailData.samplingQty = row.samplingQty
         this.detailData.unqualifiedQty = row.unqualifiedQty
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 1372a19..6147943 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -13,9 +13,15 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'SKU'">
+        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'类别名称'">
         <el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input>
       </el-form-item>
@@ -112,7 +118,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="partNo" :rules="rules.partNoType">
-          <span v-if="modalDisableFlag === false" slot="label" @click="getBaseList(507)"><a herf="#">物料编码:</a></span>
+          <span v-if="modalDisableFlag === false" slot="label" @click="searchPartInfo()"><a herf="#">物料编码:</a></span>
           <span v-if="modalDisableFlag === true" slot="label">物料编码:</span>
           <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
         </el-form-item>
@@ -588,6 +594,62 @@
       </el-table>
     </el-dialog>
 
+    <!-- 物料编码 -->
+    <el-dialog title="物料选择" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="partDisableFlag" width="685px" height="273px">
+      <el-form :inline="true" label-position="top" :model="partDetailData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料编码">
+          <el-input v-model="partDetailData.partNo" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="partDetailData.partDesc" clearable style="width: 137px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="partDetailData.sku" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="PN">
+          <el-input v-model="partDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchPartInfo()" style="margin-top: 24px">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="partInfoList"
+        @row-dblclick="getRowData1"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          prop="partNo"
+          header-align="center"
+          align="center"
+          label="物料编码">
+        </el-table-column>
+        <el-table-column
+          prop="partDesc"
+          header-align="center"
+          align="center"
+          label="物料名称">
+        </el-table-column>
+        <el-table-column
+          prop="sku"
+          header-align="center"
+          align="center"
+          label="SKU">
+        </el-table-column>
+        <el-table-column
+          prop="cinvSourceCode"
+          header-align="center"
+          align="center"
+          label="PN">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="partDisableFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传sop文件的modal -->
@@ -613,7 +675,8 @@
     getOperationDescList, // 查询工序列表
     getManufacturerList, // 查询供应商列表
     getAllResourceList, // 查询机台列表
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    searchPartInfo, // 查询物料信息
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -645,6 +708,8 @@
           userName: this.$store.state.user.name,
           partNo: '',
           partDesc: '',
+          cinvSourceCode: '',
+          sku: '',
           familyID: '',
           familyName: '',
           attributeType: 'A',
@@ -657,6 +722,7 @@
         totalPage: 0,
         modalFlag: false,
         modalDisableFlag: false,
+        partDisableFlag: false,
         modalData: {
           site: '',
           bu: '',
@@ -665,6 +731,8 @@
           partDesc: '',
           familyID: '',
           familyName: '',
+          cinvSourceCode: '',
+          sku: '',
           umid: '',
           supplierNo: '',
           supplierDesc: '',
@@ -680,6 +748,8 @@
           partNo: '',
           attributeNo: '',
           partDesc: '',
+          cinvSourceCode: '',
+          sku: '',
           attributeType: 'A',
           inspectionTypeNo: '',
           templateId: '',
@@ -723,6 +793,24 @@
             status: true,
             fixed: '',
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1SKU',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 146,
+            columnProp: 'sku',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'SKU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
@@ -741,6 +829,24 @@
             status: true,
             fixed: '',
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1CinvSourceCode',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
@@ -889,6 +995,7 @@
         detailModelFlag: false,
         detailList: [],
         dataList: [],
+        dataListLoading: false,
         // 展示列集
         columnDetailList: [
           {
@@ -1176,7 +1283,14 @@
             fixed: false
           },
         ],
-        userBuList: []
+        userBuList: [],
+        partInfoList: [],
+        partDetailData: {
+          partNo: '',
+          partDesc: '',
+          seqNo: '',
+          sku: '',
+        },
       }
     },
 
@@ -1213,6 +1327,25 @@
         })
       },
 
+      searchPartInfo () {
+        if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
+          this.partInfoList = []
+          this.partDisableFlag = true
+        }
+        else {
+            searchPartInfo(this.partDetailData).then(({data}) => {
+              if (data.code === 0) {
+                this.partInfoList = data.rows
+                this.partDisableFlag = true
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          }
+      },
+
       // 查询检验类型
       inspectionTypeSearch () {
         let tempData = {
@@ -1240,10 +1373,10 @@
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 507) {
-            strVal = this.modalData.partNo
-            this.$refs.baseList.init(val, strVal)
-          }
+          // if (val === 507) {
+          //   strVal = this.modalData.partNo
+          //   this.$refs.baseList.init(val, strVal)
+          // }
           if (val === 208) {
             strVal = this.tempLevelRow.samplingLevelNo
             this.$refs.baseList.init(val, strVal)
@@ -1293,6 +1426,14 @@
         })
       },
 
+      getRowData1 (row) {
+        this.modalData.sku = row.sku
+        this.modalData.cinvSourceCode = row.cinvSourceCode
+        this.modalData.partNo = row.partNo
+        this.modalData.partDesc = row.partDesc
+        this.partDisableFlag = false
+      },
+
       // 每页数
       sizeChangeHandle (val) {
         this.pageSize = val
@@ -2035,6 +2176,15 @@
           }
         })
       },
+      closeDialog () {
+        this.partDetailData = {
+          partNo: '',
+          partDesc: '',
+          seqNo: '',
+          sku: '',
+        }
+        this.partInfoList = []
+      },
     }
   }
 </script>