From fe1722d6b826b17bc6f8b23c24c3963f8fa1bdc0 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 22 Apr 2025 09:27:26 +0800
Subject: [PATCH] 2025-04-22

---
 .../modules/proofing/requestForProofing.vue   | 18 +++++-----
 .../modules/quotation/requestForQuote.vue     | 22 ++++++------
 .../modules/quote/detail/quoteDetail.vue      | 22 ++++++++++--
 .../modules/quote/detail/quoteGroupDetail.vue | 12 +++----
 .../com_technical-add-or-update.vue           |  2 +-
 src/views/modules/test/requestForTest.vue     | 35 ++++++++++---------
 6 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index c0daad5..1b7e6bd 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -286,13 +286,13 @@
       </el-form>
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="projectPartData" v-if="modalData.flag === '1'">
-          <el-form-item label="物料编码">
+          <el-form-item label="PLM物料编码">
             <el-input v-model="projectPartData.testPartNo" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item label="物料名称">
             <el-input v-model="projectPartData.partName" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item label="IFS料号">
+          <el-form-item label="IFS物料编码">
             <el-input v-model="projectPartData.finalPartNo" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item label="客户料号">
@@ -1684,7 +1684,7 @@ export default {
           columnProp: 'testPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: 'PLM物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1696,13 +1696,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '103001Table4PartDesc',
+          serialNumber: '103001Table4FinalPartNo',
           tableId: '103001Table4',
           tableName: '项目物料表',
-          columnProp: 'partDesc',
+          columnProp: 'finalPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料名称',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1714,13 +1714,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '103001Table4FinalPartNo',
+          serialNumber: '103001Table4PartDesc',
           tableId: '103001Table4',
           tableName: '项目物料表',
-          columnProp: 'finalPartNo',
+          columnProp: 'partDesc',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: 'IFS料号',
+          columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index b2d1d63..c407ed4 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -313,13 +313,13 @@
           <el-tab-pane label="物料信息" name="part">
             <div class="rq">
               <el-form :inline="true" label-position="top" :model="projectPartData" v-if="modalData.flag === '1'">
-                <el-form-item label="物料编码">
+                <el-form-item label="PLM物料编码">
                   <el-input v-model="projectPartData.testPartNo" clearable style="width: 120px"></el-input>
                 </el-form-item>
                 <el-form-item label="物料名称">
                   <el-input v-model="projectPartData.partName" clearable style="width: 120px"></el-input>
                 </el-form-item>
-                <el-form-item label="IFS料号">
+                <el-form-item label="IFS物料编码">
                   <el-input v-model="projectPartData.finalPartNo" clearable style="width: 120px"></el-input>
                 </el-form-item>
                 <el-form-item label="客户料号">
@@ -1676,7 +1676,7 @@ export default {
           columnProp: 'testPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: 'PLM物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1688,13 +1688,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table3PartDesc',
+          serialNumber: '102001Table3FinalPartNo',
           tableId: '102001Table3',
           tableName: '项目物料表',
-          columnProp: 'partDesc',
+          columnProp: 'finalPartNo',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '物料名称',
+          align: 'left',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1706,13 +1706,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table3FinalPartNo',
+          serialNumber: '102001Table3PartDesc',
           tableId: '102001Table3',
           tableName: '项目物料表',
-          columnProp: 'finalPartNo',
+          columnProp: 'partDesc',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: 'IFS料号',
+          align: 'center',
+          columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index b0f58df..aff6f2e 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -129,10 +129,28 @@ export default {
           serialNumber: '5011Table2PartNo',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'partNo',
+          columnProp: 'plmPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: 'PLM物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartNo',
+          tableId: '5011Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'ifsPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue
index 42c0c40..f57a9dc 100644
--- a/src/views/modules/quote/detail/quoteGroupDetail.vue
+++ b/src/views/modules/quote/detail/quoteGroupDetail.vue
@@ -118,13 +118,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2PartNo',
+          serialNumber: '5011Table2PLMPartNo',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'partNo',
+          columnProp: 'plmPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: 'PLM物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -136,13 +136,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2PLMPartNo',
+          serialNumber: '5011Table2PartNo',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'plmPartNo',
+          columnProp: 'ifsPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: 'PLM 物料编码',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 214d690..b422fb1 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -272,7 +272,7 @@
         <el-form-item style="margin-left: 0px" label="IFS料号">
           <el-input v-model="partSearch.finalPartNo"  style="width: 130px"  ></el-input>
         </el-form-item>
-        <el-form-item  style="margin-left: 0px"  label="物料编码">
+        <el-form-item  style="margin-left: 0px"  label="PLM物料编码">
           <el-input v-model="partSearch.testPartNo"  style="width: 130px"  ></el-input>
         </el-form-item>
 <!--        <el-form-item  style="margin-left: 0px" label="物料名称">-->
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index ae311b5..4b0eac7 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -259,7 +259,8 @@
             </el-row>
           </el-col>
           <el-col :span="4">
-            <el-form-item prop="trackerName">
+            <el-form-item>
+<!--            <el-form-item prop="trackerName">-->
               <span v-if="(testInformationFlag('tracker') === 'N' && modalData.flag === '2') || detailFlag" slot="label">Artwork</span>
               <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2041)"><a herf="#">Artwork</a></span>
               <el-input :disabled="(testInformationFlag('tracker') === 'N' && modalData.flag === '2') || detailFlag" v-model="modalData.trackerName" readonly>
@@ -370,7 +371,7 @@
       <el-form label-position="top" :model="projectPartData">
         <el-row :gutter="20">
           <el-col :span="4">
-            <el-form-item label="物料编码">
+            <el-form-item label="PLM物料编码">
               <el-input v-model="projectPartData.testPartNo" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -380,12 +381,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="IFS料号">
+            <el-form-item label="IFS物料编码">
               <el-input v-model="projectPartData.finalPartNo" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="IFS料号">
+            <el-form-item label="客户料号">
               <el-input v-model="projectPartData.customerPartNo" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -1705,7 +1706,7 @@
             columnProp: 'testPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '物料编码',
+            columnLabel: 'PLM物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1717,38 +1718,38 @@
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table3PartDesc',
+            serialNumber: '103001Table3FinalPartNo',
             tableId: '103001Table3',
             tableName: '项目物料表',
-            columnProp: 'partDesc',
+            columnProp: 'finalPartNo',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '物料名称',
+            columnLabel: 'IFS物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 200
+            columnWidth: 120
           },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
-            serialNumber: '103001Table3FinalPartNo',
+            serialNumber: '103001Table3PartDesc',
             tableId: '103001Table3',
             tableName: '项目物料表',
-            columnProp: 'finalPartNo',
+            columnProp: 'partDesc',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: 'IFS料号',
+            columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 200
           },
           {
             userId: this.$store.state.user.name,
@@ -2606,10 +2607,10 @@
           this.$message.warning('请选择Artwork！')
           return
         }
-        if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
-          this.$message.warning('请选择Artwork！')
-          return
-        }
+        // if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
+        //   this.$message.warning('请选择Artwork！')
+        //   return
+        // }
         if (this.modalData.projectId === '' || this.modalData.projectId == null) {
           this.$message.warning('请选择项目编码！')
           return