Merge branch 'master' into stage

src/views/salesMange/salesMange/performance/index.vue

@@ -66,7 +66,14 @@
             <el-table-column label="" prop="userName" width="120" />
           </el-table-column>
           <el-table-column label="销售合同金额">
-            <el-table-column label="" prop="contractAmount" width="120" />
+            <el-table-column label="" prop="contractAmount" width="120">
+              <template #default="{ row }">
+                <div style="width: 100%">
+                  {{ row.contractCurrency }}
+                  {{ moneyFormat(row.contractAmount, 2) }}
+                </div>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column label="收入">
             <el-table-column
@@ -77,7 +84,14 @@
             <el-table-column label="其他收入" prop="otherIncome" width="120" />
           </el-table-column>
           <el-table-column label="采购合同金额">
-            <el-table-column label="" prop="purchaseAmount" width="120" />
+            <el-table-column label="" prop="purchaseAmount" width="120">
+              <template #default="{ row }">
+                <div style="width: 100%">
+                  {{ row.purchaseCurrency }}
+                  {{ moneyFormat(row.purchaseAmount, 2) }}
+                </div>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column label="支出">
             <el-table-column label="支付货款" prop="payForGoods" width="120" />