From 63dfa0dc22985994d49d81c3732787525a12f679 Mon Sep 17 00:00:00 2001 From: xyz <747050115@qq.com> Date: Thu, 26 Dec 2024 10:25:56 +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=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ic/ic/sapplybill/card/card.js | 16 ++++++++++---- src/ic/ic/sapplybill/card/init/transfer.js | 21 +++++++++++-------- .../card/viewController/btnClickController.js | 14 ++++++++++--- src/ic/ic/sapplybill/constance/index.js | 3 ++- .../list/btnClicks/refBljhBtnClick.js | 2 +- src/ic/ic/sapplybill/transfer/const/index.js | 15 ++++++------- 6 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/ic/ic/sapplybill/card/card.js b/src/ic/ic/sapplybill/card/card.js index 0dfceaa..0803e89 100644 --- a/src/ic/ic/sapplybill/card/card.js +++ b/src/ic/ic/sapplybill/card/card.js @@ -1,8 +1,8 @@ /*zhPCwpoDZifMfSk9Ega0BQ==*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-卡片 - * @Date: 2018-04-17 15:30:22 + * @Date: 2018-04-17 15:30:22 * @Last Modified by: lizhbo * @Last Modified time: 2019-12-30 13:41:11 */ @@ -97,7 +97,15 @@ class SapplyBillCard extends Component { }); orderhids.add(v.head.pk); }); - let ids = [{ cbilltype: '422X', hids: orderhids, bids: orderbids }]; + let type = getUrlParam(this.props.getUrlParam, 'type'); + let cbilltype = ''; + if (type == 'ref422x') { + cbilltype = '422X'; + } else if (type == 'refBljh') { + cbilltype = 'Bljh'; + } + // let ids = [{ cbilltype: '422X', hids: orderhids, bids: orderbids }]; + let ids = [{ cbilltype: cbilltype, hids: orderhids, bids: orderbids }]; transfer.call(this, ids); } } else { @@ -762,4 +770,4 @@ SapplyBillCard = createPage({ })(SapplyBillCard); export default SapplyBillCard; -/*zhPCwpoDZifMfSk9Ega0BQ==*/ \ No newline at end of file +/*zhPCwpoDZifMfSk9Ega0BQ==*/ diff --git a/src/ic/ic/sapplybill/card/init/transfer.js b/src/ic/ic/sapplybill/card/init/transfer.js index 78cf9aa..ffc0eb1 100644 --- a/src/ic/ic/sapplybill/card/init/transfer.js +++ b/src/ic/ic/sapplybill/card/init/transfer.js @@ -1,23 +1,26 @@ /*qglWYo2THvIGavZX5nSbwZ5iMJbqsiHVu5zwiu1zN1U=*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-转单 - * @Date: 2018-12-10 12:07:12 + * @Date: 2018-12-10 12:07:12 * @Last Modified by: mikey.zhaopeng * @Last Modified time: 2020-04-21 14:47:47 */ -import { ajax } from 'nc-lightapp-front'; -import { FIELD, URL, PAGECODE } from '../../constance'; +import {ajax} from 'nc-lightapp-front'; +import {FIELD, URL, PAGECODE} from '../../constance'; import transtypeUtils from '../../../../../scmpub/scmpub/pub/tool/transtypeUtils'; -import { showErrorInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; -import { getUrlParam } from '../../../pub/utils'; +import {showErrorInfo} from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; +import {getUrlParam} from '../../../pub/utils'; + export default function (ids) { let data = { info: ids, pagecode: PAGECODE.card }; + let url = URL.transfer + if (ids[0].cbilltype == 'Bljh') url = URL.transfer2 ajax({ - url: URL.transfer, + url: url, data: data, success: (res) => { if (res.success) { @@ -29,7 +32,7 @@ export default function (ids) { } this.props.form.setFormStatus(this.formId, 'edit'); this.props.cardTable.setStatus(this.tableId, 'edit'); - this.setState({ listdata: res.data }); + this.setState({listdata: res.data}); this.toggleShow(); } } @@ -43,4 +46,4 @@ export default function (ids) { }); } -/*qglWYo2THvIGavZX5nSbwZ5iMJbqsiHVu5zwiu1zN1U=*/ \ No newline at end of file +/*qglWYo2THvIGavZX5nSbwZ5iMJbqsiHVu5zwiu1zN1U=*/ diff --git a/src/ic/ic/sapplybill/card/viewController/btnClickController.js b/src/ic/ic/sapplybill/card/viewController/btnClickController.js index 60af194..9e5e45e 100644 --- a/src/ic/ic/sapplybill/card/viewController/btnClickController.js +++ b/src/ic/ic/sapplybill/card/viewController/btnClickController.js @@ -1,8 +1,8 @@ /*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ /* - * @Author: lizhbo + * @Author: lizhbo * @PageInfo: 出库申请单卡片态-按钮分发 - * @Date: 2019-01-03 10:30:42 + * @Date: 2019-01-03 10:30:42 * @Last Modified by: lizhbo * @Last Modified time: 2020-03-13 15:43:44 */ @@ -129,6 +129,14 @@ export default function clickBtn(props, id, text, record, mindex) { usecache: 'N' //跳转到转单查询区不使用缓存 }); break; + //备料计划 + case BUTTONID_CARD.RefBljh: + clearTransferCache(props, DATASOURCE.refBljhDataSource); + props.pushTo(URL.gotoTransfer2, { + type: 'refBljh', + usecache: 'N' //跳转到转单查询区不使用缓存 + }); + break; //行打开 case BUTTONID_CARD.LineOpen: return rowOpenCloseBtnClick.call(this, props, true, record, this.queryDatas); @@ -183,4 +191,4 @@ export default function clickBtn(props, id, text, record, mindex) { } } -/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ \ No newline at end of file +/*h84Q5eMmSJsRENxS4eEsJpEs+23g301xPXaaFa9z60A=*/ diff --git a/src/ic/ic/sapplybill/constance/index.js b/src/ic/ic/sapplybill/constance/index.js index 6676026..4bbc3fe 100644 --- a/src/ic/ic/sapplybill/constance/index.js +++ b/src/ic/ic/sapplybill/constance/index.js @@ -25,7 +25,8 @@ const URL = { rowOpenClose: '/nccloud/ic/sapplybill/rowOpenClose.do', //行打开关闭操作 maintain: '/nccloud/ic/sapplybill/maintain.do', //删除、提交、收回 queryAddTab: '/nccloud/ic/pub/queryaddtab.do', //查询单据业务流可用信息 - transfer: '/nccloud/ic/sapplybill/transfervo.do', //转单 + transfer: '/nccloud/ic/sapplybill/transfervo.do', //转单(物资需求) + transfer2: '/nccloud/ic/sapplybill/transfervo1.do', //转单(备料计划) printUrl: '/nccloud/ic/sapplybill/print.do', //打印 combine: '/nccloud/ic/sapplybill/combine.do', // 合并显示 combineprint: '/nccloud/ic/pub/combineprint.do', // 合并打印 diff --git a/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js b/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js index 1c55120..599c277 100644 --- a/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js +++ b/src/ic/ic/sapplybill/list/btnClicks/refBljhBtnClick.js @@ -7,7 +7,7 @@ * @Last Modified time: 2024-12-13 17:33:02 */ import { URL } from '../../constance'; -import { DATASOURCE } from '../../transfer/const'; +import { DATASOURCE } from '../../transfer2/const'; import { clearTransferCache } from '../../../../../scmpub/scmpub/pub/cache/cacheDataManager'; export default function clickAddBtn(props) { clearTransferCache(props, DATASOURCE.refBljhDataSource); diff --git a/src/ic/ic/sapplybill/transfer/const/index.js b/src/ic/ic/sapplybill/transfer/const/index.js index 857788f..31a3cb1 100644 --- a/src/ic/ic/sapplybill/transfer/const/index.js +++ b/src/ic/ic/sapplybill/transfer/const/index.js @@ -1,10 +1,10 @@ /*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ /* - * @Author: raoczh + * @Author: raoczh * @PageInfo: 出库申请-拉单常量 - * @Date: 2018-12-10 12:11:37 - * @Last Modified by: raoczh - * @Last Modified time: 2018-12-10 12:11:37 + * @Date: 2018-12-10 12:11:37 + * @Last Modified by: raoczh + * @Last Modified time: 2018-12-10 12:11:37 */ const PAGECODE = { pagecode422x: '400400000_422Xto4455' @@ -19,7 +19,8 @@ const PAGEAREA = { tile422x: 'tile422x' }; const DATASOURCE = { - ref422xDataSource: 'ref422xDataSource' + ref422xDataSource: 'ref422xDataSource', + refBljhDataSource: 'refBljhDataSource' }; //物资需求申请 const fileds_orgfilter_422x = [ @@ -35,6 +36,6 @@ const URL = { search422x: '/nccloud/ic/sapplybill/query422x.do' }; -export { PAGECODE, APPCODE, PAGEAREA, PK, URL, DATASOURCE, fileds_orgfilter_422x }; +export {PAGECODE, APPCODE, PAGEAREA, PK, URL, DATASOURCE, fileds_orgfilter_422x}; -/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/ \ No newline at end of file +/*2gXQ0nN3+Et9xmw6gOyzbHfStbROxMgHTt7COgBVOUw=*/