From 0dcbd05e1af76b79f4f8f716b50a66790357546f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 14 Nov 2024 11:35:43 +0800
Subject: [PATCH] 2024-11-14

---
 src/views/modules/common/Chooselist.vue       |   3 +-
 .../customer/customerGroupInformation.vue     |   9 -
 .../customerInformationManagement.vue         | 183 ++++++++++++------
 .../modules/proofing/requestForProofing.vue   |  99 +++++++---
 .../modules/quotation/requestForQuote.vue     |  87 +++++++--
 .../quotationProjectInformation.vue           |   8 +
 src/views/modules/test/requestForTest.vue     |  92 +++++++--
 7 files changed, 344 insertions(+), 137 deletions(-)

diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
index afe9888..802d869 100644
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@@ -196,7 +196,8 @@ export default {
         if (this.param3) {
           sql += " and active like '%" + this.param3 + "%'"
         }
-        if (this.tagNo <1000 && this.tagNo !== 93) {
+        let tagNoList = [119, 120, 121, 93, 102]
+        if (this.tagNo <1000 && !tagNoList.includes(this.tagNo)) {
           if (this.param4) {
             sql += " and site=" + "'" + this.param4 + "'"
           }
diff --git a/src/views/modules/customer/customerGroupInformation.vue b/src/views/modules/customer/customerGroupInformation.vue
index 63e18f6..403e6cf 100644
--- a/src/views/modules/customer/customerGroupInformation.vue
+++ b/src/views/modules/customer/customerGroupInformation.vue
@@ -88,11 +88,6 @@
     <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <el-form  label-position="top" :model="modalData" :rules="rules">
         <el-row :gutter="10">
-          <el-col :span="8">
-            <el-form-item label="客户组编码" prop="customerGroupId">
-              <el-input v-model="modalData.customerGroupId" :disabled="modalDisableFlag" ></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="16">
             <el-form-item label="客户组名称" prop="customerGroupName">
               <el-input v-model="modalData.customerGroupName" ></el-input>
@@ -473,10 +468,6 @@ export default {
      * 商品信息新增/编辑
      */
     saveData () {
-      if (this.modalData.customerGroupId === '' || this.modalData.customerGroupId == null) {
-        this.$message.warning('请填写客户组编码！')
-        return
-      }
       if (this.modalData.customerGroupName === '' || this.modalData.customerGroupName == null) {
         this.$message.warning('请填写客户组名称！')
         return
diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index 00183a9..ad0d43c 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -95,59 +95,86 @@
     <!-- 客户模态框 -->
     <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <el-form label-position="top" :model="modalData" :rules="rules">
-        <el-form-item label="客户名称" prop="customerDesc" :rules="rules.customerDesc">
-          <el-input v-model="modalData.customerDesc" :readonly="detailModalFlag"></el-input>
-        </el-form-item>
-        <el-form-item label="行业">
-          <dict-data-select v-if="modalFlag" v-model="modalData.customerIndustry" :disabled="detailModalFlag" dict-type="plm_customer_information_customer_industry"></dict-data-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="客户组分类(1)">
-          <span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(120)"><a herf="#">客户组分类(1)</a></span>
-          <el-input v-model="modalData.customerGroupId1" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur(120)" style="width: 124px"></el-input>
-          <el-input v-model="modalData.customerGroupName1" disabled style="width: 330px"></el-input>
-        </el-form-item>
-        <el-form-item label="客户组分类(2)">
-          <span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(121)"><a herf="#">客户组分类(2)</a></span>
-          <el-input v-model="modalData.customerGroupId2" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur2(121)" style="width: 124px"></el-input>
-          <el-input v-model="modalData.customerGroupName2" disabled style="width: 330px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
-               style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="重要程度" prop="importantCustomer" :rules="rules.importantCustomer">
-          <dict-data-select v-if="modalFlag" v-model="modalData.importantCustomer" :disabled="detailModalFlag"
-                            style="width: 145px" dict-type="plm_customer_information_important_customer">
-          </dict-data-select>
-        </el-form-item>
-        <el-form-item label="客户状态" prop="customerStatus" :rules="rules.customerStatus">
-          <el-select v-model="modalData.customerStatus" :disabled="detailModalFlag" style="width: 140px">
-            <el-option label="启用" value="Y"></el-option>
-            <el-option label="停用" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="客户类型" prop="customerStatus" :rules="rules.customerType">
-          <el-select v-model="modalData.customerType" :disabled="detailModalFlag" style="width: 145px">
-            <el-option label="潜在客户" value="潜在客户"></el-option>
-            <el-option label="正式客户" value="正式客户"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="客户描述" class="auto">
-          <el-input
-            type="textarea"
-            v-model="modalData.customerDescription"
-            readonly
-            :rows="2"
-            resize='none'
-            show-word-limit
-            :readonly="detailModalFlag">
-          </el-input>
-        </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="客户名称" prop="customerDesc" :rules="rules.customerDesc">
+              <el-input v-model="modalData.customerDesc" :readonly="detailModalFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="行业">
+              <dict-data-select v-if="modalFlag" v-model="modalData.customerIndustry" :disabled="detailModalFlag" dict-type="plm_customer_information_customer_industry"></dict-data-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label=" ">
+              <el-checkbox-group :disabled="modalData.title === '客户详情'" v-model="customerGroupList" :max="1">
+                <el-checkbox label="品牌客户" value="品牌客户"></el-checkbox>
+                <el-checkbox label="直接客户" value="直接客户"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="客户组分类(1)">
+              <span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(120)"><a herf="#">客户组分类(1)</a></span>
+              <el-input v-model="modalData.customerGroupId1" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur(120)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label=" ">
+              <el-input v-model="modalData.customerGroupName1" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户组分类(2)">
+              <span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(121)"><a herf="#">客户组分类(2)</a></span>
+              <el-input v-model="modalData.customerGroupId2" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur2(121)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label=" ">
+              <el-input v-model="modalData.customerGroupName2" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="重要程度" prop="importantCustomer" :rules="rules.importantCustomer">
+              <dict-data-select v-if="modalFlag" v-model="modalData.importantCustomer" :disabled="detailModalFlag" dict-type="plm_customer_information_important_customer"></dict-data-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户状态" prop="customerStatus" :rules="rules.customerStatus">
+              <el-select v-model="modalData.customerStatus" style="width: 100%" :disabled="detailModalFlag">
+                <el-option label="启用" value="Y"></el-option>
+                <el-option label="停用" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户类型" prop="customerStatus" :rules="rules.customerType">
+              <el-select v-model="modalData.customerType" style="width: 100%" :disabled="detailModalFlag">
+                <el-option label="潜在客户" value="潜在客户"></el-option>
+                <el-option label="正式客户" value="正式客户"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="客户描述" class="auto">
+              <el-input
+                type="textarea"
+                v-model="modalData.customerDescription"
+                readonly
+                :rows="2"
+                resize='none'
+                show-word-limit
+                :readonly="detailModalFlag">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-footer style="height:40px;line-height:40px;text-align:center">
+      <el-footer style="height:auto;line-height:1.5;padding: 10px 0;text-align:center">
         <el-button v-if="modalData.flag !== '3'" type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
@@ -759,6 +786,11 @@ export default {
       if (newVal){
         this.refreshCurrentTabTable();
       }
+    },
+    modalFlag(newVal,oldVal){
+      if (newVal === false){
+        this.customerGroupList = [];
+      }
     }
   },
   data() {
@@ -968,13 +1000,31 @@ export default {
           fixed: '',
           columnWidth: 160
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001,
+          serialNumber: '101001Table1CustomerGroup',
+          tableId: '101001Table1',
+          tableName: '客户信息表',
+          columnProp: 'customerGroup',
+          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: 101001,
           serialNumber: '101001Table1ImportantCustomer',
           tableId: '101001Table1',
           tableName: '客户信息表',
-          columnProp: 'importantCustomer',
+          columnProp: 'importantCustomerLabel',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '重要程度',
@@ -1853,6 +1903,8 @@ export default {
       managerFlag: false,
       ownerFlag: false,
       userRoleFlag: false,
+
+      customerGroupList:[],//只允许勾选一个
     }
   },
 
@@ -2018,10 +2070,12 @@ export default {
         addressStatus: '启用',
         addressType: '类型一',
         createBy: this.$store.state.user.name,
-        type: ''
+        type: '',
+        customerGroup: undefined,
       }
       this.modalDisableFlag = false
       this.detailModalFlag = false
+
       this.modalFlag = true
     },
     /**
@@ -2157,6 +2211,9 @@ export default {
       }
       this.modalDisableFlag = true
       this.detailModalFlag = false
+
+      // 客户组修改
+      this.customerGroupList = row.customerGroup?[row.customerGroup]:[]
       this.modalFlag = true
     },
     /**
@@ -2310,6 +2367,9 @@ export default {
       }
       this.modalDisableFlag = true
       this.detailModalFlag = true
+
+      // 客户组修改
+      this.customerGroupList = row.customerGroup?[row.customerGroup]:[]
       this.modalFlag = true
     },
     /**
@@ -2586,14 +2646,6 @@ export default {
         this.$message.warning('请输入客户名称！')
         return
       }
-      // if (this.modalData.customerIndustry === '' || this.modalData.customerIndustry == null) {
-      //   this.$message.warning('请输入行业！')
-      //   return
-      // }
-      if (this.modalData.customerCurrency === '' || this.modalData.customerCurrency == null) {
-        this.$message.warning('请输入币种！')
-        return
-      }
       if (this.modalData.importantCustomer === '' || this.modalData.importantCustomer == null) {
         this.$message.warning('请选择重要程度！')
         return
@@ -2606,9 +2658,12 @@ export default {
         this.$message.warning('请选择客户类型！')
         return
       }
+      if (this.customerGroupList.length > 0){
+        this.modalData.customerGroup = this.customerGroupList[0]
+      }else {
+        this.modalData.customerGroup = ''
+      }
       if (this.modalData.flag === '1') {
-        // this.modalData.primaryContact = 'Y'
-        // this.modalData.contactStatus = '启用'
         customerInformationSave(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 43eddca..f8129ee 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -55,9 +55,14 @@
       <el-form-item :label="'NPI工程师'">
         <el-input v-model="searchData.engineerName" 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>
+      </el-form-item>
+      <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>
+        <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">
@@ -553,6 +558,13 @@
                 </el-form-item>
               </div>
             </el-col>
+            <el-col :span="8">
+              <div class="grid-content bg-purple">
+                <el-form-item label="终端客户">
+                  <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
@@ -970,6 +982,8 @@ export default {
         engineerName: '',
         priorityLevel: '',
         proofingNo: '',
+        customerPartNo: '',
+        finalPartNo: '',
         page: 1,
         limit: 10,
         menuId: this.$route.meta.menuId,
@@ -1238,52 +1252,89 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
-          serialNumber: '103001Table1TrackerName',
+          serialNumber: '103001Table1TestPartNo',
           tableId: '103001Table1',
           tableName: '打样信息表',
-          columnProp: 'trackerName',
+          columnProp: 'testPartNo',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: 'CS',
+          align: 'left',
+          columnLabel: '物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 150
         },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
-          serialNumber: '103001Table1EngineerName',
+          serialNumber: '103001Table1PartName',
           tableId: '103001Table1',
           tableName: '打样信息表',
-          columnProp: 'engineerName',
+          columnProp: 'partName',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: 'NPI工程师',
+          align: 'left',
+          columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
-          serialNumber: '103001Table1EngineerName',
+          serialNumber: '103001Table1FinalPartNo',
           tableId: '103001Table1',
           tableName: '打样信息表',
-          columnProp: 'approverName',
+          columnProp: 'finalPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: 'IFS物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1CustomerPartNo',
+          tableId: '103001Table1',
+          tableName: '打样信息表',
+          columnProp: 'customerPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '客户物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1TrackerName',
+          tableId: '103001Table1',
+          tableName: '打样信息表',
+          columnProp: 'trackerName',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: 'Approver',
+          columnLabel: 'CS',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1295,38 +1346,38 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
-          serialNumber: '103001Table1TestPartNo',
+          serialNumber: '103001Table1EngineerName',
           tableId: '103001Table1',
           tableName: '打样信息表',
-          columnProp: 'testPartNo',
+          columnProp: 'engineerName',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '物料编码',
+          columnLabel: 'NPI工程师',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 150
+          columnWidth: 80
         },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
-          serialNumber: '103001Table1PartName',
+          serialNumber: '103001Table1EngineerName',
           tableId: '103001Table1',
           tableName: '打样信息表',
-          columnProp: 'partName',
+          columnProp: 'approverName',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '物料名称',
+          align: 'center',
+          columnLabel: 'Approver',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 80
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 36b5227..d2175ca 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -58,9 +58,15 @@
       <el-form-item :label="'项目名称'">
         <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'工程师'">
+      <el-form-item :label="'报价专员'">
         <el-input v-model="searchData.quoterName" 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>
+      </el-form-item>
+      <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"/>
@@ -623,6 +629,13 @@
                 </el-form-item>
               </div>
             </el-col>
+            <el-col :span="8">
+              <div class="grid-content bg-purple">
+                <el-form-item label="终端客户">
+                  <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
@@ -942,6 +955,8 @@ export default {
         projectName: '',
         quoterName: '',
         priorityLevel: '',
+        customerPartNo: '',
+        finalPartNo: '',
         page: 1,
         limit: 10,
         menuId: this.$route.meta.menuId,
@@ -1221,7 +1236,7 @@ export default {
           tableName: '询价信息表',
           columnProp: 'projectId',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '项目编码',
           columnHidden: false,
           columnImage: false,
@@ -1252,67 +1267,67 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table1TrackerName',
+          serialNumber: '102001Table1TestPartNo',
           tableId: '102001Table1',
           tableName: '询价信息表',
-          columnProp: 'trackerName',
+          columnProp: 'testPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '采购专员',
+          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: '102001Table1QuoterName',
+          serialNumber: '102001Table1PartName',
           tableId: '102001Table1',
           tableName: '询价信息表',
-          columnProp: 'quoterName',
+          columnProp: 'partName',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '报价专员',
+          columnLabel: '物料描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table1TestPartNo',
+          serialNumber: '102001Table1FinalPartNo',
           tableId: '102001Table1',
           tableName: '询价信息表',
-          columnProp: 'testPartNo',
+          columnProp: 'finalPartNo',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '物料编码',
+          align: 'left',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 160
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table1PartName',
+          serialNumber: '102001Table1CustomerPartNo',
           tableId: '102001Table1',
           tableName: '询价信息表',
-          columnProp: 'partName',
+          columnProp: 'customerPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料描述',
+          columnLabel: '客户物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1321,6 +1336,42 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 102001,
+          serialNumber: '102001Table1TrackerName',
+          tableId: '102001Table1',
+          tableName: '询价信息表',
+          columnProp: 'trackerName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '采购专员',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 102001,
+          serialNumber: '102001Table1QuoterName',
+          tableId: '102001Table1',
+          tableName: '询价信息表',
+          columnProp: 'quoterName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '报价专员',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
diff --git a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
index 1688ea7..ab46465 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
@@ -39,6 +39,13 @@
             </el-form-item>
           </div>
         </el-col>
+        <el-col :span="8">
+          <div class="grid-content bg-purple">
+            <el-form-item label="终端客户">
+              <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="8">
@@ -129,6 +136,7 @@ export default {
         projectName: '',
         projectType: '',
         projectSourceDesc: '',
+        finalCustomerName: '',
         priorityDesc: '',
         status: '',
         projectDesc: '',
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index eb63a0c..954f9b3 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -11,6 +11,9 @@
       <el-form-item :label="'Artwork'">
         <el-input v-model="searchData.trackerName" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'TP工程师'">
+        <el-input v-model="searchData.engineerName" 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>
@@ -49,12 +52,15 @@
       <el-form-item :label="'项目名称'">
         <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'TP工程师'">
-        <el-input v-model="searchData.engineerName" 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"/>
       </el-form-item>
+      <el-form-item :label="'IFS物料编码'">
+        <el-input v-model="searchData.finalPartNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'客户物料编码'">
+        <el-input v-model="searchData.customerPartNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'状态'" v-if="false">
         <el-select v-model="searchData.testResultStatus" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -582,7 +588,6 @@
         <test-routing-table ref="tabSoRoiuting" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList" :disabled="testCurrentRow.testStatus === '已完成'" height="45vh" ></test-routing-table>
       </el-tab-pane>
       <el-tab-pane label="附件信息" name="file">
-<!--        <test-file ref="tabFile" :column-list="fileColumnList" v-model:data-list="testFileList" :test-no="testCurrentRow.testNo" :height="500"></test-file>-->
         <oss-components style="margin-top: 5px" :disabled="testCurrentRow.testStatus === '已完成'" label="测试单号" height="45vh" :columns="fileColumnList" :order-ref2="testCurrentRow.testNo" :order-ref1="testCurrentRow.site"></oss-components>
       </el-tab-pane>
 
@@ -627,6 +632,13 @@
                 </el-form-item>
               </div>
             </el-col>
+            <el-col :span="8">
+              <div class="grid-content bg-purple">
+                <el-form-item label="终端客户">
+                  <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
@@ -995,6 +1007,8 @@
           projectName: '',
           engineerName: '',
           priorityLevel: '',
+          customerPartNo: '',
+          finalPartNo: '',
           page: 1,
           limit: 10,
           menuId: this.$route.meta.menuId,
@@ -1273,67 +1287,67 @@
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table1TrackerName',
+            serialNumber: '103001Table1TestPartNo',
             tableId: '103001Table1',
             tableName: '测试信息表',
-            columnProp: 'trackerName',
+            columnProp: 'testPartNo',
             headerAlign: 'center',
-            align: 'center',
-            columnLabel: 'Artwork',
+            align: 'left',
+            columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 150
           },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table1EngineerName',
+            serialNumber: '103001Table1PartName',
             tableId: '103001Table1',
             tableName: '测试信息表',
-            columnProp: 'engineerName',
+            columnProp: 'partName',
             headerAlign: 'center',
-            align: 'center',
-            columnLabel: 'TP工程师',
+            align: 'left',
+            columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 100
           },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table1TestPartNo',
+            serialNumber: '103001Table1FinalPartNo',
             tableId: '103001Table1',
             tableName: '测试信息表',
-            columnProp: 'testPartNo',
+            columnProp: 'finalPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '物料编码',
+            columnLabel: 'IFS物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 150
+            columnWidth: 100
           },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table1PartName',
+            serialNumber: '103001Table1CustomerPartNo',
             tableId: '103001Table1',
             tableName: '测试信息表',
-            columnProp: 'partName',
+            columnProp: 'customerPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '物料名称',
+            columnLabel: '客户物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1342,6 +1356,42 @@
             fixed: '',
             columnWidth: 100
           },
+          {
+            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,