Przeglądaj źródła

会务成本修改

liuhj 2 tygodni temu
rodzic
commit
0cab172666
1 zmienionych plików z 18 dodań i 8 usunięć
  1. 18 8
      src/components/Finance/ConferenceCost.vue

+ 18 - 8
src/components/Finance/ConferenceCost.vue

@@ -116,7 +116,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="name" label="系数" width="80">
+                <el-table-column prop="name" label="系数" width="80" v-if="false">
                     <template slot-scope="scope">
                         <el-input-number @change="calculateQuotation(scope.row)" :precision="2" size="mini"
                             :controls="false" v-model="scope.row.coefficient"></el-input-number>
@@ -130,7 +130,7 @@
                 </el-table-column>
                 <el-table-column prop="name" label="单项报价金额" width="110">
                     <template slot-scope="scope">
-                        {{ `${townum(scope.row.baoJiaPrice)} (CNY)` }}
+                        <!-- {{ `${townum(scope.row.baoJiaPrice)} (CNY)` }}
                         <div v-if="scope.row.currency != 836">
 
                             {{ `${townum(scope.row.costPrice * scope.row.coefficient * scope.row.count)}
@@ -138,8 +138,8 @@
 
                             }}
 
-                        </div>
-                        <!-- <el-input-number :precision="2" size="mini" :controls="false" v-model="scope.row.baoJiaPrice"></el-input-number> -->
+                        </div> -->
+                        <el-input-number :precision="2" size="mini" :controls="false" v-model="scope.row.baoJiaPrice"></el-input-number>
                     </template>
                 </el-table-column>
 
@@ -521,7 +521,7 @@ export default {
             const count = Number(row.count) || 0;
             const coefficient = Number(row.coefficient) || 0;
 
-            row.baoJiaPrice = parseFloat((costPrice * rate * count * coefficient).toFixed(2));
+            // row.baoJiaPrice = parseFloat((costPrice * rate * count * coefficient).toFixed(2));
 
             // Update totals
             this.updateTotals();
@@ -540,11 +540,21 @@ export default {
 
             // 计算报价总计
             this.conferenceAffairsCost.baoJiaAll = this.tableDatas.reduce((sum, item) => {
+                console.log(sum, item);
                 if (this.rateStatistics.length > 1) {
-                    return sum + ((Number(item.costPrice) || 0) * (Number(item.count) || 0) * (Number(item.rate) || 0) * (Number(item.coefficient) || 0))+((Number(item.rate) || 0) * (Number(item.addedValue) || 0));
-                } else {
-                    return sum + ((Number(item.costPrice) || 0) * (Number(item.count) || 0) * (Number(item.coefficient) || 0))+(Number(item.addedValue) || 0);
+                    let a= sum + (Number(item.baoJiaPrice) || 0)* (Number(item.rate) || 0);
+                    let b= (Number(item.addedValue)* (Number(item.rate) || 0) || 0);
+                    return a + b;
+                }else{
+                    let a= sum + (Number(item.baoJiaPrice) || 0);
+                    let b= Number(item.addedValue) || 0;
+                    return a + b;
                 }
+                // if (this.rateStatistics.length > 1) {
+                //     return sum + ((Number(item.costPrice) || 0) * (Number(item.count) || 0) * (Number(item.rate) || 0) * (Number(item.coefficient) || 0))+((Number(item.rate) || 0) * (Number(item.addedValue) || 0));
+                // } else {
+                //     return sum + ((Number(item.costPrice) || 0) * (Number(item.count) || 0) * (Number(item.coefficient) || 0))+(Number(item.addedValue) || 0);
+                // }
  
             }, 0).toFixed(2);
         },