Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈

gaoluyang

2026-06-03 dcc3a4d842740f7ff6e79a58ddec945f50ea9b5d

 src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js

@@ -82,19 +82,23 @@
 * 业务申请主表列：固定列 + formConfig 动态列 + 审批状态 + 操作
 */
export function buildInstanceTableColumns(tableDataRef, buildTableActions, options = {}) {
  const { moduleKey, excludeKeys = DEFAULT_EXCLUDE_KEYS, beforeFormColumns = [], extraColumns = [], afterFormColumns = [], actionWidth = 260 } = options;
  const { moduleKey, excludeKeys = DEFAULT_EXCLUDE_KEYS, beforeFormColumns = [], extraColumns = [], afterFormColumns = [], actionWidth = 260, showCreateTime = true } = options;

  const leadingCols = moduleKey && INSTANCE_NO_SEARCH_MODULE_KEYS.has(moduleKey) ? [INSTANCE_NO_TABLE_COLUMN] : [];

  return computed(() => {
    const formCols = getFormConfigFieldColumns(tableDataRef.value?.[0], { excludeKeys });
    return [
    const cols = [
      ...leadingCols,
      ...beforeFormColumns,
      ...formCols,
      ...extraColumns,
      ...afterFormColumns,
      { label: "创建时间", prop: "createTime", width: 170 },
    ];
    if (showCreateTime !== false) {
      cols.push({ label: "创建时间", prop: "createTime", width: 170 });
    }
    cols.push(
      {
        label: "审批状态",
        prop: "approvalStatus",
@@ -111,6 +115,7 @@
        width: actionWidth,
        operation: buildTableActions(),
      },
    ];
    );
    return cols;
  });
}