From 4fa5609a71a04f829c470634fa4338ab71e60891 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 16:38:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?HL-5861=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=8F=8A=E5=8F=91=E7=A5=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=92=8C=E4=BB=B7=E5=B7=AE=E6=9F=A5=E7=9C=8B=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts                         | 2 +-
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue      | 4 +++-
 .../supplierinvoiceRequestMain.data.ts                        | 2 +-
 .../supplierinvoiceRequestMainDifference.data.ts              | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 459b0be99..bdd554d54 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1234,7 +1234,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
    
   },
   {
-    label: '折扣金额',
+    label: '返利未税金额',//折扣金额
     field: 'discountAmount1',
     formatter: accountantFormart,
    
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 5d60bb7fd..a6f4d02d6 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -106,7 +106,9 @@
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
             beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
-            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff // 价税合计差额=未税差额+税额差异
+            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
+            rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
+            rebateTotal:rebateTax+discountAmount1
           })
         } else if (formType == 'create') {
           // 新增
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index becf3987b..6a06c0bd7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1523,7 +1523,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
    
   },
   {
-    label: '折扣金额',
+    label: '返利未税金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
    
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 93482a5c1..569bfbc44 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -426,7 +426,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   }
   // },
   {
-    label: '折扣金额',
+    label: '返利未税金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
@@ -1505,7 +1505,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
    
   },
   {
-    label: '折扣金额',
+    label: '返利未税金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
    

From 09e88801e80614cb52c2ea569eb443e5b52764b4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 16:53:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 7b8c16871..e84101374 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -81,6 +81,8 @@
     @tableFormButton="tableFormButton"
     :detailValidate="detailValidate"
     :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
   />
 
  <!-- BOM弹窗列表 -->
@@ -689,6 +691,11 @@ const openForm =async (type: string, row?: number) => {
       if (item.field == 'scrappingReason'){
         item.value = ''
       }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.disabled = false
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+      }
     })
   }
   if(type == 'update'){
@@ -697,6 +704,15 @@ const openForm =async (type: string, row?: number) => {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.disabled = true
+        item.componentProps.enterSearch = false
+        item.componentProps.isSearchList = false
+      }
     })
   }
   formRef.value.open(type, row)