Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

hsy

5 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/mes/cal/plan/data.ts

@@ -97,7 +97,7 @@
      componentProps: {
        format: 'YYYY-MM-DD',
        placeholder: '请选择开始日期',
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD',
      },
      rules: 'required',
    },
@@ -108,7 +108,7 @@
      componentProps: {
        format: 'YYYY-MM-DD',
        placeholder: '请选择结束日期',
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD',
      },
      rules: 'required',
    },