Browse Source

业绩提成bug

cz 1 year ago
parent
commit
3ed1750e02

+ 6 - 6
src/views/salesMange/salesMange/performance/index.vue

@@ -94,12 +94,12 @@
               prop="totalExpenses"
               width="120"
             />
-            <el-table-column label="毛利" prop="grossProfit" width="120" />
-            <el-table-column
-              label="毛利率"
-              prop="grossProfitMargin"
-              width="120"
-            />
+            <el-table-column label="毛利" prop="grossGrofit" width="120" />
+            <el-table-column label="毛利率" prop="grossRofitMargin" width="120">
+              <template #default="{ row }">
+                <div style="width: 100%">{{ row.grossRofitMargin }}%</div>
+              </template></el-table-column
+            >
           </el-table-column>
           <el-table-column label="提成">
             <el-table-column label="售后" prop="afterSalesAmount" width="120" />

+ 4 - 0
src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -608,6 +608,8 @@ const clickSettlement = (row) => {
     ...row,
     grossGrofit: row.grossProfit,
     grossRofitMargin: row.grossProfitMargin,
+    contractCurrency: row.currency,
+    purchaseCurrency: "CNY",
     settlementStatus: 1,
   };
   proxy.post("/saleStatement/settlement", data).then(() => {
@@ -624,6 +626,8 @@ const clickCancelSettlement = (row) => {
       ...row,
       grossGrofit: row.grossProfit,
       grossRofitMargin: row.grossProfitMargin,
+      contractCurrency: row.currency,
+      purchaseCurrency: "CNY",
       settlementStatus: 0,
     })
     .then(() => {