diff --git a/src/ic/ic/sapplybill/card/btnClicks/backBtnClick.js b/src/ic/ic/sapplybill/card/btnClicks/backBtnClick.js index e457e5c..df2d20a 100644 --- a/src/ic/ic/sapplybill/card/btnClicks/backBtnClick.js +++ b/src/ic/ic/sapplybill/card/btnClicks/backBtnClick.js @@ -12,8 +12,9 @@ import { showWarningDialog } from '../../../../../scmpub/scmpub/pub/tool/message import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; export default function() { + // debugger; let type = getUrlParam(props.getUrlParam, 'type'); - + console.log('type = ', type); if (type) { let allprocess = props.transferTable.getTransformFormStatus(FIELD.left); let status = getUrlParam(props.getUrlParam, 'status'); @@ -34,6 +35,7 @@ export default function() { function backtotransfer(props) { props.delUrlParam('usecache'); let type = getUrlParam(props.getUrlParam, 'type'); + console.log('backtotransfer-type = ', type); props.pushTo('/' + type, { type: 'ref422x', pagecode: '400400000_422Xto4455'// TODO pushTo diff --git a/src/ic/ic/sapplybill/card/init/transfer.js b/src/ic/ic/sapplybill/card/init/transfer.js index c185b9a..40c04f8 100644 --- a/src/ic/ic/sapplybill/card/init/transfer.js +++ b/src/ic/ic/sapplybill/card/init/transfer.js @@ -18,10 +18,13 @@ export default function(ids) { }; let url = URL.transfer if (ids[0].cbilltype == '55A3') url = URL.transfer2 + // debugger ajax({ url: url, data: data, success: (res) => { + let type = getUrlParam(this.props.getUrlParam, 'type'); + console.log('type = ', type); if (res.success) { if (res.data) { transtypeUtils.setValue.call(this, FIELD.formArea, FIELD.ctrantypeid, FIELD.vtrantypecode); diff --git a/src/ic/ic/sapplybill/card/viewController/btnClickController.js b/src/ic/ic/sapplybill/card/viewController/btnClickController.js index a01aeed..dd43c2e 100644 --- a/src/ic/ic/sapplybill/card/viewController/btnClickController.js +++ b/src/ic/ic/sapplybill/card/viewController/btnClickController.js @@ -141,7 +141,7 @@ export default function clickBtn(props, id, text, record, mindex) { props.pushTo(URL.gotoTransfer2, { type: 'refBljh', usecache: 'N', //跳转到转单查询区不使用缓存 - pagecode: '50080102_Bljhto4455'// TODO code + pagecode: '50080102_Bljhto4455' }); break; //行打开 diff --git a/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js b/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js index 19a6ddb..4368fa5 100644 --- a/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js +++ b/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js @@ -14,7 +14,7 @@ export default function clickAddBtn(props) { props.pushTo(URL.gotoTransfer2, { type: 'refBljh', usecache: 'N', //跳转到转单查询区不使用缓存 - pagecode: '50080102_Bljhto4455' //TODO code + pagecode: '50080102_Bljhto4455' }); } diff --git a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js index d5c9eda..eb9ea76 100644 --- a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js +++ b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js @@ -55,21 +55,6 @@ export default function clickSerachBtn(cacheSearchData, isRefresh) { showSuccessInfo(getLangByResId(this, '4008PUB-000193')); /* 国际化处理： 刷新成功！*/ } if (data && data.length > 0) { - // TODO 1 2312版本增加下列计算代码，暂时注释 - /*data.map((item) => { - //增加计算可出库主数量 - item.body[PAGEAREA.body422x].rows.map((body) => { - let record = body.values; - let showNum = 0; - let nnum = record.nnum; //总数量 - let ntotaloutnum = record.naccuoutreqnum; //累计申请出库数量 - if (nnum && nnum.value != 0 && ntotaloutnum) { - showNum = - parseFloat(nnum.value) - (ntotaloutnum.value ? parseFloat(ntotaloutnum.value) : 0); - } - body.values.outNum = { value: showNum, scale: record.nnum.scale }; - }); - });*/ if (!isRefresh) { showSuccessInfo( null, diff --git a/src/ic/ic/sapplybill/transfer2/const/index.js b/src/ic/ic/sapplybill/transfer2/const/index.js index caa941e..9db7c39 100644 --- a/src/ic/ic/sapplybill/transfer2/const/index.js +++ b/src/ic/ic/sapplybill/transfer2/const/index.js @@ -10,8 +10,8 @@ const PAGECODE = { pagecodeBljh: '50080102_Bljhto4455' }; const APPCODE = { + // 应用编码 appcodeBljh: '400802800' - // TODO 1 此处应是什么值 }; const PAGEAREA = { headBljh: 'headBljh', diff --git a/src/ic/ic/sapplybill/transfer2/init/initBljhTemplate.js b/src/ic/ic/sapplybill/transfer2/init/initBljhTemplate.js index cb29ce5..e1fea96 100644 --- a/src/ic/ic/sapplybill/transfer2/init/initBljhTemplate.js +++ b/src/ic/ic/sapplybill/transfer2/init/initBljhTemplate.js @@ -15,10 +15,10 @@ export default function(props) { { pagecode: PAGECODE.pagecodeBljh, //卡片页面编码 appcode: APPCODE.appcodeBljh, - // TODO 1 2312版本增加此处的代码，直接复制过来了，可能需要修改 + // TODO 2312版本增加此处的代码 reqDataQueryappcontext: { rqUrl: '/platform/appregister/queryappcontext.do', - rqJson: `{\n \"appcode\": \"400400000\",\n \"pagecode\": \"400400000_422Xto4455\"\n}`, + rqJson: `{\n \"appcode\": \"400802800\",\n \"pagecode\": \"50080102_Bljhto4455\"\n}`, rqCode: 'context' } }, @@ -49,7 +49,7 @@ function modify(props, meta) { }); }); - /*meta[PAGEAREA.search422x].items.map((item, index) => { + meta[PAGEAREA.searchBljh].items.map((item, index) => { item.isShowUnit = true; if (fileds_orgfilter_Bljh.includes(item.attrcode)) { item.queryCondition = () => { @@ -81,7 +81,7 @@ function modify(props, meta) { }; }; } - });*/ + }); return meta; } diff --git a/src/ic/ic/sapplybill/transfer2/transfer.js b/src/ic/ic/sapplybill/transfer2/transfer.js index 57ed7a3..34b81fa 100644 --- a/src/ic/ic/sapplybill/transfer2/transfer.js +++ b/src/ic/ic/sapplybill/transfer2/transfer.js @@ -9,7 +9,7 @@ import React, { Component } from 'react'; import { base, createPage } from 'nc-lightapp-front'; import { PAGEAREA, DATASOURCE } from '../transfer2/const'; -import { URL } from '../constance'; +import { PAGECODE, URL } from '../constance'; import searchAfterEvent from '../transfer2/afterEvent/searchAfterEvent'; import getNumber from './utils/getNumber'; import { initBljhTemplate } from '../transfer2/init'; @@ -92,7 +92,7 @@ class TransferTable extends Component { const { createTransferTable } = transferTable; const { NCBackBtn, NCToggleViewBtn, NCDiv } = base; const { createBillHeadInfo } = this.props.BillHeadInfo; - // todo 拉单页面上方的标题 + // 拉单页面上方的标题 let title = getLangByResId(this, '4008SAPPLYBILL-000046A'); /* 国际化处理： 选择备料计划*/ let isShowSel = transferTable.getSelectedListDisplay(PAGEAREA.headBljh); let totalstr = `${getLangByResId(this, '4008SAPPLYBILL-000045')}`; /* 国际化处理： 本次申请主数量*/ @@ -177,7 +177,7 @@ class TransferTable extends Component { this.props.pushTo(URL.gotoCard, { status: 'edit', type: 'refBljh', - pagecode: '50080102_Bljhto4455' // TODO code + pagecode: '50080102_Bljhto4455' }); }, onChangeViewClick: () => {