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

hsy

5 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/mes/pro/card/data.ts

@@ -347,7 +347,7 @@
        class: '!w-full',
        placeholder: '请选择进入工序时间',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
    },
    {
@@ -358,7 +358,7 @@
        class: '!w-full',
        placeholder: '请选择出工序时间',
        showTime: true,
        valueFormat: 'x',
        valueFormat: 'YYYY-MM-DD HH:mm:ss',
      },
    },
    {