From d663209b65bee5a6f9641fe43abca9d0269d7c3f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 15:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95-=E6=92=A4=E9=94=80=E6=B7=BB=E5=8A=A0relateRecordNumbe?=
 =?UTF-8?q?r=20=20revokeFlag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleShipmentMainRecord/index.vue          | 24 +++++++++++------
 .../saleShipmentMainRecord.data.ts            | 27 +++++++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index 4e83e6db6..b38c26706 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -33,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -142,13 +142,21 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
 // 列表-操作按钮
-const butttondata = [
-  // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
-  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
-  defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort'}), // 撤销
-]
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
+    defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:row.revokeFlag=='TRUE'}), // 撤销
+  ]
+}
+
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index b2d8dc569..6afc3ec22 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -32,6 +32,33 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     }
   },
+  {
+    label: '关联单据号',
+    field: 'relateRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    table: {
+      width: 150
+    },
+    detail:{
+      // dictType:'primary',
+      // valueFilter:(value)=>{
+      //   if(value=='TRUE'){
+      //     return `是`
+      //   }else{
+      //     return '否'
+      //   }
+      // }
+    }
+  },
   {
     label: '发票时间',
     field: 'invoiceTime',