From 876e666ce9a079cff3bb2b8f3a58ccf992b3b6e9 Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 12 Jan 2026 16:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paybill/paybill/card/events/afterEvent.js | 34 ++++++++-- .../paybill/card/events/buttonClick.js | 11 +++- .../paybill/list/events/buttonClick.js | 3 + src/arap/paybill/paybill/list/index.js | 4 +- .../card/viewController/btnClickController.js | 64 +++++++++++++++++++ 5 files changed, 108 insertions(+), 8 deletions(-) diff --git a/src/arap/paybill/paybill/card/events/afterEvent.js b/src/arap/paybill/paybill/card/events/afterEvent.js index b7598262..50a247c8 100644 --- a/src/arap/paybill/paybill/card/events/afterEvent.js +++ b/src/arap/paybill/paybill/card/events/afterEvent.js @@ -2,7 +2,7 @@ import { ajax, promptBox, toast } from 'nc-lightapp-front'; import { currentTypeAfterFormEvents } from '../../../../public/components/pubUtils/currentTypeAfterEvent'; import { autoAddLineKeys } from '../../../../public/components/pubUtils/billPubInfo'; -import { checknoDisplayAfterEvent, checktypeAfterEvent,isbillrangeEdit } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js'; +import { checknoDisplayAfterEvent, checktypeAfterEvent, isbillrangeEdit,currtypeAfterEvent } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js'; import { formulamsgHint, renderData, headAfterEventRenderData, bodyAfterEventRenderData, errorDeal } from '../../../../public/components/afterEventPub/afterEventPubDeal'; import { getColvalues, getRowIds } from '../../../../public/components/pubUtils/billPubUtil'; import { moneyAndRateFields } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js'; @@ -94,6 +94,25 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i, errorDeal(this, res, changedrows, key); } }); + ajax({ + url: '/nccloud/arap/arappub/ischecknoref.do', + data: { + autoButton:'autoButton', + pk_org: value.key + }, + async: false, + success: (res) => { + if(res.data){ + if (status == 'browse') { + this.props.button.setButtonVisible('AutoBillrange', false); + }else{ + this.props.button.setButtonVisible('AutoBillrange', true); + } + }else{ + this.props.button.setButtonVisible('AutoBillrange', false); + } + } + }); }, cancelBtnClick: () => { this.props.form.setFormItemsValue(this.formId, { pk_org_v: changedrows }); @@ -227,8 +246,13 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i, } } - //表体编辑后事件 + //表体编辑后事件增加编辑票据号对于子票区间的控制 if (moduleId == this.tableId) { + //币种 + if (key == 'pk_currtype') { + currtypeAfterEvent(this.props, this.tableId, key, value, i); + } + //票据类型 if (key == 'checktype') { checktypeAfterEvent(this.props, this.tableId, key, value, i); @@ -236,7 +260,7 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i, if (key == 'direct_checkno') { let checkno = this.props.cardTable.getValByKeyAndIndex(this.tableId, i, "checkno"); let checknovalue = checkno?checkno.value:null; - if(value=="N"&&isbillrangeEdit(checknovalue,value)){ + if((value=="N"||value==false)&&isbillrangeEdit(checknovalue,value)){ this.props.cardTable.setEditableByIndex(this.tableId, i, ['billrangestart','billrangeend'], true); }else{ this.props.cardTable.setEditableByIndex(this.tableId, i, ['billrangestart','billrangeend'], false); @@ -246,17 +270,19 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i, if (key == 'checkno_display') { checknoDisplayAfterEvent(this.props, this.tableId, key, value, i); key = 'checkno'; + if(value!=null && value.values!=null){ let billtypecode = value.values.pk_billtypecode.value; let subcontractcirculation = value.values.subcontractcirculation.value; if(billtypecode=="36H2"){ this.isEditbillrangge = false; - }else if(billtypecode=="36H1"){ + }else if(billtypecode=="36H1"||billtypecode=="36HN"){ if(subcontractcirculation=="Y"){ this.isEditbillrangge = true; }else{ this.isEditbillrangge = false; } } + } } //科目字段特殊拼接1121\应收票据 if(key == "subjcode"){ diff --git a/src/arap/paybill/paybill/card/events/buttonClick.js b/src/arap/paybill/paybill/card/events/buttonClick.js index fcb60899..6e0b6821 100644 --- a/src/arap/paybill/paybill/card/events/buttonClick.js +++ b/src/arap/paybill/paybill/card/events/buttonClick.js @@ -2,6 +2,7 @@ import { ajax, toast, cardCache, promptBox,metaCache} from 'nc-lightapp-front'; import { headButton,innerButton, bodyButton } from '../../../../public/components/pubUtils/buttonName'; import { + autoCountBillrange, delLine, copyLine, pasteLine, @@ -23,8 +24,9 @@ import { billEditProperties, dealCommisionPayFieldBack, cardFieldsEditableWithResetProxy, - checkRedType -} from '../../../../public/components/pubUtils/billFieldEditableUtil.js'; + checkRedType, + directChecknoEditable + } from '../../../../public/components/pubUtils/billFieldEditableUtil.js'; import { getContext, loginContextKeys } from '../../../../public/components/arapInitInfo/loginContext'; import { moduleEnable, IMAG, SSCIVM } from '../../../../public/components/moduleEnable.js'; import { throwSagaErrorAgency } from '../../../../public/components/pubUtils/MicroServiceSocket.js'; @@ -678,6 +680,9 @@ export function buttonClick(props, id) { ); } break; + case bodyButton.AutoBillrange://自动计算子票区间 + autoCountBillrange(this,dataSource) + break; case bodyButton.PasteLine: //粘贴行 pasteLine(this); break; @@ -920,6 +925,8 @@ export function cardBillEdit() { dealCommisionPayField(this.props, this.formId, this.tableId); //处理往来对象的可编辑性 objtypeEditable(this.props, this.formId, this.tableId); + //处理直联电票的可编辑行 + directChecknoEditable(this.props, this.formId, this.tableId) if (res.data && res.data.head) { this.props.form.setFormItemsDisabled(this.formId, res.data.head); this.headBack = res.data.headBack diff --git a/src/arap/paybill/paybill/list/events/buttonClick.js b/src/arap/paybill/paybill/list/events/buttonClick.js index e9811747..fa3773b8 100644 --- a/src/arap/paybill/paybill/list/events/buttonClick.js +++ b/src/arap/paybill/paybill/list/events/buttonClick.js @@ -278,6 +278,9 @@ export default function buttonClick(props, id) { break; case headButton.Print: //打印 let printData = this.props.table.getCheckedRows(this.tableId); + printData.sort((a, b) => { + return a.index - b.index; + }); if (printData.length == 0) { toast({ color: 'warning', content: this.state.json['paybill-000029'] }); /* 国际化处理： 请选中一行数据!*/ return; diff --git a/src/arap/paybill/paybill/list/index.js b/src/arap/paybill/paybill/list/index.js index 93bfd306..63954a9f 100644 --- a/src/arap/paybill/paybill/list/index.js +++ b/src/arap/paybill/paybill/list/index.js @@ -763,9 +763,9 @@ class List extends Component { cancel={this.tbbLinkcancel.bind(this)} /> {/* {联查发票} */} - {this.state.showSSCmodule ? ( + {/* {this.state.showSSCmodule ? ( - ) : null} + ) : null} */} {showUploader && (