打印出库单接口更换和打印数据逻辑调整

zkqy-ui/src/api/tablelist/commonTable.js

@@ -363,6 +363,18 @@ export function outboundOrderInfo(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+// 订单管理  打印出库单  获取详情接口    新
+export function printOutsourceOrderList(data) {
+  return request({
+    url: '/system/order/printOutsourceOrderList',
+    method: 'get',
+    params: data,
+    //baseURL: process.env.VUE_APP_BASE_API1
+  })
+}
+
+
+
 // 订单管理  新的获取详情接口
 export function saleOrderList(data) {
   return request({

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -82,6 +82,7 @@
 import {
   productInvoiceInfo,
   outboundOrderInfo,
+  printOutsourceOrderList,
 } from "@/api/tablelist/commonTable";
 export default {
   name: "OutBound",
@@ -155,11 +156,19 @@ export default {
 
       console.log(row);
       try {
-        let payload = {
-          saleOrderNo: row.saleOrderSaleNo || row.saleNo,
-        };
+        let payload = {};
+        if (isRetail) {
+          payload = {
+            saleOrderNo: row.saleOrderSaleNo,
+          };
+        } else {
+          payload = {
+            saleNo: row.saleNo,
+          };
+        }
         console.log(payload);
-        let res = await outboundOrderInfo(payload);
+        let fun = isRetail ? outboundOrderInfo : printOutsourceOrderList;
+        let res = await fun(payload);
         if (res.code == 200) {
           res.data.forEach((item) => {
             // if (Number(item.productNumber) && Number(item.productUnitPrice)) {
@@ -169,6 +178,14 @@ export default {
             // } else {
             //   item.price = 0;
             // }
+            if (!isRetail) {
+              //非零售订单  计算金额
+              if (Number(item.productUnitPrice) && Number(item.productNumber)) {
+                item.productAmounts = (
+                  Number(item.productNumber) * Number(item.productUnitPrice)
+                ).toFixed(2);
+              }
+            }
             item.unit = "";
           });
           this.tableData = res.data;