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

src/views/wms/supplierManage/supplierDeliMain/index.vue

@@ -164,7 +164,7 @@ const { tableObject, tableMethods } = useTable({
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 const getListExecute = () => {
-  tableObject.params.yearAndMonth=formatDate(new Date(),'YYYYMM')
+  tableObject.params.yearAndMonth=formatDate(new Date(),'YYYY-MM')
   getList()
   tableObject.tableList.forEach(item=>item.isOpen = false)
 }

src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts

@@ -53,10 +53,10 @@ export const SupplierDeliMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     search: {
       component: 'DatePicker',
-      value: formatDate(new Date(),'YYYYMM'),
+      value: formatDate(new Date(),'YYYY-MM'),
       componentProps: {
         type: 'month',
-        valueFormat: 'YYYYMM',
+        valueFormat: 'YYYY-MM',
       }
     }
   },