diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue
index 3630d6a..9531a64 100644
--- a/src/views/modules/project/projectInfo/com_project_puotation.vue
+++ b/src/views/modules/project/projectInfo/com_project_puotation.vue
@@ -110,31 +110,31 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1TrackerName',
+            serialNumber: '102001Table1TestPartNo',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'trackerName',
+            columnProp: 'plmPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '采购专员',
+            columnLabel: 'PLM物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 160
           },
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1QuoterName',
+            serialNumber: '102001Table1FinalPartNo',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'quoterName',
+            columnProp: 'finalPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '报价专员',
+            columnLabel: 'IFS物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -146,13 +146,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1TestPartNo',
+            serialNumber: '102001Table1PartName',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'plmPartNo',
+            columnProp: 'partName',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: 'PLM物料编码',
+            columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -164,13 +164,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1FinalPartNo',
+            serialNumber: '102001Table1CustomerPartNo',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'finalPartNo',
+            columnProp: 'customerPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: 'IFS物料编码',
+            columnLabel: '客户料号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -182,49 +182,49 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1PartName',
+            serialNumber: '102001Table1PriorityLevel',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'partName',
+            columnProp: 'priorityLevel',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '物料名称',
+            columnLabel: '优先等级',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 160
+            columnWidth: 80
           },
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1CustomerPartNo',
+            serialNumber: '102001Table1RequiredCompletionDate',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'customerPartNo',
+            columnProp: 'requiredCompletionDate',
             headerAlign: 'center',
-            align: 'left',
-            columnLabel: '客户料号',
+            align: 'center',
+            columnLabel: '要求完成日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 160
           },
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1PriorityLevel',
+            serialNumber: '102001Table1TrackerName',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'priorityLevel',
+            columnProp: 'trackerName',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '优先等级',
+            columnLabel: '采购专员',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -236,20 +236,20 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table1RequiredCompletionDate',
+            serialNumber: '102001Table1QuoterName',
             tableId: '102001Table1',
             tableName: '询价信息表',
-            columnProp: 'requiredCompletionDate',
+            columnProp: 'quoterName',
             headerAlign: 'center',
-            align: 'center',
-            columnLabel: '要求完成日期',
+            align: 'left',
+            columnLabel: '报价专员',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 160
+            columnWidth: 80
           },
           {
             userId: this.$store.state.user.name,
diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue
index 16e9f92..c8c3714 100644
--- a/src/views/modules/project/projectInfo/com_project_test.vue
+++ b/src/views/modules/project/projectInfo/com_project_test.vue
@@ -87,42 +87,6 @@ export default {
           fixed: '',
           columnWidth: 120
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 103001,
-          serialNumber: '103001Table1TrackerName',
-          tableId: '103001Table1',
-          tableName: '测试信息表',
-          columnProp: 'trackerName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: 'Artwork',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 103001,
-          serialNumber: '103001Table1EngineerName',
-          tableId: '103001Table1',
-          tableName: '测试信息表',
-          columnProp: 'engineerName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '  TP工程师',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
@@ -249,6 +213,78 @@ export default {
           fixed: '',
           columnWidth: 160
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1TrackerName',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'trackerName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'Artwork',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1EngineerName',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'engineerName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '  TP工程师',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1ArtworkName',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'artworkName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'CQC',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001TablePlannerName',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'plannerName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'FAI',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index c29a656..1a7558d 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -2,24 +2,24 @@
   <div class="mod-config">
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item label="BU">
+        <bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
+      </el-form-item>
       <el-form-item :label="'打样单号'">
         <el-input v-model="searchData.proofingNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'项目号'">
+        <el-input v-model="searchData.projectId" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'项目名称'">
+        <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'客户编码'">
         <el-input v-model="searchData.customerNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'客户名称'">
         <el-input v-model="searchData.customerDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'CS'">
-        <el-input v-model="searchData.trackerName" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'物料编码'">
-        <el-input v-model="searchData.testPartNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partName" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'要求交付日期'">
         <el-date-picker
           style="width: 120px"
@@ -40,17 +40,8 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item label="BU">
-        <bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
-      </el-form-item>
-      <el-form-item :label="'项目号'">
-        <el-input v-model="searchData.projectId" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'项目名称'">
-        <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'NPI工程师'">
-        <el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input>
+      <el-form-item :label="'PLM物料编码'">
+        <el-input v-model="searchData.testPartNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'IFS物料编码'">
         <el-input v-model="searchData.finalPartNo" clearable style="width: 120px"></el-input>
@@ -58,9 +49,21 @@
       <el-form-item :label="'客户物料编码'">
         <el-input v-model="searchData.customerPartNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'优先等级'">
-        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"></dict-data-select>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'CS'">
+        <el-input v-model="searchData.trackerName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'NPI工程师'">
+        <el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'Approver'">
+        <el-input v-model="searchData.approverName" clearable style="width: 120px"></el-input>
       </el-form-item>
+<!--      <el-form-item :label="'优先等级'">-->
+<!--        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"></dict-data-select>-->
+<!--      </el-form-item>-->
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.proofingStatus" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -1002,6 +1005,7 @@ export default {
         projectId: '',
         projectName: '',
         engineerName: '',
+        approverName: '',
         priorityLevel: '',
         proofingNo: '',
         customerPartNo: '',
@@ -1326,7 +1330,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 180
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index ff7f3fa..5daaf7c 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -151,7 +151,7 @@
 
     <el-dialog :visible.sync="quoteVisible" title="待报价信息" :close-on-click-modal="false" append-to-body width="1000px">
       <el-table :data="quotationSelections" border height="300">
-        <el-table-column label="状态" header-align="center" align="center" prop="quotationStatus" min-width="80"/>
+<!--        <el-table-column label="状态" header-align="center" align="center" prop="quotationStatus" min-width="80"/>-->
         <el-table-column label="申请单号" header-align="center" align="center" prop="quotationNo" min-width="120"/>
         <el-table-column label="项目号" header-align="center" align="left" prop="projectId" min-width="100"/>
         <el-table-column label="项目名称" header-align="center" align="left" prop="projectName" min-width="150"/>
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index fac984c..01a3099 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -1395,7 +1395,7 @@
             tableName: '测试信息表',
             columnProp: 'trackerName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: 'Artwork',
             columnHidden: false,
             columnImage: false,
@@ -1413,7 +1413,7 @@
             tableName: '测试信息表',
             columnProp: 'engineerName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: 'TP工程师',
             columnHidden: false,
             columnImage: false,
@@ -1423,6 +1423,42 @@
             fixed: '',
             columnWidth: 80
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1ArtworkName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'artworkName',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: 'CQC',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001TablePlannerName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'plannerName',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: 'FAI',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,