From 411213023f78a979e1579627f2e4843992ef3eaa Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Thu, 30 May 2024 08:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=87=AD=E8=AF=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/saleCenter/deliveryOrder/form.vue     | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
index b9c2afdc..454a3472 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
@@ -1333,7 +1333,7 @@ export default {
         this.dataForm.deliveryProductRelationList = [];
         data.forEach(item => {
           item.voucherId = item.id;
-          item.businessType = '1'
+          item.businessType = '4'
           this.dataForm.deliveryVoucherRelationList.push(item);
           this.dataForm.deliveryProductRelationList = [...this.dataForm.deliveryProductRelationList, ...item.voucherProductList];
           if (item.businessOrderId) {
@@ -1355,19 +1355,36 @@ export default {
                 this.dataForm.warehouseId = purchaseOrder.deliveryWarehouse
                 this.dataForm.deliveryAddress = purchaseOrder.receiveAddress
                 this.dataForm.businessOrderInfoList = res.data
-                purchaseOrder.businessOrderProductRelationalList.forEach(e => {
-                  const target = this.dataForm.deliveryProductRelationList.find(p => e.productId == p.productId && e.salesMainUnitId == p.unit)
-                  if (target) {
-                    target.businessType = '1'
-                    target.inventoryUnitId = e.inventoryUnitId
-                    target.salesMainUnitId = e.salesMainUnitId
-                    target.saleNum = e.businessNum
-                    target.deliveryUnit = e.salesMainUnitId
-                    target.returnUnit = e.businessPrice
-                    target.tax = e.tax
-                    target.taxCount = e.taxCount
-                    target.notTaxPrice = e.notTaxPrice
-                    target.notTaxCount = e.notTaxCount
+                // purchaseOrder.businessOrderProductRelationalList.forEach(e => {
+                //   const target = this.dataForm.deliveryProductRelationList.find(p => e.productId == p.productId && e.salesMainUnitId == p.unit)
+                //   if (target) {
+                //     target.businessType = '1'
+                //     target.inventoryUnitId = e.inventoryUnitId
+                //     target.salesMainUnitId = e.salesMainUnitId
+                //     target.saleNum = e.businessNum
+                //     target.deliveryUnit = e.salesMainUnitId
+                //     target.returnUnit = e.businessPrice
+                //     target.tax = e.tax
+                //     target.taxCount = e.taxCount
+                //     target.notTaxPrice = e.notTaxPrice
+                //     target.notTaxCount = e.notTaxCount
+                //   }
+                // })
+                this.dataForm.deliveryProductRelationList.find((p) => {
+                  const e = purchaseOrder.businessOrderProductRelationalList.find(q => {
+                    return q.productId == p.productId && q.salesMainUnitId == p.unit
+                  })
+                  if (e) {
+                    p.businessType = '4'
+                    p.inventoryUnitId = e.inventoryUnitId
+                    p.salesMainUnitId = e.salesMainUnitId
+                    p.saleNum = e.businessNum
+                    p.deliveryUnit = e.salesMainUnitId
+                    p.returnUnit = e.businessPrice
+                    p.tax = e.tax
+                    p.taxCount = e.taxCount
+                    p.notTaxPrice = e.notTaxPrice
+                    p.notTaxCount = e.notTaxCount
                   }
                 })
                 const defaultArr = this.dataForm.deliveryProductRelationList