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

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -245,6 +245,9 @@ export const DeliverPlanMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
   ], 
+  planDate: [
+    { required: true, message: '计划日期不能为空', trigger: 'change' }
+  ],
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -48,6 +48,29 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    isTable: true,
+    isForm: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
   {
     label: '时间窗口',
     field: 'timeWindow',