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

src/components/process/PurchasePayment.vue

@@ -280,6 +280,7 @@ const getDict = () => {
             value: item.dictKey,
           };
         });
+        console.log(fundsPaymentMethod.value);
       }
     });
   proxy.post("/supplierInfo/page", { pageNum: 1, pageSize: 999 }).then((res) => {
@@ -425,10 +426,14 @@ onMounted(async () => {
               } else {
                 formData.data.payDetailList = [{ purchaseId: ids[i], money: undefined, remark: "" }];
               }
-              changePurchaseId({ purchaseId: ids[i] });
             }
           }
         }
+        if (formData.data.payDetailList && formData.data.payDetailList.length > 0) {
+          for (let i = 0; i < formData.data.payDetailList.length; i++) {
+            changePurchaseId(formData.data.payDetailList[i]);
+          }
+        }
       }
     }
   }

src/views/salesMange/saleContract/contract/index.vue

@@ -55,15 +55,17 @@
             <div style="padding: 16px 0">
               {{ printDetails.sellCountryName }},{{ printDetails.sellProvinceName }},{{ printDetails.sellCityName }},{{ printDetails.sellDetailedAddress }}
             </div>
-            <div>{{ printDetails.sellContactName }},{{ printDetails.sellContactNumber }}</div>
+            <div>CONTACT: {{ printDetails.sellContactName }}</div>
+            <div>TEL.: {{ printDetails.sellContactNumber }}</div>
           </div>
           <div style="width: 50%">
             <div style="color: #409eff">BUYER:</div>
             <div>{{ printDetails.buyCorporationName }}</div>
             <div style="padding: 16px 0">
-              {{ printDetails.buyCountryName }},{{ printDetails.buyProvinceName }},{{ printDetails.buyCityName }},{{ printDetails.buyDetailedAddress }}
+              {{ printDetails.buyDetailedAddress }},{{ printDetails.buyCityName }},{{ printDetails.buyProvinceName }},{{ printDetails.buyCountryName }}
             </div>
-            <div>{{ printDetails.buyContactName }},{{ printDetails.buyContactNumber }}</div>
+            <div>CONTACT: {{ printDetails.buyContactName }}</div>
+            <div>TEL.: {{ printDetails.buyContactNumber }}</div>
           </div>
         </div>
         <div style="height: 16px"></div>
@@ -92,7 +94,7 @@
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black">
               <div style="color: #409eff">CURRENCY:</div>
               <div>
-                {{ dictValueLabel(printDetails.currency, accountCurrency) }}
+                {{ printDetails.currency }}
               </div>
             </div>
             <div style="width: 33%; border-bottom: 1px solid black">
@@ -163,12 +165,14 @@
         </div> -->
         <div class="baseRow" style="display: flex">
           <div class="contentRow" style="width: calc(100% - 100px); text-align: right; color: #409eff">FREIGHT COST:</div>
-          <div class="contentRow" style="width: 100px; text-align: center">0</div>
+          <div class="contentRow" style="width: 100px; text-align: center">
+            {{ statisticsTwo("amount", 2) }}
+          </div>
         </div>
         <div class="baseRow" style="display: flex">
           <div class="contentRow" style="width: calc(100% - 100px); text-align: right; color: #409eff">TOTAL PRICE:</div>
           <div class="contentRow" style="width: 100px; text-align: center">
-            {{ statistics("amount", 2) }}
+            {{ printDetails.totalAmount }}
           </div>
         </div>
         <div class="baseRow" style="display: flex; border-bottom: 1px solid black">
@@ -634,6 +638,17 @@ const statistics = (label, index) => {
   }
   return num;
 };
+const statisticsTwo = (label, index) => {
+  let num = 0;
+  if (printDetails.value.contractProjectList && printDetails.value.contractProjectList.length > 0) {
+    printDetails.value.contractProjectList.map((item) => {
+      if (item[label]) {
+        num = parseFloat(Number(num) + Number(item[label])).toFixed(index);
+      }
+    });
+  }
+  return num;
+};
 </script>
 
 <style lang="scss" scoped>