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

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -286,15 +286,14 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isTable: false
     },
-    // {
-    //   label: '备注',
-    //   field: 'remark',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTable: false
-    // },
+    {
+      label: '主备注',
+      field: 'mainRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '是否已撤销',
       field: 'revokeFlag',
@@ -746,22 +745,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   search: {
-  //     component: 'Input',
-  //     componentProps: {
-  //       placeholder: '请输入备注'
-  //     }
-  //   },
-  //   isTable: true,
-  // },
+  {
+    label: '明细备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',