Merge remote-tracking branch 'origin/master'

futian.liu

2023-12-09 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa

 admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue

@@ -126,7 +126,7 @@
      table: {
        showIndex: true, // 是否显示序号
        expand: false, // 是否显示详情数据
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel', // 请求地址
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel2', // 请求地址
        // 工具条
        tools: {
          columnsCtrl: {
@@ -158,7 +158,7 @@
            title: '操作时间', field: 'dealTime', align: 'center',
            width: 160,
            formatter: (row) => {
              return {value: DateFormatter.LongToDateTime(row.createTime)};
              return {value: DateFormatter.LongToDateTime(row.dealTime)};
            },
          },
        ],