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

src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts

@@ -78,11 +78,32 @@ export const DeliveryCalendar = useCrudSchemas(
       isSearch: true
     },
 
+    // {
+    //   label: '年月',
+    //   field: 'yearAndMonth',
+    //   sort: 'custom',
+    //   isSearch: true,
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   },
+    // },
+
     {
       label: '年月',
       field: 'yearAndMonth',
       sort: 'custom',
+      isTable: false,
       isSearch: true,
+      search: {
+        component: 'DatePicker',
+        value: formatDate(new Date(),'YYYYMM'),
+        componentProps: {
+          type: 'month',
+          valueFormat: 'YYYYMM',
+        }
+      },
       form: {
         componentProps: {
           disabled: true