Merge branch 'master' into dev0.3

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -620,8 +620,10 @@ const clickSettlement = (row) => {
 };
 const clickCancelSettlement = (row) => {
   proxy
-    .post("/saleStatement/update", {
-      id: row.contractId,
+    .post("/saleStatement/settlement", {
+      ...row,
+      grossGrofit: row.grossProfit,
+      grossRofitMargin: row.grossProfitMargin,
       settlementStatus: 0,
     })
     .then(() => {