diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js deleted file mode 100644 index 09a670fc..00000000 --- a/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js +++ /dev/null @@ -1,100 +0,0 @@ -import {ajax, toast} from 'nc-lightapp-front'; -import {AREA, URL, DIALOGCODE, FIELD} from '../../constance'; -import {initLang, getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -import PickmCLQueryDlg from '../../pickmclquery/list'; -import {showErrorInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; - -export default function detailqueryBtnClick(props, record) { - let _this = this; - let bids = []; - let hid; - let rows = this.props.cardTable.getCheckedRows(AREA.bodyTable); - // 如果没有选中行，则提示并返回，不进行任何操作 - if (!rows) { - return; - } - if (rows.length <= 0) { - hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; - } else { - rows.map((item) => { - let cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; - bids.push(cpickm_bid); - }); - } - doQuery.call(this, props, hid, bids, rows); - -} - -function doQuery(props, hid, bids, rows) { - let appcode = props.getAppCode(); - - ajax({ - url: '/nccloud/mmpac/pickm/pickmItemsQuery.do', - data: { - cpickmid: hid, - cpickmbids: bids, - pageid: DIALOGCODE.CLQUERYDLG, - appcode: appcode - }, - success: res => { - let bids = res.data.data; - // console.log('bids = ', bids); - let rows1 = []; - rows.map((item) => { - let values = item.data.values; - // 借料数量 = 计划出库数量-累计出库数量-累计发货数量-累计委外数量，所有数值用getNumber处理null转0 - values.borrowedQty = { - value: getNumber(values.nplanoutastnum) - getNumber(values.naccoutastnum) - - getNumber(values.nshouldastnum) - getNumber(values.npscastnum) - }; - let def26 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid").value; - // let def27 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid.name").value; - let form = this.props.form.getAllFormValue(AREA.formArea); - // values.cmaterialvid = { - // value: def26 - // }; - values.cmaterialvid = form.rows[0].values["cmaterialvid"]; - values.cmaterialvidName = { - value: form.rows[0].values["cmaterialvid.name"].value - }; - if(undefined !=form.rows[0].values["cmaterialvid.def26"]){ - values.cmaterialvidDef26 = { - value: form.rows[0].values["cmaterialvid.def26"].value - }; - } - let rowItem = { - isOptimized: false, - status: '0', - values: values - }; - // 确保 bids 是数组类型 - if (!Array.isArray(bids)) { - bids = [bids]; - } - // 筛选出未生成的行 - // console.log('values.cpickm_bid = ', values.cpickm_bid.value); - // console.log('values.indexOf = ', bids.indexOf(values.cpickm_bid.value)); - if (values.cpickm_bid && values.cpickm_bid.value && (bids.indexOf(values.cpickm_bid.value) > -1) && values.borrowedQty.value>0) { - rows1.push(rowItem); - } - }); - let data = { - areacode: 'clquery', - rows: rows1 - }; - // console.log('rows = ', rows); - // console.log('data = ', data); - props.table.setAllTableData(AREA.borrowMaterialDialog, data); - props.modal.show(AREA.borrowMaterialDialog); - } - }); -} - -// 本地安全数值转换方法，null/undefined/空对象转0 -function getNumber(data) { - if (data && data.value != null) { - return +data.value; - } else { - return 0; - } -} diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/index.js b/src/mmpac/mmpac/pickm/card/btnClicks/index.js index 1d6bdff8..cf30b411 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/index.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/index.js @@ -22,7 +22,6 @@ import clqueryBtnClick from './clqueryBtnClick';//存量查询 import replaceBtnClick from './replaceBtnClick'; import reserveBtnClick from './reserveBtnClick'; import reserveQueryBtnClick from './reserveQueryBtnClick'; -import detailqueryBtnClick from './detailqueryBtnClick'; import pushrzmsBtnClick from './pushrzmsBtnClick.js'; //推送锐制 import borrowBtnClick from './borrowBtnClick.js'; import borrowOkBtnClick from "./borrowOkBtnClick.js"; @@ -30,6 +29,6 @@ export { pageInfoClick, getParentURlParme, setBtnShow, backBtnClick, addBtnClick, delBtnClick, editBtnClick, cancelBtnClick, saveBtnClick, saveCommitBtnClick, copyBtnClick, commitBtnClick, unCommitBtnClick, printBtnClick, outputBtnClick, subItemsBtnClick, - finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick,detailqueryBtnClick, + finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick, pageInfoClickPage,pushrzmsBtnClick, borrowBtnClick, borrowOkBtnClick }; diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index caaa88c3..a2d155b9 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -1,28 +1,28 @@ import { - backBtnClick, addBtnClick, + backBtnClick, + cancelBtnClick, + clqueryBtnClick, + commitBtnClick, + copyBtnClick, delBtnClick, editBtnClick, - cancelBtnClick, - saveBtnClick, - saveCommitBtnClick, - copyBtnClick, - commitBtnClick, - unCommitBtnClick, - printBtnClick, - outputBtnClick, - subItemsBtnClick, finishBtnClick, - unfinishBtnClick, - clqueryBtnClick, - replaceBtnClick, + outputBtnClick, pageInfoClick, + printBtnClick, + pushrzmsBtnClick, + replaceBtnClick, reserveBtnClick, reserveQueryBtnClick, - detailqueryBtnClick,pushrzmsBtnClick -} from '../btnClicks';// + saveBtnClick, + saveCommitBtnClick, + subItemsBtnClick, + unCommitBtnClick, + unfinishBtnClick +} from '../btnClicks'; // import newLineDefaultUtil from '../utils/newLineDefaultUtil'; -import {CARD_BTN, AREA, URL, PAGECARDCODE, FIELD, UISTATE, DIALOGCODE, PickmCache, appcode} from '../../constance'; +import {AREA, CARD_BTN, DIALOGCODE, FIELD, PAGECARDCODE, PickmCache, UISTATE, URL} from '../../constance'; import {RownoUtils} from '../../../../../mmpub/mmpub/pub/tool/cardTableTools'; import {rowCopyPasteUtils} from '../utils/rowCopyPasteUtils'; import {checkDeleteRows} from '../utils/rowDeleteUtil'; @@ -31,12 +31,7 @@ import {ajax, cacheTools} from 'nc-lightapp-front'; import {setBtnShow} from '../btnClicks/pageInfoClick'; import {pickmSetDeliver} from '../../../pub/pickmdeliverwithset'; import {updateCacheData} from '../../../../../mmpub/mmpub/pub/cache/cacheDataManager'; -import { - showSuccessInfo, - showErrorInfo, - showWarningInfo, - showWarningDialog -} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; +import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; import {pickmBackDeliver} from '../../../pub/pickmbackdeliver'; import {pickmTakeOver} from '../../../pub/pickmtakeover'; import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil';