Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

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/saleContract/contract/index.vue

@@ -8,7 +8,7 @@
         :loading="loading"
         :selectConfig="selectConfig"
         highlight-current-row
-        :statConfig='statConfig'
+        :statConfig="statConfig"
         :action-list="[
           {
             text: '创建合同',
@@ -400,30 +400,30 @@ const config = computed(() => {
                 },
               }
             : {},
-          row.issue && row.issue === "0" && row.status == 30
-            ? {
-                attrs: {
-                  label: "下发交接单",
-                  type: "primary",
-                  text: true,
-                },
-                el: "button",
-                click() {
-                  ElMessageBox.confirm("是否确认下发交接单?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                  }).then(() => {
-                    proxy
-                      .post("/contract/edit", { id: row.id, issue: 1 })
-                      .then(() => {
-                        ElMessage({ message: "下发成功", type: "success" });
-                        getList();
-                      });
-                  });
-                },
-              }
-            : {},
+          // row.issue && row.issue === "0" && row.status == 30
+          //   ? {
+          //       attrs: {
+          //         label: "下发交接单",
+          //         type: "primary",
+          //         text: true,
+          //       },
+          //       el: "button",
+          //       click() {
+          //         ElMessageBox.confirm("是否确认下发交接单?", "提示", {
+          //           confirmButtonText: "确定",
+          //           cancelButtonText: "取消",
+          //           type: "warning",
+          //         }).then(() => {
+          //           proxy
+          //             .post("/contract/edit", { id: row.id, issue: 1 })
+          //             .then(() => {
+          //               ElMessage({ message: "下发成功", type: "success" });
+          //               getList();
+          //             });
+          //         });
+          //       },
+          //     }
+          //   : {},
           row.status == 30
             ? {
                 attrs: {
@@ -584,14 +584,13 @@ const getList = async (req) => {
   });
 };
 const statConfig = computed(() => {
-	return [
-		{
-			label: '合计',
-			data:[],
-		},
-		
-	]
-})
+  return [
+    {
+      label: "合计",
+      data: [],
+    },
+  ];
+});
 getDict();
 if (route.query.code) {
   sourceList.value.pagination.keyword = route.query.code;
@@ -601,46 +600,46 @@ const getTotal = () => {
   proxy.get("/contract/getHeadCustomerStatistics").then((res) => {
     statConfig.value[0].data = [];
     statConfig.value[0].data.push({
-      label:'合计',
-      data:[
+      label: "合计",
+      data: [
         {
-          label:'数量',
-          num:res.data.sumQuantity,
-          color:'rgb(171 0 255)',
+          label: "数量",
+          num: res.data.sumQuantity,
+          color: "rgb(171 0 255)",
         },
         {
-          label:'金额',
-          num:res.data.sumArrivalAmount,
-          color:'rgb(171 0 255)',
+          label: "金额",
+          num: res.data.sumArrivalAmount,
+          color: "rgb(171 0 255)",
         },
         {
-          label:'到账金额',
-          num:res.data.sumAmount,
-          color:'rgb(171 0 255)',
+          label: "到账金额",
+          num: res.data.sumAmount,
+          color: "rgb(171 0 255)",
         },
-      ]
-    })
+      ],
+    });
     for (let i = 0; i < res.data.list.length; i++) {
       statConfig.value[0].data.push({
-        label:res.data.list[i].sellCorporationName,
-        data:[
+        label: res.data.list[i].sellCorporationName,
+        data: [
           {
-            label:'数量',
-            num:res.data.list[i].sumQuantity,
-            color:'blue',
+            label: "数量",
+            num: res.data.list[i].sumQuantity,
+            color: "blue",
           },
           {
-            label:'金额',
-            num:res.data.list[i].sumClaimMoney,
-            color:'blue',
+            label: "金额",
+            num: res.data.list[i].sumClaimMoney,
+            color: "blue",
           },
           {
-            label:'到账金额',
-            num:res.data.list[i].sumClaimMoney,
-            color:'blue',
+            label: "到账金额",
+            num: res.data.list[i].sumClaimMoney,
+            color: "blue",
           },
-        ]
-      })
+        ],
+      });
     }
     console.log(res);
   });

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(() => {

src/views/salesMange/shipmentMange/document/index.vue

@@ -223,9 +223,9 @@
         <el-button @click="clickPrint(2)" type="primary">商业发票</el-button>
         <el-button @click="clickPrint(3)" type="primary">销售确认书</el-button>
         <el-button @click="clickPrint(4)" type="primary">报关单</el-button>
-        <!-- <el-button @click="clickPrint(5)" type="primary"
+        <el-button @click="clickPrint(5)" type="primary"
           >代理报关委托书</el-button
-        > -->
+        >
       </div>
       <template #footer>
         <el-button @click="openSelectPrint = false" size="large"
@@ -238,7 +238,7 @@
       <div id="printMe">
         <div
           id="pdfDom"
-          style="padding: 16px; font-size: 12px !important;font-family: 'msyh';"
+          style="padding: 16px; font-size: 12px !important; font-family: 'msyh'"
         >
           <div v-if="openStatus === 1">
             <div style="font-size: 16px; text-align: center; font-weight: 700">
@@ -1210,7 +1210,12 @@
       <div id="printMe">
         <div
           id="pdfDom"
-          style="width: 1400px; padding: 16px; font-size: 12px !important;font-family: 'msyh';"
+          style="
+            width: 1400px;
+            padding: 16px;
+            font-size: 12px !important;
+            font-family: 'msyh';
+          "
         >
           <table cellspacing="0" cellpadding="0" border="0" class="one">
             <tr>
@@ -3123,41 +3128,42 @@ const clickPrint = (status) => {
       .then((res) => {
         if (res.data.content) {
           res.data.content = JSON.parse(res.data.content);
-          if (
-            res.data.content.products &&
-            res.data.content.products.length > 0
-          ) {
-            let arr = [];
-            for (let i = 0; i < res.data.content.products.length; i++) {
-              const ele = res.data.content.products[i];
-              let index = -1;
-              if (i === 0) {
-                arr.push(ele);
-              } else {
-                const isHaveProduct = arr.some((x, i) => {
-                  if (x.productId === ele.productId) {
-                    index = i;
-                    return true;
-                  }
-                });
-                if (isHaveProduct && index >= 0) {
-                  arr[index].quantity += ele.quantity;
-                } else {
-                  arr.push(ele);
-                }
-              }
-            }
-            res.data.content.products = arr;
-          }
+          // if (
+          //   res.data.content.products &&
+          //   res.data.content.products.length > 0
+          // ) {
+          //   let arr = [];
+          //   for (let i = 0; i < res.data.content.products.length; i++) {
+          //     const ele = res.data.content.products[i];
+          //     let index = -1;
+          //     if (i === 0) {
+          //       arr.push(ele);
+          //     } else {
+          //       const isHaveProduct = arr.some((x, i) => {
+          //         if (x.productId === ele.productId) {
+          //           index = i;
+          //           return true;
+          //         }
+          //       });
+          //       if (isHaveProduct && index >= 0) {
+          //         arr[index].quantity += ele.quantity;
+          //       } else {
+          //         arr.push(ele);
+          //       }
+          //     }
+          //   }
+          //   res.data.content.products = arr;
+          // }
         }
         printCustomsDeclaration.value = res.data;
       });
   } else {
+    openStatus.value = status;
     mandateDialog.value = true;
+    proxy.post(`/documentsPdf/detail?id=${rowData.value.id}`).then((res) => {
+      console.log(res, "sada");
+    });
   }
-  // proxy.get("/documents/generateInvoiceAPackPdf", { id: rowData.value.id }).then((res) => {
-  //   printDetails.value = res.data;
-  // });
 };
 const clickDownload = () => {
   if (openStatus.value === 1) {
@@ -3172,7 +3178,7 @@ const clickDownload = () => {
     data.content = JSON.stringify(data.content);
     proxy.post("/documentsPdf/add", data).then();
     setTimeout(() => {
-      proxy.getPdf("报关单PDF文件",1400);
+      proxy.getPdf("报关单PDF文件", 1400);
       nextTick(() => {
         setTimeout(() => {
           textShow.value = false;