From 660d77be2e25c67c6d9bcf6caba9ddc579c94d4a Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 20 Dec 2024 14:35:02 +0800
Subject: [PATCH] 20241220

---
 .../modules/quote/detail/quoteDetail.vue      | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index a74d3a4..08a3eac 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -82,6 +82,7 @@ export default {
         quoteCurrencyTotalCost1:0,
         quoteCurrencyTotalCost2:0,
         moq:'Standard 250K',
+        type:'Standard TP',
         remark:'',
       },
       saveQuoteDetail:{
@@ -95,6 +96,7 @@ export default {
         partNo: [{required: true, message: '请输入物料编码', trigger: ['blur','change']}],
         partDesc: [{required: true, message: '请输入物料名称', trigger: ['blur','change']}],
         qty: [{required: true, message: '请输入数量', trigger: ['blur','change']}],
+        type: [{required: true, message: '请选择TP类型', trigger: ['blur','change']}],
       },
       columns: [
         {
@@ -250,7 +252,7 @@ export default {
           columnProp: 'quoteProfitRate',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'markup',
+          columnLabel: 'markup(%)',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -465,7 +467,14 @@ export default {
             this.handleSave();
           }
         }else {
-
+          let i = 1;
+          for (let item in obj){
+            this.$message.error(obj[item][0].message);
+            if (i === 1){
+              return
+            }
+            i++;
+          }
         }
       })
     },
@@ -587,9 +596,17 @@ export default {
       :min-width="item.columnWidth"
       :label="item.columnLabel">
       <template slot-scope="scope">
-        <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-        <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                           style="width: 100px; height: 80px"/></span>
+        <template v-if="item.columnLabel === 'Weighted TP for MOQ>250K(USD/KCT)' || item.columnLabel === 'Weighted TP for MOQ>5M(USD/KCT)'">
+          <span v-if="scope.row.type && scope.row.type === 'Weighted TP'"> {{scope.row[item.columnProp] }}</span>
+        </template>
+        <template v-else-if="item.columnLabel === 'Standard TP for MOQ>250K(USD/KCT)' || item.columnLabel === 'Standard TP for MOQ>5M(USD/KCT)'">
+          <span v-if="!scope.row.type || scope.row.type === 'Standard TP'">{{scope.row[item.columnProp] }}</span>
+        </template>
+        <template v-else>
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
       </template>
     </el-table-column>
     <el-table-column label="操作" v-if="!authFlag" fixed="right" align="center" width="120">
@@ -624,6 +641,14 @@ export default {
             <el-input-number style="width: 100%;"  v-model="saveQuoteDetail.qty" :min="1" :step="0" :precision="0" :controls="false"></el-input-number>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="TP类型" prop="type" :show-message="false">
+            <el-select v-model="saveQuoteDetail.type" placeholder="请选择">
+              <el-option label="Standard TP" value="Standard TP"></el-option>
+              <el-option label="Weighted TP" value="Weighted TP"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="8">
@@ -655,6 +680,14 @@ export default {
             <el-input-number v-model="saveQuoteDetail.qty" style="width: 100%;" :controls="false" :disabled="saveQuoteDetail.status === '下达'"></el-input-number>
           </el-form-item>
         </el-col>
+        <el-col :span="3">
+          <el-form-item label="TP类型" prop="type" :show-message="false">
+            <el-select v-model="saveQuoteDetail.type" placeholder="请选择">
+              <el-option label="Standard TP" value="Standard TP"></el-option>
+              <el-option label="Weighted TP" value="Weighted TP"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="16">