diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index 0cba7ae..4b7a074 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -27,10 +27,7 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 230px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'质检员'">
-        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.partDesc" clearable style="width: 318px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.states" multiple style="width: 340px">
@@ -51,12 +48,6 @@
       <el-form-item :label="'关联单号3'">
         <el-input v-model="searchData.orderRef3" clearable style="width: 138px"></el-input>
       </el-form-item>
-      <el-form-item :label="'关联单号4'">
-        <el-input v-model="searchData.orderRef4" clearable style="width: 138px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'关联单号5'">
-        <el-input v-model="searchData.orderRef5" clearable style="width: 138px"></el-input>
-      </el-form-item>
       <el-form-item>
         <span slot="label" @click="getBaseList(24)"><a herf="#">关联单号6</a></span>
         <el-input v-model="searchData.orderRef6" clearable style="width: 130px"></el-input>
@@ -64,6 +55,12 @@
 <!--      <el-form-item :label="'关联单号6'">-->
 <!--        <el-input v-model="searchData.orderRef6" clearable style="width: 138px"></el-input>-->
 <!--      </el-form-item>-->
+      <el-form-item :label="'质检员'">
+        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'送检员'">
+        <el-input v-model="searchData.createBy" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 02113bb..6ca7899 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -860,6 +860,7 @@
           familyName: '',
           buDesc: '',
           attributeType: 'A',
+          importFlag: false,
           page: 1,
           limit: 10,
         },
@@ -1099,6 +1100,224 @@
             fixed: '',
           },
         ],
+        columnList1: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1BuDesc',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 100,
+            columnProp: 'buDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'BU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1PartNo',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 146,
+            columnProp: 'partNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1PartDesc',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'partDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1FamilyName',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'familyName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料类别',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1Umid',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'umid',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '规格型号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1ExemptInspection',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'exemptInspection',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '是否免检',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1TemplateIds',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 240,
+            columnProp: 'templateIds',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '模版编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1AttributeRemark',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'attributeRemark',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1CreateTime',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'createTime',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '创建时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1CreateBy',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'createBy',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '创建人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1UpdateDate',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'updateDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '更新时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003Table1UpdateBy',
+            tableId: "301003Table1",
+            tableName: "物料属性设置表",
+            columnWidth: 144,
+            columnProp: 'updateBy',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
         detailModelFlag: false,
         detailList: [],
         dataList: [],
@@ -1968,9 +2187,11 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
+        this.searchData.importFlag = true
         await qcPartAttributeSearch(this.searchData).then(({data}) => {
           this.exportList= data.page.list
         })
+        this.searchData.importFlag = false
         return this.exportList
       },
 
@@ -1980,8 +2201,8 @@
 
       fields () {
         let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
             json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
           } else {
             json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","