1

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

@@ -36,22 +36,23 @@
         </el-table-column>
         <el-table-column label="收入总计" prop="incomeAmount" width="120" fixed>
           <template #default="{ row }">
-            <div>{{ row.currency }} {{ moneyFormat(row.incomeAmount ,2) }}</div>
+            <div>CNY {{ 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>
+            <div>CNY {{ moneyFormat(row.expenditureAmount,2) }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="毛利率" width="120" fixed>
+
+        <el-table-column label="毛利" prop="gross" width="120" fixed>
           <template #default="{ row }">
-            <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
+            <div>{{ moneyFormat(row.gross ,2)}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="毛利" prop="gross" width="120" fixed>
+        <el-table-column label="毛利率" width="120" fixed>
           <template #default="{ row }">
-            <div>{{ moneyFormat(row.gross ,2)}}</div>
+            <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
           </template>
         </el-table-column>
 

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

@@ -31,12 +31,12 @@
         <el-table-column label="统计" fixed>
           <el-table-column label="收入合计" prop="incomeAmount" width="120">
             <template #default="{ row }">
-              <div> {{ moneyFormat(row.incomeAmount ,2) }}</div>
+              <div>CNY {{ 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>
+              <div>CNY {{ moneyFormat(row.expenditureAmount ,2) }}</div>
             </template>
           </el-table-column>
           <el-table-column label="毛利" prop="gross" width="120">
@@ -46,7 +46,7 @@
           </el-table-column>
           <el-table-column label="毛利率" width="120">
             <template #default="{ row }">
-              <div> {{ moneyFormat(row.gross ,2) }}%</div>
+              <div> {{ moneyFormat(row.grossRate ,2) }}%</div>
             </template>
           </el-table-column>
         </el-table-column>