Browse Source

2025-04-22

master
qiezi 9 months ago
parent
commit
fa0d7d17c9
  1. 18
      src/views/modules/quote/detail/primary/quoteDetailCost.vue
  2. 6
      src/views/modules/sampleManagement/com_technical-add-or-update.vue

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

@ -234,23 +234,25 @@ export default {
let value = 0; let value = 0;
// Tool ++++ // Tool ++++
let otherCost = this.quoteDetail.toolCost + this.quoteDetail.testCost + this.quoteDetail.elseCost + this.quoteDetail.packCost + this.quoteDetail.shippingCost let otherCost = this.quoteDetail.toolCost + this.quoteDetail.testCost + this.quoteDetail.elseCost + this.quoteDetail.packCost + this.quoteDetail.shippingCost
// + + +
let ttlCost = otherCost + this.quoteDetail.adjustPartCost + this.quoteDetail.adjustMachineCost + this.quoteDetail.adjustLabourCost; let ttlCost = otherCost + this.quoteDetail.adjustPartCost + this.quoteDetail.adjustMachineCost + this.quoteDetail.adjustLabourCost;
switch (type){ switch (type){
case 'va': case 'va':
value = this.quoteDetail.quoteProfitRate/100 value = this.quoteDetail.quoteProfitRate/100
//price = (+++)/(1-value)+ //price = (+++)/(1-value)+
this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + this.totalPartCost)/(1-value)+this.totalElseCost
this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + otherCost)/(1-value)+this.totalElseCost
// contribution = 1-(++++)/(price-) // contribution = 1-(++++)/(price-)
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
// margin = (price--)/(price-) // margin = (price--)/(price-)
this.quoteDetail.quoteTaxRate = ((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100 this.quoteDetail.quoteTaxRate = ((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
break; break;
case 'contribution': case 'contribution':
value = this.quoteDetail.quoteProfitAmount/100 value = this.quoteDetail.quoteProfitAmount/100
//price = (++++)/(1-value)+ //price = (++++)/(1-value)+
this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + this.totalPartCost)/(1-value)+this.totalElseCost
this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(1-value)+this.totalElseCost
console.log(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)
// va = 1-(+++)/(price-) // va = 1-(+++)/(price-)
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
// margin = (price--)/(price-) // margin = (price--)/(price-)
this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100 this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
break; break;
@ -259,16 +261,16 @@ export default {
// price = /(1-value)+ // price = /(1-value)+
this.quoteDetail.quoteTaxTotalPrice = ttlCost/(1-value)+this.totalElseCost this.quoteDetail.quoteTaxTotalPrice = ttlCost/(1-value)+this.totalElseCost
// va = 1-(+++)/(price-) // va = 1-(+++)/(price-)
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
// contribution = 1-(++++)/(price-) // contribution = 1-(++++)/(price-)
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
break; break;
case 'price': case 'price':
value = this.quoteDetail.quoteTaxTotalPrice value = this.quoteDetail.quoteTaxTotalPrice
// va = 1-(+++)/(value-) // va = 1-(+++)/(value-)
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
// contribution = 1-(++++)/(value-) // contribution = 1-(++++)/(value-)
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + this.totalPartCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
// margin = (value--)/(value-) // margin = (value--)/(value-)
this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100 this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
break; break;

6
src/views/modules/sampleManagement/com_technical-add-or-update.vue

@ -267,13 +267,13 @@
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item style="margin-left: 0px" label="项目编码"> <el-form-item style="margin-left: 0px" label="项目编码">
<el-input v-model="partSearch.projectId" style="width: 130px" ></el-input>
<el-input v-model="partSearch.projectId" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 0px" label="IFS料号"> <el-form-item style="margin-left: 0px" label="IFS料号">
<el-input v-model="partSearch.finalPartNo" style="width: 130px" ></el-input>
<el-input v-model="partSearch.finalPartNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 0px" label="PLM物料编码"> <el-form-item style="margin-left: 0px" label="PLM物料编码">
<el-input v-model="partSearch.testPartNo" style="width: 130px" ></el-input>
<el-input v-model="partSearch.testPartNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item style="margin-left: 0px" label="物料名称">--> <!-- <el-form-item style="margin-left: 0px" label="物料名称">-->
<!-- <el-input v-model="partSearch.partDesc" style="width: 130px" ></el-input>--> <!-- <el-input v-model="partSearch.partDesc" style="width: 130px" ></el-input>-->

Loading…
Cancel
Save