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

hsy

4 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/mes/tm/tool/data.ts

@@ -183,7 +183,7 @@
      componentProps: {
        format: 'YYYY-MM-DD HH:mm:ss',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
      dependencies: {
        triggerFields: ['maintenType'],