20241125

src/views/modules/quote/detail/quoteDetail.vue

@@ -72,6 +72,7 @@ export default {
         currency2:undefined,
         exchangeRate1:undefined,
         exchangeRate2:undefined,
+        moq:'Standard 250K',
         remark:'',
       },
       saveQuoteDetail:{
@@ -939,6 +940,8 @@ export default {
   watch:{
     quote(newVal,oldVal){
       if (newVal.id){
+        this.quoteDetail.profitRate = this.quote.markup
+        this.quoteDetail.quoteProfitRate = this.quote.markup
         this.handleQueryQuoteDetail();
       }else {
         this.dataList = [];
@@ -1031,9 +1034,19 @@ export default {
             <el-input-number v-model="saveQuoteDetail.qty" style="width: 100%;" :controls="false" disabled></el-input-number>
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <el-form-item label="MOQ" prop="moq" :show-message="false">
+            <el-select v-model="saveQuoteDetail.moq" style="width: 100%;">
+              <el-option label="Standard TP(MOQ>250K)" value="Standard 250K"></el-option>
+              <el-option label="Standard TP(MOQ>5M)" value="Standard 5M"></el-option>
+              <el-option label="Weighted TP(MOQ>250K)" value="Weighted 250K"></el-option>
+              <el-option label="Weighted TP(MOQ>5M)" value="Weighted 5M"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="16">
+        <el-col :span="17">
           <el-form-item label="备注" class="auto" :show-message="false">
             <el-input type="textarea" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="saveQuoteDetail.remark" :disabled="saveQuoteDetail.status === '下达'"></el-input>
           </el-form-item>

src/views/modules/quote/index.vue

@@ -53,6 +53,11 @@ export default {
         createDate: "",
         updateBy: "",
         updateDate: "",
+        application: "",
+        annualDemand: "",
+        costModel: "UFIDA",
+        markup:0,
+        chipPrice:'',
       },
       quoteForm:{
       },
@@ -858,12 +863,42 @@ export default {
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="币种" prop="currency" :show-message="false">
+            <el-form-item label="Application" prop="application" :show-message="false">
+              <el-input v-model="saveQuote.application" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="年需求量" prop="annualDemand" :show-message="false">
+              <el-input v-model="saveQuote.annualDemand" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="Cost Model" prop="costModel" :show-message="false">
+              <el-select v-model="saveQuote.costModel" :disabled="detailFlag">
+                <el-option label="2020" value="2020"></el-option>
+                <el-option label="UFIDA" value="UFIDA"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="Markup" prop="markup" :show-message="false">
+              <el-input-number style="width: 100%" :controls="false" :step="0" v-model="saveQuote.markup" :disabled="detailFlag"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="芯片价格" prop="chipPrice" :show-message="false">
+              <el-input v-model="saveQuote.chipPrice" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="币种" :show-message="false">
               <span slot="label" v-if="!detailFlag">
                 <a @click="getBaseList(512)">币种</a>
               </span>
               <el-input v-model="saveQuote.currency" readonly :disabled="detailFlag">
-                <span slot="suffix" v-show="saveQuote.currency" @click="clearModalData('currency')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
+                <span slot="suffix" v-show="saveQuote.currency && !detailFlag" @click="clearModalData('currency')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
           </el-col>
@@ -883,7 +918,7 @@ export default {
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="采购专员" prop="purchase" :show-message="false">
+            <el-form-item label="采购专员" :show-message="false">
               <span slot="label" v-if="!detailFlag">
                 <a @click="handlePurchaseClick" >采购专员</a>
               </span>