diff --git a/src/ic/ic/sapplybill/constance/index.js b/src/ic/ic/sapplybill/constance/index.js index b6a8a20..6676026 100644 --- a/src/ic/ic/sapplybill/constance/index.js +++ b/src/ic/ic/sapplybill/constance/index.js @@ -1,8 +1,8 @@ /*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-常量 - * @Date: 2018-04-17 14:16:17 + * @Date: 2018-04-17 14:16:17 * @Last Modified by: lizhbo * @Last Modified time: 2019-11-12 19:47:25 */ @@ -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', //分页信息查询 @@ -156,6 +157,7 @@ const BUTTONID_LIST = { Add: 'Add', //新增（下拉） Manual: 'Manual', //自制 Ref422X: 'Ref422X', //物资需求出库申请 + RefBljh: 'RefBljh', //备料计划申请 Delete_Head: 'Delete_Head', //删除 Commit_Head: 'Commit_Head', //提交 UnCommit_Head: 'UnCommit_Head', //收回 @@ -180,6 +182,7 @@ const BUTTONID_CARD = { Add: 'Add', //新增（下拉） Manual: 'Manual', //自制 Ref422X: 'Ref422X', //物资需求出库申请 + RefBljh: 'RefBljh', //备料计划申请 Edit: 'Edit', //修改 Delete: 'Delete', //删除 Copy: 'Copy', //复制 @@ -264,4 +267,4 @@ export { list_fileds_orgfilter }; -/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ \ No newline at end of file +/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ diff --git a/src/ic/ic/sapplybill/list/btnClicks/index.js b/src/ic/ic/sapplybill/list/btnClicks/index.js index fa7d52f..77ab413 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,7 +18,8 @@ export { pageInfoClick, manualBtnClick, ref422xBtnClick, + refBljhBtnClick, printBtnClick }; -/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ \ No newline at end of file +/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ diff --git a/src/ic/ic/sapplybill/list/viewController/btnClickController.js b/src/ic/ic/sapplybill/list/viewController/btnClickController.js index ed825ba..8047d23 100644 --- a/src/ic/ic/sapplybill/list/viewController/btnClickController.js +++ b/src/ic/ic/sapplybill/list/viewController/btnClickController.js @@ -1,8 +1,8 @@ /*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-列表按钮点击事件派发 - * @Date: 2018-04-24 11:07:33 + * @Date: 2018-04-24 11:07:33 * @Last Modified by: lizhbo * @Last Modified time: 2019-01-04 10:26:45 */ @@ -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); @@ -101,4 +107,4 @@ export default function btnClickController(props, key, text, record, index) { } } -/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ \ No newline at end of file +/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ diff --git a/src/ic/ic/sapplybill/main/router.js b/src/ic/ic/sapplybill/main/router.js index 0229763..e8287e7 100644 --- a/src/ic/ic/sapplybill/main/router.js +++ b/src/ic/ic/sapplybill/main/router.js @@ -1,8 +1,8 @@ /*vfwiWCIhh36BkOKgHTW5YSC1vcqKPYPeynyB48x6VJA=*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-路由 - * @Date: 2018-12-10 12:10:47 + * @Date: 2018-12-10 12:10:47 * @Last Modified by: lizhbo * @Last Modified time: 2019-06-19 16:07:33 */ @@ -16,6 +16,9 @@ const card = asyncComponent(() => const transfer = asyncComponent(() => import(/*webpackChunkName: "ic/ic/sapplybill/transfer/transfer"*/ /* webpackMode: "eager" */ '../transfer/transfer') ); +const transfer2 = asyncComponent(() => + import(/*webpackChunkName: "ic/ic/sapplybill/transfer/transfer"*/ /* webpackMode: "eager" */ '../transfer2/transfer') +); const routes = [ { @@ -34,9 +37,13 @@ const routes = [ { path: '/ref422x', component: transfer + }, + { + path: '/refBljh', + component: transfer2 } ]; export default routes; -/*vfwiWCIhh36BkOKgHTW5YSC1vcqKPYPeynyB48x6VJA=*/ \ No newline at end of file +/*vfwiWCIhh36BkOKgHTW5YSC1vcqKPYPeynyB48x6VJA=*/ diff --git a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js index 2f7ba70..0c47f63 100644 --- a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js +++ b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js @@ -12,6 +12,7 @@ import transtypeUtils from '../../../../../scmpub/scmpub/pub/tool/transtypeUtils import { setDefData } from '../../../../../scmpub/scmpub/pub/cache/cacheDataManager'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import { showSuccessInfo, showWarningInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; +import { debug } from 'webpack'; export default function clickSerachBtn(cacheSearchData, isRefresh) { let queryInfo = {}; @@ -55,20 +56,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, diff --git a/src/ic/ic/sapplybill/transfer2/const/index.js b/src/ic/ic/sapplybill/transfer2/const/index.js index 5b2681c..f9036dd 100644 --- a/src/ic/ic/sapplybill/transfer2/const/index.js +++ b/src/ic/ic/sapplybill/transfer2/const/index.js @@ -33,7 +33,7 @@ const PK = { bodyBljh: 'pk_storereq_b' }; const URL = { - searchBljh: '/nccloud/ic/sapplybill/queryBljh.do' + searchBljh: '/nccloud/ic/sapplybill/queryPickm.do' }; export { PAGECODE, APPCODE, PAGEAREA, PK, URL, DATASOURCE, fileds_orgfilter_Bljh };