From 54028775d0eab911d53aa4cdb8a553a9cd0633c6 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 30 Jul 2024 14:03:02 +0800
Subject: [PATCH] =?UTF-8?q?bug:SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=831?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E8=B4=AD=E5=AE=A1=E6=89=B9=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=A8=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=B2=A1=E6=9C=89=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=202=E3=80=81=E9=87=87=E8=B4=AD=E5=AE=A1=E6=89=B9=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      |  2 +-
 .../supplierinvoiceRequestMain.data.ts        | 82 +++++++++++++++++--
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3a43c6830..09c935f94 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -343,7 +343,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
       if (type == 'tableForm') {
         // 明细查询页赋值
         val.forEach(item=>{
-          if(tableData.value.find(item1=>item1['recvBillNum'] == item['recvBillNum'])) return
+          if(tableData.value.find(item1=>item1['recvBillNum'] == item['recvBillNum']&&item1['poLine'] == item['poLine'])) return
 
           const newRow = {...row}
           newRow[formField] = item[searchField]
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 96c2e56e7..b2eb7c153 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1468,6 +1468,35 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
+  // {
+  //   label: '总价差',
+  //   field: 'differencePriceTotal',
+  //   formatter: accountantFormart,
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: true,
+  // },
+  // {
+  //   label: '采购金额',
+  //   field: 'purchaseAmontTotal',
+  //   formatter: accountantFormart,
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: true,
+  // },
+  // {
+  //   label: '',
+  //   field: '',
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: true,
+  // },
 
 ]))
 
@@ -2019,18 +2048,53 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
+  //   label: '合同金额',
+  //   field: 'contractAmountTotal',
   //   table: {
-  //     width: 250,
-  //     fixed: 'right'
+  //     width: 150
   //   },
-  //   hiddenInMain:true,
-  //   isTableForm: false,
-  // }
+  //   isForm:false,
+  //   tableForm:{
+  //     disabled: true
+  //   }
+  // },
+  // {
+  //   label: '采购金额',
+  //   field: 'purchaseAmontTotal',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   tableForm:{
+  //     disabled: true
+  //   }
+  // },
+  // {
+  //   label: '总差额',
+  //   field: 'differencePriceTotal',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   tableForm:{
+  //     disabled: true
+  //   }
+  // },
+  
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 250,
+      fixed: 'right'
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+  }
 ]))
+
 // 批次校验
 const validateSinglePrice = (rule: any, value: any, callback: any) => {
   if (Number(value)>0) {