diff --git a/src/api/business/project-apply.js b/src/api/business/project-apply.js index cf95c97..3c41e5b 100644 --- a/src/api/business/project-apply.js +++ b/src/api/business/project-apply.js @@ -6,6 +6,12 @@ const api = createCrudApi(baseUrl); export const getList = api.getList; export const getDetail = api.getDetail; +export const getChangeRecordDetail = (id, recordIndex) => + request({ + url: `${baseUrl}/change-record/detail`, + method: 'get', + params: { id, recordIndex }, + }); export const submit = api.submit; export const remove = api.remove; diff --git a/src/option/business/project-apply.js b/src/option/business/project-apply.js index 399287b..84a8dcb 100644 --- a/src/option/business/project-apply.js +++ b/src/option/business/project-apply.js @@ -192,6 +192,15 @@ export const option = createCrudOption([ formatter: row => formatUserRealName(row, 'principal'), rules: textRule('项目负责人', 50, true), }, + { + label: '资金使用风险', + prop: 'fundUseRisk', + slot: true, + minWidth: 150, + addDisplay: false, + editDisplay: false, + hide: false, + }, { label: '项目负责人ID', prop: 'principalUserId', @@ -433,14 +442,5 @@ export const option = createCrudOption([ span: 24, hide: true, }, - { - label: '资金使用风险', - prop: 'fundUseRisk', - slot: true, - minWidth: 130, - addDisplay: false, - editDisplay: false, - hide: false, - }, ...auditColumns.map(column => ({ ...column, hide: true })), ]); diff --git a/src/views/business/process-config.vue b/src/views/business/process-config.vue index b871102..f3147c0 100644 --- a/src/views/business/process-config.vue +++ b/src/views/business/process-config.vue @@ -786,14 +786,21 @@ export default { this.nodeRows.map(item => ({ key: item.key, name: item.name, + type: item.type, enabled: item.enabled, confirmMode: item.confirmMode, confirmDriver: item.confirmDriver, confirmInternal: item.confirmInternal, punch: item.punch, location: item.location, - uploadCargo: item.uploadCargo, - cargoTypes: item.uploadCargo ? item.cargoTypes : [], + // 在途不支持货量;其它节点按配置 + uploadCargo: item.type === 'transit' || item.key === 'transit' ? false : item.uploadCargo, + cargoTypes: + item.type === 'transit' || item.key === 'transit' + ? [] + : item.uploadCargo + ? item.cargoTypes + : [], frequencyDays: item.frequencyDays, timeStart: item.timeStart, timeEnd: item.timeEnd, diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue index d417b91..362fc20 100644 --- a/src/views/business/project-apply.vue +++ b/src/views/business/project-apply.vue @@ -66,9 +66,10 @@ - + + + + +