Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 44b1fe9c919f833151445a30ba978beb041f8692

 admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue

@@ -288,7 +288,7 @@
      fenfaData: [],
      formData: {
        departmentId: '', // 报废部门id
        dealTime: '', // 报废时间
        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 报废时间
        procureDoc: '',
        goods: [],
      },