1、修复基础配置
2、修复业务模块 3、拆分页面代码
This commit is contained in:
@@ -66,17 +66,11 @@ const getSecondCargoTypeName = item =>
|
||||
'货物';
|
||||
|
||||
const formatGoodsInfo = row => {
|
||||
const rows = [
|
||||
row.goodsJson,
|
||||
row.goodsList,
|
||||
row.goodsRows,
|
||||
row.cargoList,
|
||||
row.cargoRows,
|
||||
row.goods,
|
||||
]
|
||||
.map(source => parseGoodsRows(source))
|
||||
.filter(source => source.length)
|
||||
.sort((left, right) => right.length - left.length)[0] || [];
|
||||
const rows =
|
||||
[row.goodsJson, row.goodsList, row.goodsRows, row.cargoList, row.cargoRows, row.goods]
|
||||
.map(source => parseGoodsRows(source))
|
||||
.filter(source => source.length)
|
||||
.sort((left, right) => right.length - left.length)[0] || [];
|
||||
if (!rows.length) return row.goodsInfo || '';
|
||||
|
||||
const groups = rows.reduce((result, item = {}) => {
|
||||
@@ -176,9 +170,12 @@ const formatDispatchProgress = row => {
|
||||
}
|
||||
}
|
||||
const lines = Array.from(summary.entries()).map(
|
||||
([unit, item]) => `${formatDispatchQuantity(item.assigned)}/${formatDispatchQuantity(item.total)}${unit}`
|
||||
([unit, item]) =>
|
||||
`${formatDispatchQuantity(item.assigned)}/${formatDispatchQuantity(item.total)}${unit}`
|
||||
);
|
||||
return lines.length ? lines.join('\n') : row.dispatchProgressName || row.dispatchProgress || row.progress || '';
|
||||
return lines.length
|
||||
? lines.join('\n')
|
||||
: row.dispatchProgressName || row.dispatchProgress || row.progress || '';
|
||||
};
|
||||
|
||||
const auditColumn = prop => ({ ...auditColumns.find(item => item.prop === prop) });
|
||||
@@ -188,7 +185,6 @@ export const config = {
|
||||
permission: 'transport_plan',
|
||||
exportUrl: '/blade-transport/transport-plan/export-transport-plan',
|
||||
exportName: '运输计划',
|
||||
enableAllDept: false,
|
||||
enableProjectSelect: true,
|
||||
projectQueryParams: {
|
||||
approvalStatuses: 'approved,change_approved',
|
||||
@@ -202,7 +198,7 @@ export const config = {
|
||||
enableTransportPlanCreateActions: true,
|
||||
enableTransportPlanImport: true,
|
||||
fixedTransportAddressType: true,
|
||||
transportPlanImportTitle: '导入发货计划',
|
||||
transportPlanImportTitle: '导入运输计划',
|
||||
transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
|
||||
attachmentTitle: '附件',
|
||||
searchRangeMap: {
|
||||
@@ -319,7 +315,6 @@ export const option = {
|
||||
prop: 'goodsInfo',
|
||||
formatter: row => formatGoodsInfo(row),
|
||||
minWidth: 320,
|
||||
className: 'business-crud-page__goods-info-cell',
|
||||
overHidden: false,
|
||||
showOverflowTooltip: false,
|
||||
addDisplay: false,
|
||||
@@ -331,7 +326,6 @@ export const option = {
|
||||
prop: 'dispatchProgress',
|
||||
formatter: row => formatDispatchProgress(row),
|
||||
minWidth: 120,
|
||||
className: 'business-crud-page__dispatch-progress-cell',
|
||||
overHidden: false,
|
||||
showOverflowTooltip: false,
|
||||
addDisplay: false,
|
||||
@@ -397,6 +391,7 @@ export const option = {
|
||||
span: 6,
|
||||
order: 350,
|
||||
minWidth: 150,
|
||||
rules: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
|
||||
},
|
||||
{
|
||||
label: '计划结束日期',
|
||||
@@ -407,6 +402,7 @@ export const option = {
|
||||
span: 6,
|
||||
order: 340,
|
||||
minWidth: 150,
|
||||
rules: [{ required: true, message: '请选择计划结束日期', trigger: 'change' }],
|
||||
},
|
||||
{
|
||||
label: '数据来源',
|
||||
@@ -606,7 +602,7 @@ export const option = {
|
||||
order: 270,
|
||||
hide: true,
|
||||
labelWidth: '0px',
|
||||
className: 'business-crud-page__full-form-item',
|
||||
className: 'transport-plan-page__full-form-item',
|
||||
},
|
||||
{
|
||||
label: '',
|
||||
@@ -627,7 +623,7 @@ export const option = {
|
||||
order: 260,
|
||||
hide: true,
|
||||
labelWidth: '0px',
|
||||
className: 'business-crud-page__full-form-item',
|
||||
className: 'transport-plan-page__full-form-item',
|
||||
},
|
||||
])
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user