From 46dc4cc352949c6ef599e2b88144b8d0b74cc1d7 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 15 Nov 2024 13:15:51 +0800
Subject: [PATCH] 2024-11-15

---
 .../modules/quotation/sellForQuotation.vue    |  4 +-
 .../sellForQuotation/quoteDetail.vue          | 22 +++---
 src/views/modules/quotation/toBeQuoted.vue    | 78 +++++++++++++++----
 3 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 2c580be..501dc63 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -151,8 +151,8 @@
                    layout="total,sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 标签页 -->
-    <el-tabs v-model="activeTabName" @tab-click="handleClickTab"
-             style="box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);border: 2px;min-height: 420px;margin-top: 5px;">
+    <el-tabs v-model="activeTabName" type="border-card" @tab-click="handleClickTab"
+             style="margin-top: 0px;">
       <el-tab-pane label="报价明细" name="quote_detail">
         <quote-detail :header="quotationHeader"></quote-detail>
       </el-tab-pane>
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index 194db70..fd19166 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -581,13 +581,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102003,
-          serialNumber: '102003Table3CustomerPartNo',
+          serialNumber: '102003Table3FinalPartNo',
           tableId: '102003Table3',
           tableName: '项目物料表',
-          columnProp: 'customerPartNo',
+          columnProp: 'finalPartNo',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '客户料号',
+          columnLabel: 'IFS物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -599,13 +599,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102003,
-          serialNumber: '102003Table3FinalPartNo',
+          serialNumber: '102003Table3CustomerPartNo',
           tableId: '102003Table3',
           tableName: '项目物料表',
-          columnProp: 'finalPartNo',
+          columnProp: 'customerPartNo',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '正式料号',
+          columnLabel: '客户物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1234,7 +1234,7 @@ export default {
                   style="min-height: 80px" />
       </el-form-item>
     </el-form>
-    <el-tabs v-model="activeName" @tab-click="tabClick" :style="{height:`${fullscreen?740:500}px`}" border stripe>
+    <el-tabs v-model="activeName" @tab-click="tabClick" :style="{height:`${fullscreen?740:500}px`}">
       <el-tab-pane name="bom" label="材料">
         <bill-of-materiel ref="bom" :all-search-flag.sync="allSearchFlagBom" :total-cost.sync="BOMCost" :loading-status.sync="loadingStatus" :updateTree.sync="update" v-if="quotationDetailFlag" :height="fullscreen?655:415" :detail="quotationDetail"></bill-of-materiel>
       </el-tab-pane>
@@ -1276,12 +1276,12 @@ export default {
       <el-form-item label="物料名称" prop="partDesc">
         <el-input v-model="projectPartData.partDesc" clearable/>
       </el-form-item>
-      <el-form-item label="客户料号" prop="customerPartNo">
-        <el-input v-model="projectPartData.customerPartNo" clearable/>
-      </el-form-item>
-      <el-form-item label="正式料号" prop="finalPartNo">
+      <el-form-item label="IFS物料编码" prop="finalPartNo">
         <el-input v-model="projectPartData.finalPartNo" clearable/>
       </el-form-item>
+      <el-form-item label="客户物料编码" prop="customerPartNo">
+        <el-input v-model="projectPartData.customerPartNo" clearable/>
+      </el-form-item>
       <el-form-item label=" ">
         <el-button @click="getProjectPartList" type="primary">查 询</el-button>
       </el-form-item>
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index 95edb62..455d295 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -54,6 +54,12 @@
       <el-form-item label="报价专员">
         <el-input v-model="searchData.quoterName" style="width: 120px" clearable></el-input>
       </el-form-item>
+      <el-form-item label="IFS物料编码">
+        <el-input v-model="searchData.finalPartNo" style="width: 120px" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="客户物料编码">
+        <el-input v-model="searchData.customerPartNo" style="width: 120px" clearable></el-input>
+      </el-form-item>
       <el-form-item label="优先等级" v-if="defaultFlag">
         <el-select v-model="searchData.priorityLevel" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -189,6 +195,8 @@ export default {
         projectName: '',
         quoterName: '',
         priorityLevel: '',
+        customerPartNo: '',
+        finalPartNo: '',
         limit:1,
         page:0,
       },
@@ -332,67 +340,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: '采购专员',
+          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: '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,
@@ -401,6 +409,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,