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

src/views/wms/basicDataManage/orderManage/shift/shift.data.ts

@@ -32,28 +32,28 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'HH:mm:ss'
     },
     sort: 'custom', 
     table: {
-      width: 180
+      width: 180,
     },
     form: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
         style: {width:'100%'},
-        type: 'datetime',
+        type: 'time',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'HH:mm:ss',
         valueFormat: 'x',
       }
     },
     isSearch: true,
     search: {
       show: true,
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'HH:mm:ss',
-        type: 'daterange',
+        type: 'timeSelect',
       }
     }
   },
@@ -63,28 +63,28 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'HH:mm:ss',
     },
     sort: 'custom',
     table: {
       width: 180
     },
     form: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
         style: {width:'100%'},
-        type: 'datetime',
+        type: 'time',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'HH:mm:ss',
         valueFormat: 'x',
       }
     },
     isSearch: true,
     search: {
       show: true,
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'HH:mm:ss',
-        type: 'daterange',
+        type: 'timeSelect',
       }
     }
   },

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

@@ -317,6 +317,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/demandforecastingMain/demandforecastingMain.data.ts

@@ -251,6 +251,20 @@ export const DemandforecastingMainRules = reactive({
  * @returns {Array} 要货预测子表
  */
 export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    }
+  },
   {
     label: '预测时间类型',
     field: 'predictTimeType',
@@ -387,20 +401,6 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     }
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disbaled: true
-      }
-    }
-  },
   {
     label: '物料代码',
     field: 'itemCode',