From 45ad668de907fbd376eea4d410d71bff85495a2b Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Tue, 24 Dec 2024 18:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=8B=89?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ic/ic/sapplybill/constance/index.js | 9 +++------ src/ic/ic/sapplybill/list/btnClicks/index.js | 4 +--- .../list/viewController/btnClickController.js | 12 +++--------- src/ic/ic/sapplybill/main/router.js | 13 +++---------- .../transfer2/btnClicks/serachBljh_btnClick.js | 15 ++++++++++++++- 5 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/ic/ic/sapplybill/constance/index.js b/src/ic/ic/sapplybill/constance/index.js index 6676026..b6a8a20 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,7 +14,6 @@ const URL = { gotoCard: '/card', //跳转到卡片态 gotoList: '/list', // 跳转到列表态 gotoTransfer: '/ref422x', //跳转到拉单 - gotoTransfer2: '/refBljh', //跳转到拉单(备料计划申请) query: '/nccloud/ic/sapplybill/query.do', //列表态查询 queryPage: '/nccloud/ic/sapplybill/queryPage.do', //分页信息查询 @@ -157,7 +156,6 @@ const BUTTONID_LIST = { Add: 'Add', //新增（下拉） Manual: 'Manual', //自制 Ref422X: 'Ref422X', //物资需求出库申请 - RefBljh: 'RefBljh', //备料计划申请 Delete_Head: 'Delete_Head', //删除 Commit_Head: 'Commit_Head', //提交 UnCommit_Head: 'UnCommit_Head', //收回 @@ -182,7 +180,6 @@ const BUTTONID_CARD = { Add: 'Add', //新增（下拉） Manual: 'Manual', //自制 Ref422X: 'Ref422X', //物资需求出库申请 - RefBljh: 'RefBljh', //备料计划申请 Edit: 'Edit', //修改 Delete: 'Delete', //删除 Copy: 'Copy', //复制 @@ -267,4 +264,4 @@ export { list_fileds_orgfilter }; -/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ +/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ \ No newline at end of file diff --git a/src/ic/ic/sapplybill/list/btnClicks/index.js b/src/ic/ic/sapplybill/list/btnClicks/index.js index 77ab413..fa7d52f 100644 --- a/src/ic/ic/sapplybill/list/btnClicks/index.js +++ b/src/ic/ic/sapplybill/list/btnClicks/index.js @@ -8,7 +8,6 @@ import printBtnClick from './printBtnClick'; import manualBtnClick from './ManualBtnClick'; import linkQuery from './linkQuery'; import ref422xBtnClick from './ref422xBtnClick'; -import refBljhBtnClick from './refBljhBtnClick'; export { commitBtnClick, deleteBtnClick, @@ -18,8 +17,7 @@ export { pageInfoClick, manualBtnClick, ref422xBtnClick, - refBljhBtnClick, printBtnClick }; -/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ +/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ \ No newline at end of file diff --git a/src/ic/ic/sapplybill/list/viewController/btnClickController.js b/src/ic/ic/sapplybill/list/viewController/btnClickController.js index 8047d23..ed825ba 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,7 +15,6 @@ import { commitBtnClick, editBtnClick, ref422xBtnClick, - refBljhBtnClick, linkQuery, fileClick, printBtnClick @@ -28,14 +27,9 @@ 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); @@ -107,4 +101,4 @@ export default function btnClickController(props, key, text, record, index) { } } -/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ +/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ \ No newline at end of file diff --git a/src/ic/ic/sapplybill/main/router.js b/src/ic/ic/sapplybill/main/router.js index e8287e7..0229763 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,9 +16,6 @@ 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 = [ { @@ -37,13 +34,9 @@ const routes = [ { path: '/ref422x', component: transfer - }, - { - path: '/refBljh', - component: transfer2 } ]; export default routes; -/*vfwiWCIhh36BkOKgHTW5YSC1vcqKPYPeynyB48x6VJA=*/ +/*vfwiWCIhh36BkOKgHTW5YSC1vcqKPYPeynyB48x6VJA=*/ \ No newline at end of file diff --git a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js index 0c47f63..2f7ba70 100644 --- a/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js +++ b/src/ic/ic/sapplybill/transfer2/btnClicks/serachBljh_btnClick.js @@ -12,7 +12,6 @@ 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 = {}; @@ -56,6 +55,20 @@ 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,