diff --git a/src/ic/ic/sapplybill/constance/index.js b/src/ic/ic/sapplybill/constance/index.js index b6a8a20..c2a4115 100644 --- a/src/ic/ic/sapplybill/constance/index.js +++ b/src/ic/ic/sapplybill/constance/index.js @@ -14,6 +14,7 @@ const URL = { gotoCard: '/card', //跳转到卡片态 gotoList: '/list', // 跳转到列表态 gotoTransfer: '/ref422x', //跳转到拉单 + gotoTransfer2: '/refBljh', //跳转到拉单(备料计划申请) query: '/nccloud/ic/sapplybill/query.do', //列表态查询 queryPage: '/nccloud/ic/sapplybill/queryPage.do', //分页信息查询 diff --git a/src/ic/ic/sapplybill/list/btnClicks/index.js b/src/ic/ic/sapplybill/list/btnClicks/index.js index fa7d52f..095afc9 100644 --- a/src/ic/ic/sapplybill/list/btnClicks/index.js +++ b/src/ic/ic/sapplybill/list/btnClicks/index.js @@ -8,6 +8,7 @@ import printBtnClick from './printBtnClick'; import manualBtnClick from './ManualBtnClick'; import linkQuery from './linkQuery'; import ref422xBtnClick from './ref422xBtnClick'; +import refBljhBtnClick from './refBljhBtnClick'; export { commitBtnClick, deleteBtnClick, @@ -17,6 +18,7 @@ export { pageInfoClick, manualBtnClick, ref422xBtnClick, + refBljhBtnClick, printBtnClick }; diff --git a/src/ic/ic/sapplybill/list/viewController/btnClickController.js b/src/ic/ic/sapplybill/list/viewController/btnClickController.js index ed825ba..fa6bed1 100644 --- a/src/ic/ic/sapplybill/list/viewController/btnClickController.js +++ b/src/ic/ic/sapplybill/list/viewController/btnClickController.js @@ -15,6 +15,7 @@ import { commitBtnClick, editBtnClick, ref422xBtnClick, + refBljhBtnClick, linkQuery, fileClick, printBtnClick @@ -27,9 +28,14 @@ export default function btnClickController(props, key, text, record, index) { case BUTTONID_LIST.Manual: manualBtnClick.call(this, props); break; + //新增-物资需求申请 case BUTTONID_LIST.Ref422X: ref422xBtnClick.call(this, props); break; + //新增-备料计划申请 + case BUTTONID_LIST.RefBljh: + refBljhBtnClick.call(this, props); + break; //删除 case BUTTONID_LIST.Delete_Head: deleteBtnClick.call(this, props, index); diff --git a/src/ic/ic/sapplybill/main/router.js b/src/ic/ic/sapplybill/main/router.js index 0229763..b66d3e0 100644 --- a/src/ic/ic/sapplybill/main/router.js +++ b/src/ic/ic/sapplybill/main/router.js @@ -17,6 +17,10 @@ const transfer = asyncComponent(() => import(/*webpackChunkName: "ic/ic/sapplybill/transfer/transfer"*/ /* webpackMode: "eager" */ '../transfer/transfer') ); +const transfer2 = asyncComponent(() => + import(/*webpackChunkName: "ic/ic/sapplybill/transfer2/transfer"*/ /* webpackMode: "eager" */ '../transfer2/transfer') +); + const routes = [ { path: '/', @@ -34,6 +38,10 @@ const routes = [ { path: '/ref422x', component: transfer + }, + { + path: '/refBljh', + component: transfer2 } ]; diff --git a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js index 2f7ba70..893bf87 100644 --- a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js +++ b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js @@ -55,20 +55,6 @@ export default function clickSerachBtn(cacheSearchData, isRefresh) { showSuccessInfo(getLangByResId(this, '4008PUB-000193')); /* 国际化处理: 刷新成功!*/ } if (data && data.length > 0) { - data.map((item) => { - //增加计算可出库主数量 - item.body[PAGEAREA.bodyBljh].rows.map((body) => { - let record = body.values; - let showNum = 0; - let nnum = record.nnum; //总数量 - let ntotaloutnum = record.naccuoutnum; //累计出库数量 - 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,