diff --git a/src/pu/dhjyd/dhjydmaster/main/index.js b/src/pu/dhjyd/dhjydmaster/main/index.js index 15436de..78eee59 100644 --- a/src/pu/dhjyd/dhjydmaster/main/index.js +++ b/src/pu/dhjyd/dhjydmaster/main/index.js @@ -195,7 +195,7 @@ const URLS = { // 请求路径 addUrl: '/nccloud/pu/dhjyd/AddDhjydMasterVOAction.do', editUrl: '/nccloud/pu/dhjyd/EditDhjydMasterVOAction.do', copyUrl: '/nccloud/pu/dhjyd/CopyDhjydMasterVOAction.do', - addUnPassUrl: '/nccloud/pu/dhjyd/ApproveDhjydMasterVOAction.do', // todo: 新增不合格审批单 + addUnPassUrl: '/nccloud/pu/dhjyd/AddUnPassDhjydMasterVOAction.do', // todo: 新增不合格审批单 }; const ACTIONS = { // 按钮编码 @@ -226,7 +226,7 @@ const ACTIONS = { // 按钮编码 SAVE: 'Save', //保存 SAVEADD: 'SaveAdd', // 保存新增 COPY: 'Copy', // 复制 - ADDUNPASS: 'addUnPass', // 生成不合格审批单 + ADDUNPASS: 'AddUnPass', // 生成不合格审批单 MORE: 'More' // 更多 } @@ -1184,6 +1184,7 @@ export class ApplicationPage extends Component { [ACTIONS.COMMIT]: !hasFree, [ACTIONS.UNCOMMIT]: !hasNotFree, [ACTIONS.APPROVEDETAIL]: !(isCheckedOne && hasNotFree) + // TODO 控制生成按钮的可用性 }); Object.assign(btnVisible, { [ACTIONS.BILLTRACK]: (showmode == SHOWMODE_LIST || showmode == SHOWMODE_CARD) && isBrowse @@ -2198,39 +2199,13 @@ export class ApplicationPage extends Component { */ onAddUnPass = () => { let { showmode: oldShowmode } = this.state; - // debugger; // 获取选中行 let checkedDatas = this.getCheckedDatas(); // 获取选中行主键,多行取第一条,适配列表操作列优先从record中取值 let billId = checkedDatas[0].values[FIELDS.PRIMARYKEY].value; - // 设置页面模式为卡片编辑态 - this.state.showmode = SHOWMODE_CARD; - this.state.editmode = EDITMODE_ADD; - // 设置标题栏返回按钮 - this.state.head.initShowBackBtn = false; - this.setState(this.state, () => { - // 获取卡片区域编码 - let areaInfo = this.getCardAreaCode(); - // 设置卡片主表单为编辑态 - this.updateCardStatus({ areaInfo, editmode: EDITMODE_ADD }); - this.addUnPass({ - billId, - areaInfo, - callback: ({ data, billCodeContext }) => { - data ? this.fillCardData({ data }) : this.clearCardData(); - // 处理编码规则 - this.handleCodeRule({ billCodeContext }); - // 更新按钮状态 - this.updateBtnStatus(); - // 根据列表数据初始化卡片翻页器 - oldShowmode == SHOWMODE_LIST && this.initCardPaginationWithAllpks(); - } - }); - }); - } - - addUnPass = ({ billId, areaInfo, callback = EMPTY_FN }) => { + // 获取卡片区域编码 + let areaInfo = this.getCardAreaCode(); ajax({ url: URLS.addUnPassUrl, data: { @@ -2239,12 +2214,27 @@ export class ApplicationPage extends Component { ...areaInfo // 区域编码 }, success: (res = {}) => { - let { data: { data, externalData: { billCodeContext } = {} } = {} } = res; - callback({ data, billCodeContext }); + // 提示 + toast({ color: 'success', content: '操作成功' }); } }); } + // addUnPass = ({ billId, callback = EMPTY_FN }) => { + // ajax({ + // url: URLS.addUnPassUrl, + // data: { + // pk: billId, // 主键 + // pageCode: this.config.pagecode, // pagecode + // ...areaInfo // 区域编码 + // }, + // success: (res = {}) => { + // let { data: { data, externalData: { billCodeContext } = {} } = {} } = res; + // callback({ data, billCodeContext }); + // } + // }); + // } + /** * 方法功能: