From 63d355129dac1a6322c4a6e093968bf46e5c7db2 Mon Sep 17 00:00:00 2001 From: xyz <747050115@qq.com> Date: Wed, 23 Oct 2024 11:26:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=A3=80=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pu/dhjyd/dhjydmaster/main/index.js | 28 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/pu/dhjyd/dhjydmaster/main/index.js b/src/pu/dhjyd/dhjydmaster/main/index.js index 7c22d65..f48f5f0 100644 --- a/src/pu/dhjyd/dhjydmaster/main/index.js +++ b/src/pu/dhjyd/dhjydmaster/main/index.js @@ -442,7 +442,9 @@ export class ApplicationPage extends Component { let oprButtons = [ACTIONS.EDIT, ACTIONS.DELETE]; let approvestatus = record[FIELDS.APPROVESTATUS].value if (approvestatus && approvestatus == '-1') { - oprButtons = [ACTIONS.EDIT, ACTIONS.DELETE, ACTIONS.COMMIT]; + oprButtons = [ACTIONS.EDIT, ACTIONS.DELETE]; + //不存在不合格数量时才允许提交 + if (!record[FIELDS.BRECHECK].value || record[FIELDS.BRECHECK].value * 1 <= 0) oprButtons.push(ACTIONS.COMMIT) } else if (approvestatus && approvestatus !== '-1') { oprButtons = [ACTIONS.UNCOMMIT, ACTIONS.APPROVEDETAIL]; } @@ -2337,22 +2339,34 @@ export class ApplicationPage extends Component { let {showmode} = this.state; // 列表操作列的参数 let {record, index} = param; + let info = this.props.getUrlParam('info') ? JSON.parse(this.props.getUrlParam('info')) : {} + let billCodeContext = this.props.getUrlParam('billCodeContext') ? JSON.parse(this.props.getUrlParam('billCodeContext')) : {} + let approvestatus = info.head['dhjydMasterForm'].rows[0].values[FIELDS.APPROVESTATUS].value + // console.log(info) // 获取选中行 // let checkedDatas = this.getCheckedDatas(); // 获取选中行主键,多行取第一条,适配列表操作列优先从record中取值 // let billId = record ? record[FIELDS.PRIMARYKEY].value : checkedDatas[0].values[FIELDS.PRIMARYKEY].value; // 设置页面模式为卡片编辑态 this.state.showmode = SHOWMODE_CARD; - this.state.editmode = EDITMODE_EDIT; + this.state.editmode = approvestatus == '-1' ? EDITMODE_EDIT : EDITMODE_BROWSE; // 设置标题栏返回按钮 - this.state.head.initShowBackBtn = false; + this.state.head.initShowBackBtn = approvestatus == '-1' ? false : true; this.setState(this.state, () => { // 获取卡片区域编码 let areaInfo = this.getCardAreaCode(); - // 修改卡片组件状态 - this.updateCardStatus({areaInfo, editmode: EDITMODE_EDIT}); - let info = this.props.getUrlParam('info') ? JSON.parse(this.props.getUrlParam('info')) : {} - let billCodeContext = this.props.getUrlParam('billCodeContext') ? JSON.parse(this.props.getUrlParam('billCodeContext')) : {} + if (approvestatus == '-1') { //自由态 + // 修改卡片组件状态 + this.updateCardStatus({areaInfo, editmode: EDITMODE_EDIT}); + } else { //已审核 + // 设置卡片主表单为浏览态 + this.props.form.setFormStatus(areaInfo.formId, EDITMODE_BROWSE); + // 设置卡片子表表格为浏览态 + areaInfo.tableId.forEach(id => { + this.props.cardTable.setStatus(id, EDITMODE_BROWSE); + }); + } + this.addUnPassDone({ info, billCodeContext,