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

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -711,6 +711,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -710,6 +710,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',