Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@@ -177,6 +177,24 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '出库原因',
+      field: 'outboundReason',
+      dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -138,6 +138,24 @@ export const ScrapRecordMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '出库原因',
+      field: 'outboundReason',
+      dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
     {
       label: '项目代码',
       field: 'projectCode',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -304,9 +304,6 @@ export const ScrapRequestMain = useCrudSchemas(
       field: 'outboundReason',
       dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
       dictClass: 'string',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return cellValue
-      },
       table: {
         width: 150
       },