Skip to content

W
WebPublic
提交 736022d4 authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

禅道 32366 二级学院审核，所有二级学院审核后在已处理中加导出功能 103152

上级 adf21efd
隐藏空白字符变更
内嵌 并排
正在显示 包含 220 行增加 和 218 行删除
FormInsertDiy/AffairPage/AuditPage/index.js
浏览文件 @ 736022d4
......@@ -11,216 +11,213 @@ import AuditPage from './AuditPage';
import * as destructionFunc from '../destruction';
import { Link } from 'dva/router';
import CreateC from '../../ExportComponent/ContextCreate';
import prepareShow from '@/webPublic/one_stop_public/Table/prepareShow';
import exportHandledInfo from '@/webPublic/FormInsertDiy/AffairPage/AuditPage/exportHandledInfo';
class Index extends React.Component {
static defaultProps = {
hasBatchAudit: false, // 是否有批量审核按钮 默认关掉 如果有需要再在外面包一层 2020年5月6日 18:44:11 钟是志
batchAuditButtonName: '批量审核', // 如果需要批量审核 则直接用 BatchAudit.js 文件
};
static defaultProps = {
hasBatchAudit: false, // 是否有批量审核按钮 默认关掉 如果有需要再在外面包一层 2020年5月6日 18:44:11 钟是志
batchAuditButtonName: '批量审核', // 如果需要批量审核 则直接用 BatchAudit.js 文件
};
constructor(props) {
super(props);
let pathname = this.props.location.pathname;
this.state = {
columns: [],
dataList: [],
headerInfo: [],
workId: this.props.workId || '',
searchCondition: [],
pathname,
dataBaseId: this.props.dataBaseId || '',
addCondition: [],
addFields: [], // 新增时填写的字段。
tableInfo: {}, // 表格配置属性
allConfigSetInfo: {}, // 返回的数据
};
window.callbackSubmitInfoZhiYong = undefined;
}
constructor(props) {
super(props);
let pathname = this.props.location.pathname;
this.state = {
columns: [],
dataList: [],
headerInfo: [],
workId: this.props.workId || '',
searchCondition: [],
pathname,
dataBaseId: this.props.dataBaseId || '',
addCondition: [],
addFields: [], // 新增时填写的字段。
tableInfo: {}, // 表格配置属性
allConfigSetInfo: {}, // 返回的数据
};
window.callbackSubmitInfoZhiYong = undefined;
}
getFormDetail = (workId) => {
const { dataBaseId } = this.state;
service.getFormDetail(workId)
.then((response) => {
if (typeof response.unifiedServicePatternModel === 'undefined') {
return false;
}
destructionFunc.destructionGetDetail(response, workId)
.then((x) => {
const {
addFields,
tableInfo,
allConfigSetInfo,
searchCondition,
} = x;
this.setState(
{
addFields,
tableInfo,
searchCondition,
allConfigSetInfo,
},
() => {
this.giveDetailColumns();
},
);
});
});
};
getFormDetail = (workId) => {
const { dataBaseId } = this.state;
service.getFormDetail(workId).then((response) => {
console.log(response);
if (typeof response.unifiedServicePatternModel === 'undefined') {
return false;
}
destructionFunc.destructionGetDetail(response, workId).then((x) => {
const { addFields, tableInfo, allConfigSetInfo, searchCondition } = x;
this.setState(
{
addFields,
tableInfo,
searchCondition,
allConfigSetInfo,
},
() => {
this.giveDetailColumns();
},
);
});
});
};
giveDetailColumns = () => {
const {
columns,
workId,
dataBaseId,
addFields,
tableInfo
} = this.state;
const {
showPrint,
routerConfig
} = this.props;
const process_status = columns.find((x) => {
return x.name === 'process_status';
});
if (process_status && process_status.dataIndex) {
process_status.render = (text, record) => {
return record.statusName || record[process_status.dataIndex];
};
}
columns.push({
dataIndex: 'operationDiy',
title: '操作',
fixed: 'right',
render: (text, record) => {
return (
<Link
to={{
pathname: './Detail',
state: {
workId,
dataBaseId,
record,
addFields,
tableInfo,
showPrint: showPrint || routerConfig.showPrint === '1',
},
}}>
{text || '详情'}
</Link>
);
},
});
this.setState({
columns,
});
};
giveDetailColumns = () => {
const { columns, workId, dataBaseId, addFields, tableInfo } = this.state;
const { showPrint, routerConfig } = this.props;
const process_status = columns.find((x) => {
return x.name === 'process_status';
});
if (process_status && process_status.dataIndex) {
process_status.render = (text, record) => {
return record.statusName || record[process_status.dataIndex];
};
}
columns.push({
dataIndex: 'operationDiy',
title: '操作',
fixed: 'right',
render: (text, record) => {
return (
<Link
to={{
pathname: './Detail',
state: {
workId,
dataBaseId,
record,
addFields,
tableInfo,
showPrint: showPrint || routerConfig.showPrint === '1',
},
}}>
{text || '详情'}
</Link>
);
},
});
this.setState({
columns,
});
};
getColumn = () => {
const { workId } = this.state;
service.getColumns(workId)
.then((response) => {
if (!response || !Array.isArray(response)) {
response = [];
}
// console.log('columns', response);
for (let item of response) {
if (item.dataIndex === 'taskName' && !item.width) {
item.width = 150; // 29213 资助事务管理/国家三金/国家奖学金审核（高职），界面排版（100661，bdk@2022*$）
}
if (item.dataIndex === 'createTime' && !item.width) {
item.width = 150; // 29213 资助事务管理/国家三金/国家奖学金审核（高职），界面排版（100661，bdk@2022*$）
}
}
response = response.filter((x) => {
return x.title !== '流程进度';
});
if (response && response.length) {
this.setState(
{
columns: response, // 表头
},
() => {
this.getFormDetail(workId);
},
);
}
});
};
getColumn = () => {
const { workId } = this.state;
service.getColumns(workId).then((response) => {
if (!response || !Array.isArray(response)) {
response = [];
}
// console.log('columns', response);
for (let item of response) {
if (item.dataIndex === 'taskName' && !item.width) {
item.width = 150; // 29213 资助事务管理/国家三金/国家奖学金审核（高职），界面排版（100661，bdk@2022*$）
}
if (item.dataIndex === 'createTime' && !item.width) {
item.width = 150; // 29213 资助事务管理/国家三金/国家奖学金审核（高职），界面排版（100661，bdk@2022*$）
}
}
response = response.filter((x) => {
return x.title !== '流程进度';
});
if (response && response.length) {
this.setState(
{
columns: response, // 表头
},
() => {
this.getFormDetail(workId);
},
);
}
});
};
componentDidMount() {
const { pathname } = this.state;
const { workId } = this.state;
if (workId) {
this.getColumn();
} else {
service.getId(pathname)
.then((x) => {
this.setState(
{
workId: x.workId,
dataBaseId: x.dataBaseId,
},
() => {
this.getColumn();
},
);
});
}
}
componentDidMount() {
const { pathname } = this.state;
const { workId } = this.state;
if (workId) {
this.getColumn();
} else {
service.getId(pathname).then((x) => {
this.setState(
{
workId: x.workId,
dataBaseId: x.dataBaseId,
},
() => {
this.getColumn();
},
);
});
}
}
render() {
const {
workId,
dataBaseId,
columns,
searchCondition,
addFields,
allConfigSetInfo,
tableInfo,
} = this.state;
const {
hasBatchAudit,
batchAuditButtonName,
showPrint,
noNeedForm,
tab2Buttons = [],
} = this.props;
if (!workId) {
return null;
}
if (Array.isArray(columns)){
let d = [];
for (let item of columns) {
if (item.dataIndex !== 'operationDiy') {
d.push({
key: item.dataIndex,
title: item.title,
render() {
const {
workId,
dataBaseId,
columns,
searchCondition,
addFields,
allConfigSetInfo,
tableInfo,
} = this.state;
const { hasBatchAudit, batchAuditButtonName, showPrint, noNeedForm } = this.props;
if (!workId) {
return null;
}
const tab2Buttons = [];
if (window.zdyTableTemplateWillMountProps?.auditTab2ButtonsExport) {
tab2Buttons.push({
type: 'export',
name: '导出',
component: 'Normal',
handleClick: (selectRows, formValues, getPage, search, columns) => {
exportHandledInfo({
columns,
appId: workId,
handled: 'handled',
});
}
}
// console.log(JSON.stringify(d));
},
}); // 解决禅道 32366 二级学院审核，所有二级学院审核后在已处理中加导出功能 103152
}
return (
<AuditPage
hasBatchAudit={hasBatchAudit}
workId={workId}
dataBaseId={dataBaseId}
columns={columns}
addFields={addFields}
tableInfo={tableInfo}
allConfigSetInfo={allConfigSetInfo}
searchCondition={searchCondition}
batchAuditButtonName={batchAuditButtonName}
showPrint={showPrint}
noNeedForm={noNeedForm}
tab2Buttons={tab2Buttons}
/>
);
}
if (Array.isArray(columns)) {
let d = [];
for (let item of columns) {
if (item.dataIndex !== 'operationDiy') {
d.push({
key: item.dataIndex,
title: item.title,
});
}
}
// console.log(JSON.stringify(d));
}
return (
<AuditPage
hasBatchAudit={hasBatchAudit}
workId={workId}
dataBaseId={dataBaseId}
columns={columns}
addFields={addFields}
tableInfo={tableInfo}
allConfigSetInfo={allConfigSetInfo}
searchCondition={searchCondition}
batchAuditButtonName={batchAuditButtonName}
showPrint={showPrint}
noNeedForm={noNeedForm}
tab2Buttons={tab2Buttons}
/>
);
}
}
export default function Pr(props) {
const { routerConfig } = useContext(CreateC);
// console.log(routerConfig);
return <Index {...props} routerConfig={routerConfig}/>;
const { routerConfig } = useContext(CreateC);
// console.log(routerConfig);
return <Index {...props} routerConfig={routerConfig} />;
}
FormInsertDiy/AffairPage/publicApiService.js
浏览文件 @ 736022d4
......@@ -8,6 +8,7 @@
import { apiRequest } from '../request';
import { getOneStopConfig, isJSON } from '@/baseComponent/utils';
import { getHistoryFormDetail } from '@/webPublic/Services';
import prepareShow from '@/webPublic/one_stop_public/Table/prepareShow';
const giveValue = (x) => {
if (x && x.rows) {
......@@ -141,7 +142,9 @@ const getFormDetail = (id) => {
} else {
return {};
}
});
}).then((res) => {
return prepareShow(res);
});
};
/**
......
FormInsertDiy/ExportComponent/ActiveMenuComponent.js
浏览文件 @ 736022d4
......@@ -88,24 +88,26 @@ function ActiveMenuComponent({ routerConfig, ...otherProps }) {
Res = <Audit workId={appId} {...otherProps} />;
break;
case 'BatchAudit': // 批量审批
if(appId === '1492048888356405248' && getIsQian_Nan() || process.env.NODE_ENV === 'development'){
// 禅道30031
otherProps.tab2Buttons = [
{
type: 'export',
name: '导出',
component: 'Normal',
handleClick: (selectRows, formValues, getPage, search, columns) => {
exportHandledInfo({
columns,
appId,
handled: 'handled',
});
},
},
];
}
Res = <BatchAudit workId={appId} {...otherProps} />;
// if(appId === '1492048888356405248' && getIsQian_Nan() || process.env.NODE_ENV === 'development'){
// // 禅道30031
// otherProps.tab2Buttons = [
// {
// type: 'export',
// name: '导出',
// component: 'Normal',
// handleClick: (selectRows, formValues, getPage, search, columns) => {
// exportHandledInfo({
// columns,
// appId,
// handled: 'handled',
// });
// },
// },
// ];
// }
Res = <BatchAudit workId={appId} {...otherProps}
workId={'1492048888356405248'}
/>;
break;
case 'AuditMerage': // 审核页面聚合 多个流程的审核页面放在一起
Res = <AuditMerge {...otherProps} routerConfig={routerConfig}/>;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论