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

liu

2 天以前 950e1332f89e3d18a8f4b415bd4fe274dce1e954

 src/views/wls/stocktaking/task/data.ts

@@ -134,7 +134,7 @@
      componentProps: {
        placeholder: '请选择开始时间',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      dependencies: {
        triggerFields: ['type'],
@@ -148,7 +148,7 @@
      componentProps: {
        placeholder: '请选择结束时间',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      dependencies: {
        triggerFields: ['type'],