1

src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -16,7 +16,7 @@
         <el-table-column label="业务员" prop="userName" width="120" fixed />
         <el-table-column label="合同金额" width="120" fixed>
           <template #default="{ row }">
-            <div>{{ row.currency }} {{ row.amount }}</div>
+            <div>{{ row.currency }} {{ moneyFormat( row.amount,2) }}</div>
           </template>
         </el-table-column>
         <!-- <el-table-column label="是否已结清" width="120" fixed>
@@ -34,20 +34,32 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="收入总计" prop="incomeAmount" width="120" fixed />
-        <el-table-column label="支出总计" prop="expenditureAmount" width="120" fixed />
+        <el-table-column label="收入总计" prop="incomeAmount" width="120" fixed>
+          <template #default="{ row }">
+            <div>{{ row.currency }} {{ moneyFormat(row.incomeAmount ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="支出总计" prop="expenditureAmount" width="120" fixed>
+          <template #default="{ row }">
+            <div>{{ row.currency }} {{ moneyFormat(row.expenditureAmount,2) }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="毛利率" width="120" fixed>
           <template #default="{ row }">
             <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
           </template>
         </el-table-column>
-        <el-table-column label="毛利" prop="gross" width="120" fixed />
+        <el-table-column label="毛利" prop="gross" width="120" fixed>
+          <template #default="{ row }">
+            <div>{{ moneyFormat(row.gross ,2)}}</div>
+          </template>
+        </el-table-column>
 
         <el-table-column label="应付货款" width="120">
           <template #default="{ row }">
             <div>
-              <span v-if="row.otherSumAmount">{{ row.otherSumAmount }}</span>
-              <span v-else>{{ row.ehsdSumAmount }}</span>
+              <span v-if="row.otherSumAmount">{{moneyFormat( row.otherSumAmount,2) }}</span>
+              <span v-else>{{ moneyFormat(row.ehsdSumAmount,2) }}</span>
             </div>
           </template>
         </el-table-column>
@@ -56,52 +68,56 @@
             <div>13%</div>
           </template>
         </el-table-column>
-        <el-table-column label="应退税金额" prop="refundableAmount" width="120" />
+        <el-table-column label="应退税金额" prop="refundableAmount" width="120">
+          <template #default="{ row }">
+            <div>{{ moneyFormat(row.refundableAmount ,2)}}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="包材金额" width="120">
           <template #default="{ row }">
-            <div>{{ row.peritectoidAmount }}</div>
+            <div>{{ moneyFormat(row.peritectoidAmount,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="配件金额" width="120">
           <template #default="{ row }">
-            <div>{{ row.accessoriesAmount }}</div>
+            <div>{{ moneyFormat(row.accessoriesAmount,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="拖车费" width="120">
           <template #default="{ row }">
-            <div>{{ row.trailerFee }}</div>
+            <div>{{ moneyFormat(row.trailerFee,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="报关费" width="120">
           <template #default="{ row }">
-            <div>{{ row.customsFee }}</div>
+            <div>{{ moneyFormat(row.customsFee,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="代理费" width="120">
           <template #default="{ row }">
-            <div>{{ row.agencyFee }}</div>
+            <div>{{ moneyFormat(row.agencyFee,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="港杂费" width="120">
           <template #default="{ row }">
-            <div>{{ row.portMixedFee }}</div>
+            <div>{{moneyFormat( row.portMixedFee,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="验货红包" width="120">
           <template #default="{ row }">
             <div>
-              {{ row.inspectionRedPack }}
+              {{ moneyFormat(row.inspectionRedPack ,2)}}
             </div>
           </template>
         </el-table-column>
         <el-table-column label="佣金" width="120">
           <template #default="{ row }">
-            <div>{{ row.commission }}</div>
+            <div>{{ moneyFormat(row.commission,2) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="其他" width="120">
           <template #default="{ row }">
-            <div>{{ row.other }}</div>
+            <div>{{ moneyFormat(row.other ,2)}}</div>
           </template>
         </el-table-column>
 

src/views/EHSD/procurement/profitSettlementEHSD/index.vue

@@ -8,9 +8,9 @@
         <el-table-column label="合同编号" prop="code" width="160" fixed />
         <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
         <el-table-column label="业务员" prop="userName" width="120" fixed />
-        <el-table-column label="合同金额" width="120">
+        <el-table-column label="合同金额" width="120" fixed="">
           <template #default="{ row }">
-            <div>{{ row.amount }}</div>
+            <div>{{ row.currency }} {{ moneyFormat( row.amount,2) }}</div>
           </template>
         </el-table-column>
         <!-- <el-table-column label="是否已结清" width="120" fixed>
@@ -29,38 +29,112 @@
           </template>
         </el-table-column>
         <el-table-column label="统计" fixed>
-          <el-table-column label="收入合计" prop="incomeAmount" width="120" />
-          <el-table-column label="支出合计" prop="expenditureAmount" width="120" />
-          <el-table-column label="毛利" prop="gross" width="120" />
+          <el-table-column label="收入合计" prop="incomeAmount" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.incomeAmount ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="支出合计" prop="expenditureAmount" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.expenditureAmount ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="毛利" prop="gross" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.gross ,2) }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="毛利率" width="120">
             <template #default="{ row }">
-              <div>{{ row.grossRate }}%</div>
+              <div> {{ moneyFormat(row.gross ,2) }}%</div>
             </template>
           </el-table-column>
         </el-table-column>
 
         <el-table-column label="收入">
-          <el-table-column label="到账金额" prop="sumClaimMoney" width="120" />
-          <el-table-column label="退税金额" prop="refundableAmount" width="120" />
-          <el-table-column label="其他收入" prop="otherIncomeAmount" width="120" />
+          <el-table-column label="到账金额" prop="sumClaimMoney" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.sumClaimMoney ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="退税金额" prop="refundableAmount" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.refundableAmount ,2) }}</div>
+            </template></el-table-column>
+          <el-table-column label="其他收入" prop="otherIncomeAmount" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.otherIncomeAmount ,2) }}</div>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="采购合同金额" prop="sumPurchaseContractMoney" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.sumPurchaseContractMoney ,2) }}</div>
+          </template>
         </el-table-column>
-        <el-table-column label="采购合同金额" prop="sumPurchaseContractMoney" width="120" />
         <el-table-column label="支出">
-          <el-table-column label="已付货款" prop="accountPaid" width="120" />
-          <el-table-column label="代理费" prop="agencyFee" width="120" />
-          <el-table-column label="拖车费" prop="trailerFee" width="120" />
-          <el-table-column label="报关费" prop="customsFee" width="120" />
-          <el-table-column label="港杂费" prop="portMixedFee" width="120" />
-          <el-table-column label="验货红包" prop="inspectionRedPack" width="120" />
-          <el-table-column label="佣金" prop="commission" width="120" />
-          <el-table-column label="检测费" prop="checkout" width="120" />
-          <el-table-column label="验货费" prop="inspectionCharge" width="120" />
-          <el-table-column label="运费" prop="freight" width="120" />
-          <el-table-column label="产地证费" prop="certificateOfOrigin" width="120" />
-          <el-table-column label="其他" prop="other" width="120" />
+          <el-table-column label="已付货款" prop="accountPaid" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.accountPaid ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="代理费" prop="agencyFee" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.agencyFee ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="拖车费" prop="trailerFee" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.trailerFee ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="报关费" prop="customsFee" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.customsFee ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="港杂费" prop="portMixedFee" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.portMixedFee ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="验货红包" prop="inspectionRedPack" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.inspectionRedPack ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="佣金" prop="commission" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.commission ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="检测费" prop="checkout" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.checkout ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="验货费" prop="inspectionCharge" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.inspectionCharge ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="运费" prop="freight" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.freight ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="产地证费" prop="certificateOfOrigin" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.certificateOfOrigin ,2) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="其他" prop="other" width="120">
+            <template #default="{ row }">
+              <div> {{ moneyFormat(row.other ,2) }}</div>
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="200" />
-
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template #default="{ row }">
             <div>