Merge branch 'stage' of http://36.137.93.232:3000/hf/byte-sailing-new into stage

src/components/process/SendFunds.vue

@@ -922,7 +922,7 @@ const generatePaymentRemarks = () => {
         paymentRemarks = paymentRemarks + "\n";
       }
       if (formData.data.accountRequestFundsDetailList[i].costType) {
-        paymentRemarks = paymentRemarks + "[" + proxy.dictDataEcho(formData.data.accountRequestFundsDetailList[i].costType, fundsCostType.value) + "] ";
+        paymentRemarks = paymentRemarks + "【" + proxy.dictDataEcho(formData.data.accountRequestFundsDetailList[i].costType, fundsCostType.value) + "】";
       }
       if (formData.data.accountRequestFundsDetailList[i].contractId) {
         paymentRemarks = paymentRemarks + proxy.dictDataEcho(formData.data.accountRequestFundsDetailList[i].contractId, contractList.value) + " - ";

src/views/finance/fundManage/funds/index.vue

@@ -560,6 +560,7 @@ const pushProcessApproval = (row) => {
     query: {
       flowKey: "account_request_funds_flow",
       id: row.flowInfoId,
+      businessId: row.id,
       processType: 20,
       random: proxy.random(),
       flowName: "请款详情",

src/views/index.vue

@@ -144,6 +144,7 @@ const pushProcessApproval = (row) => {
 			query: {
 				flowKey: row.flowKey,
 				id: row.id,
+				businessId: row.businessId,
 				processType:20,
 				version:row.version
 			},
@@ -162,6 +163,7 @@ const pushProcessApproval = (row) => {
 				query: {
 					flowKey: row.flowKey,
 					id: row.id,
+					businessId: row.businessId,
 					processType:nodeType == 1 ? 30 : 10,
 					version:row.version
 				},

src/views/process/dealWith/backlog.vue

@@ -154,6 +154,7 @@ const config = computed(() => {
 									query: {
 										flowKey: row.flowKey,
 										id: row.id,
+										businessId: row.businessId,
 										processType:20,
 										version:row.version
 									},
@@ -172,6 +173,7 @@ const config = computed(() => {
 										query: {
 											flowKey: row.flowKey,
 											id: row.id,
+											businessId: row.businessId,
 											processType:nodeType == 1 ? 30 : 10,
 											businessId:row.businessId,
 											version:row.version

src/views/process/dealWith/index.vue

@@ -165,6 +165,7 @@ const config = computed(() => {
 								query: {
 									flowKey: row.flowKey,
 									id: row.id,
+									businessId: row.businessId,
 									processType:20,
 									version:row.version
 								},

src/views/process/processApproval/index.vue

@@ -788,11 +788,20 @@ onMounted(async () => {
     route.query.processType == 20 ||
     route.query.processType == 30
   ) {
-    await proxy
-      .post("/flowProcess/getStartData", { flowId: route.query.id })
-      .then((res) => {
-        queryData.data = { ...res };                          
-      });
+    if(route.query.flowKey == "account_request_funds_flow") {
+      await proxy
+        .post("/accountRequestFunds/detail", { id: route.query.businessId })
+        .then((res) => {
+          queryData.data = { ...res };                          
+        });
+    } else {
+
+      await proxy
+        .post("/flowProcess/getStartData", { flowId: route.query.id })
+        .then((res) => {
+          queryData.data = { ...res };                          
+        });
+    }
   } else {
     queryData.data = { ...route.query };
   }

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" />

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

@@ -298,7 +298,7 @@ const sourceList = ref({
     keyword: "",
     settlementStatus: "",
     userId: "",
-    isArrival:'1',
+    isArrival: "1",
   },
 });
 const loading = ref(false);
@@ -605,7 +605,11 @@ const submitChangeForm = () => {
 };
 const clickSettlement = (row) => {
   const data = {
-    id: row.contractId,
+    ...row,
+    grossGrofit: row.grossProfit,
+    grossRofitMargin: row.grossProfitMargin,
+    contractCurrency: row.currency,
+    purchaseCurrency: "CNY",
     settlementStatus: 1,
   };
   proxy.post("/saleStatement/settlement", data).then(() => {
@@ -618,8 +622,12 @@ const clickSettlement = (row) => {
 };
 const clickCancelSettlement = (row) => {
   proxy
-    .post("/saleStatement/update", {
-      id: row.contractId,
+    .post("/saleStatement/settlement", {
+      ...row,
+      grossGrofit: row.grossProfit,
+      grossRofitMargin: row.grossProfitMargin,
+      contractCurrency: row.currency,
+      purchaseCurrency: "CNY",
       settlementStatus: 0,
     })
     .then(() => {