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

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatterYM } from '@/utils/formatTime'
 import { validateTwoNum } from '@/utils/validator'
 import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
 const { t } = useI18n() // 国际化
@@ -68,32 +68,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
+  
-    label: '年月',
-    field: 'yearsMonth',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM'
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'YYYY-MM'
-      }
-    },
-  },
   // {
   //   label: '年月',
   //   field: 'yearsMonthStr',
@@ -120,7 +95,31 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
- 
+  {
+    label: '年月',
+    field: 'yearsMonth',
+    sort: 'custom',
+    formatter: dateFormatterYM,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'YYYY-MM'
+      }
+    },
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -164,7 +163,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 360,
+      width: 400,
       fixed: 'right'
     }
   }

src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatterYM } from '@/utils/formatTime'
 import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
 const { t } = useI18n() // 国际化
 
@@ -64,21 +64,24 @@ export const CustomerToolApportStatementForecastMain = useCrudSchemas(reactive<C
     label: '年月',
     field: 'yearsMonth',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatterYM,
     isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    detail: {
+      dateFormat: 'YYYY-MM'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'YYYY-MM'
       }
     },
   },
@@ -199,7 +202,6 @@ export const CustomerToolApportStatementForecastDetail = useCrudSchemas(reactive
     field: 'forecastAllocationAmount',
     sort: 'custom',
   },
- 
   {
     label: '操作',
     field: 'action',
@@ -215,13 +217,13 @@ export const CustomerToolApportStatementForecastDetail = useCrudSchemas(reactive
 export const ForecastWithBillDifference = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '车型',
-    field: 'number',
+    field: 'vehicleType',
     sort: 'custom',
     isSearch: true,
   },
   {
     label: '模具分摊预测金额',
-    field: 'articleNumber',
+    field: 'forecastAllocationAmount',
     sort: 'custom',
     isSearch: true,
   },

src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue

@@ -333,16 +333,15 @@ const changeTabs = async (item) => {
     }]
     apiPage.value = CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage
     DetailAllSchemas.value = CustomerToolApportStatementForecastDetail.allSchemas
-    otherHeadButttonData.value = []
+    otherHeadButttonData.value = [{
-    //  otherHeadButttonData.value = [{
+      label: t(`ts.导出`).replace('ts.', ''),
-    //     label: t(`ts.导出`).replace('ts.', ''),
+      name: 'exportDetail',
-    //     name: 'exportDetail',
+      hide: false,
-    //     hide: false,
+      type: 'success',
-    //     type: 'success',
+      icon: 'ep:download',
-    //     icon: 'ep:download',
+      color: '',
-    //     color: '',
+      hasPermi: ''
-    //     hasPermi: ''
+    }]
-    //   }]
   } else  if (item.prop == 'ForecastWithBilltDifference') {
     // 点击预测与对账单差异
     tabsExtend.value = true