20241126

src/views/modules/quote/detail/primary/quoteDetailCost.vue

@@ -62,6 +62,8 @@ export default {
 
       tagNo:undefined,
       type:undefined,
+
+      isShowOtherCost:false,
     }
   },
   methods:{
@@ -286,6 +288,12 @@ export default {
       }
     },
 
+  },
+  mounted() {
+    this.$nextTick(()=>{
+      this.computeProfitAmount()
+      this.computeQuoteProfitAmount()
+    })
   }
 }
 </script>
@@ -300,6 +308,7 @@ export default {
     </el-select>
 
     <el-checkbox v-model="isShowCost">显示系统自动计算结果</el-checkbox>
+    <el-checkbox v-model="isShowOtherCost">显示其他成本</el-checkbox>
     <!--系统自动计算结果-->
     <el-form :model="quoteDetail" ref="costForm" :rules="rules" label-position="top" label-width="120px">
       <fieldset v-show="isShowCost"
@@ -385,8 +394,7 @@ export default {
           </el-col>
         </el-row>
       </fieldset>
-      <fieldset
-        style="margin-top: 5px;border: 1px solid #777;">
+      <fieldset style="margin-top: 5px;border: 1px solid #777;" v-if="isShowOtherCost">
         <legend>其他成本</legend>
         <el-row :gutter="10" >
           <el-col :span="4">

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

@@ -974,7 +974,7 @@ export default {
     </el-table-column>
     <el-table-column label="操作" fixed="right" align="center" width="120">
       <template slot-scope="{row,$index}">
-        <a type="text" v-if="row.status === '草稿'" @click="handleComputeYield(row)">计算</a>
+<!--        <a type="text" v-if="row.status === '草稿'" @click="handleComputeYield(row)">计算</a>-->
         <a type="text" v-if="row.status === '草稿'" @click="handleSaveQuoteDetail(row)">编辑</a>
         <a type="text" v-if="row.status === '草稿'" @click="handleDeleteQuoteDetail(row)">删除</a>
         <a type="text" v-if="row.status === '下达'" @click="handleDetail(row)">详情</a>
@@ -1031,22 +1031,12 @@ export default {
         </el-col>
         <el-col :span="3">
           <el-form-item label="报价数量" prop="qty" :show-message="false">
-            <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-input-number v-model="saveQuoteDetail.qty" style="width: 100%;" :controls="false" :disabled="saveQuoteDetail.status === '下达'"></el-input-number>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="17">
+        <el-col :span="16">
           <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

@@ -499,6 +499,9 @@ export default {
       updateQuote(params).then(({data})=>{
         if (data && data.code === 0){
           this.saveVisible = false
+          this.currentQuote = {
+            ...this.currentQuote
+          }
           this.$message.success(data.msg)
         }else {
           this.$message.warning(data.msg)

src/views/modules/quote/quoteDetailReport.vue

@@ -190,7 +190,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140
+          columnWidth: 240
         },
         {
           userId: this.$store.state.user.name,