From c77f769090ec9320375f47531310824c02ca34de Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 30 Aug 2024 13:14:02 +0800
Subject: [PATCH] =?UTF-8?q?HL-5257:=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=EF=BC=8C=E8=BF=99?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRecordMain/scrapRecordMain.data.ts   | 53 +++++++++++++------
 .../unplannedissueRecordMain.data.ts          | 19 +++++++
 .../unplannedreceiptRecordMain.data.ts        | 20 +++++++
 .../productscrapRecordMain.data.ts            | 19 +++++++
 4 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 487282f3a..2ddf27dce 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -380,6 +380,25 @@ export const ScrapRecordMain = useCrudSchemas(
         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: 'createTime',
@@ -462,22 +481,6 @@ export const ScrapRecordMain = useCrudSchemas(
     //     width: 150
     //   },
     // },
-    {
-      label: '是否可用',
-      field: 'available',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: true,
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
-      }
-    },
     {
       label: '操作',
       field: 'action',
@@ -732,6 +735,24 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    detail:{
+      dictType:'primary',
+      valueFilter:(value)=>{
+        if(value=='TRUE'){
+          return `是`
+        }else{
+          return '否'
+        }
+      }
+    }
+  },
   {
     label: '接口类型',
     field: 'interfaceType',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 559cf7f47..d1100c8fa 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -382,6 +382,25 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
+  {
+    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: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index 8d03144d5..ab00714be 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -366,6 +366,25 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       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: 'createTime',
@@ -820,6 +839,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
+ 
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 23dd4094f..c195119cc 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -279,6 +279,25 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isTable: false
     },
+    {
+      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: 'creator',