Merge branch 'master' into stage

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

@@ -224,7 +224,7 @@
             <div style="width: 33%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">付款方式 TERMS OF PAYMENT:</div>
               <div>
-                {{ printDetails.contract.paymentMethod }}
+                {{ printDetails.contract.remark }}
               </div>
             </div>
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
@@ -280,7 +280,7 @@
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">CURRENCY:</div>
               <div>
-                {{ dictValueLabel(printDetails.contract.currency, accountCurrency) }}
+                {{ printDetails.contract.currency }}
               </div>
             </div>
             <div style="width: 33%; border-bottom: 1px solid black; padding-left: 4px">
@@ -298,7 +298,7 @@
             <div style="width: 67%; padding-left: 4px">
               <div style="font-weight: 700">付款方式 TERMS OF PAYMENT:</div>
               <div>
-                {{ printDetails.contract.paymentMethod }}
+                {{ printDetails.contract.remark }}
               </div>
             </div>
           </div>
@@ -329,9 +329,9 @@
               <div style="font-weight: 700">总毛重 TOTAL GROSS WEIGHT/KG</div>
               <div>{{ printDetails.sumRoughWeight }}</div>
               <div style="font-weight: 700">总净重 TOTAL NET WEIGHT/KG</div>
-              <div>{{ printDetails.sumBomVolume }}</div>
-              <div style="font-weight: 700">总体积 TOTAL DIMENSION/M3</div>
               <div>{{ printDetails.sumNetWeight }}</div>
+              <div style="font-weight: 700">总体积 TOTAL DIMENSION/M3</div>
+              <div>{{ printDetails.sumBomVolume }}</div>
             </div>
           </div>
         </div>
@@ -402,7 +402,7 @@
                 <div style="text-align: center">HS CODE: {{ item.customsCode }}</div>
               </td>
               <td style="text-align: center" v-if="[3].includes(openStatus)">
-                {{ item.productUnit }}
+                {{ dictValueLabel(item.productUnit, productUnit) }}
               </td>
               <td style="text-align: center">{{ item.quantity }}</td>
               <td :rowspan="printDetails.documentsProducts.length" style="text-align: center" v-if="index === 0 && [1].includes(openStatus)">
@@ -426,9 +426,17 @@
               <td></td>
               <td style="text-align: center">{{ printDetails.contract.currency }}{{ statistics("price", "quantity", 2) }}</td>
             </tr>
+            <template v-if="printDetails.contractProjectList && printDetails.contractProjectList.length > 0">
+              <tr v-for="(item, index) in printDetails.contractProjectList" :key="index">
+                <td :colspan="4" style="text-align: left; padding-left: 4px">{{ item.payName }}:</td>
+                <td style="text-align: center">{{ printDetails.contract.currency }}{{ item.amount }}</td>
+              </tr>
+            </template>
             <tr>
-              <td :colspan="4" style="text-align: left; padding-left: 4px">TOTAL EXW PRICE:</td>
-              <td style="text-align: center">{{ printDetails.contract.currency }}{{ statistics("price", "quantity", 2) }}</td>
+              <td :colspan="4" style="text-align: left; padding-left: 4px">
+                TOTAL {{ dictValueLabel(printDetails.contract.tradeMethods, tradeMethods) }} PRICE:
+              </td>
+              <td style="text-align: center">{{ printDetails.contract.currency }}{{ getAllMoney(statistics("price", "quantity", 2)) }}</td>
             </tr>
           </template>
           <template v-if="[3].includes(openStatus)">
@@ -447,7 +455,9 @@
               </tr>
             </template>
             <tr>
-              <td :colspan="5" style="text-align: left; padding-left: 4px">TOTAL EXW PRICE:</td>
+              <td :colspan="5" style="text-align: left; padding-left: 4px">
+                TOTAL {{ dictValueLabel(printDetails.contract.tradeMethods, tradeMethods) }} PRICE:
+              </td>
               <td style="text-align: center">{{ printDetails.contract.currency }}{{ getAllMoney(statistics("price", "quantity", 2)) }}</td>
             </tr>
           </template>
@@ -1033,6 +1043,7 @@ const fundsPaymentMethod = ref([]);
 const shippingMethod = ref([]);
 const tradeMethods = ref([]);
 const accountCurrency = ref([]);
+const productUnit = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -1209,6 +1220,23 @@ const getDict = () => {
         });
       }
     });
+  proxy
+    .post("/dictTenantData/page", {
+      pageNum: 1,
+      pageSize: 999,
+      dictCode: "unit",
+      tenantId: useUserStore().user.tenantId,
+    })
+    .then((res) => {
+      if (res.rows && res.rows.length > 0) {
+        productUnit.value = res.rows.map((item) => {
+          return {
+            label: item.dictValue,
+            value: item.dictKey,
+          };
+        });
+      }
+    });
 };
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };