From 9f3b15bab43cbe9b77bf8dedd26c2bc15415365b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 10 Sep 2024 10:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5787=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index ec2b54976..e61b147f5 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -168,6 +168,9 @@ export const ScrapJobMain = useCrudSchemas(
       table: {
         width: 150
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '订单号',
@@ -176,6 +179,9 @@ export const ScrapJobMain = useCrudSchemas(
       table: {
         width: 150
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '出库原因',
@@ -266,6 +272,9 @@ export const ScrapJobMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -282,6 +291,9 @@ export const ScrapJobMain = useCrudSchemas(
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
       sort: 'custom',
       table: {
         width: 180
@@ -301,7 +313,7 @@ export const ScrapJobMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
     },
     {
       label: '从库区代码范围',
@@ -309,7 +321,10 @@ export const ScrapJobMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '从库区类型范围',
@@ -327,11 +342,13 @@ export const ScrapJobMain = useCrudSchemas(
       field: 'toAreaTypes',
       dictType: DICT_TYPE.AREA_TYPE,
       dictClass: 'string',
-      isTable: true,
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     // {
     //   label: '状态',
@@ -350,7 +367,10 @@ export const ScrapJobMain = useCrudSchemas(
       },
       form: {
         component: 'InputNumber'
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '优先级增量',
@@ -361,7 +381,10 @@ export const ScrapJobMain = useCrudSchemas(
       },
       form: {
         component: 'InputNumber'
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '业务类型',
@@ -385,7 +408,10 @@ export const ScrapJobMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '单据备注',
@@ -885,25 +911,11 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '原因',
+    label: '报废原因',
     field: 'reason',
-    dictType: DICT_TYPE.SCRAP_REASON,
-    dictClass: 'string',
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return cellValue
-    },
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        filterable: true
-      }
-    },
-    tableForm: {
-      type: 'Select',
-      filterable: true
-    }
   },
   {
     label: '货主代码',
@@ -912,6 +924,9 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
   },
   // {
   //   label: '项目代码',
@@ -928,6 +943,9 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
   },
   {
     label: '创建时间',