往来核销处理列表增加币种字段
This commit is contained in:
		
							parent
							
								
									ec5845c789
								
							
						
					
					
						commit
						778069a87d
					
				|  | @ -134,7 +134,7 @@ class ExportVrify extends Component { | |||
|     componentWillMount() { | ||||
|         let callback = (json,status,inlt) => { | ||||
|             this.columns_credit=this.getCreditOrDebitCoumn('credit',json); | ||||
|             this.columns_debit=this.getCreditOrDebitCoumn('debit',json);     | ||||
|             this.columns_debit=this.getCreditOrDebitCoumn('debit',json); | ||||
|             this.loadQuery = [ | ||||
|                 { | ||||
|                     itemName: json['20020VRIFYPAGE-000016'],/* 国际化处理: 核算账簿*/ | ||||
|  | @ -231,7 +231,7 @@ class ExportVrify extends Component { | |||
|                     refType: "grid" | ||||
|                 }, | ||||
|                 { itemName: json['20020VRIFYPAGE-000035'], itemType: "textInput", itemKey: "verifyno" },/* 国际化处理: 核销号*/ | ||||
|      | ||||
| 
 | ||||
|                 { | ||||
|                     itemName: json['20020VRIFYPAGE-000036'],/* 国际化处理: 包含未记账凭证*/ | ||||
|                     itemType: "checkbox", | ||||
|  | @ -1095,7 +1095,7 @@ class ExportVrify extends Component { | |||
|             debitDataArr: resourceData_debit | ||||
|         }, () => { | ||||
|             this.handleSumAmount('credit'); | ||||
|             this.handleSumAmount('debit');  | ||||
|             this.handleSumAmount('debit'); | ||||
|             let buttonArr = ['RB_hedging', 'auto_verificationCancel', 'auto_RB_hedging', 'history_operation', 'full_match', 'cancel_match', | ||||
|                 'contrast', 'link_voucher']; | ||||
|             this.props.button.setButtonDisabled(buttonArr, false); | ||||
|  | @ -1129,14 +1129,14 @@ class ExportVrify extends Component { | |||
|                         if(!modalDefaultValue.enddate){ | ||||
|                             modalDefaultValue.enddate = response.data.enddate; | ||||
|                         } | ||||
|                          | ||||
| 
 | ||||
|                         modalDefaultValue.bizDate = response.data.bizDate; | ||||
|                         modalDefaultValue.yearbegindate = response.data.yearbegindate; | ||||
|                         if(!modalDefaultValue.pk_currency.value){ | ||||
|                             modalDefaultValue.pk_currency.display = response.data.currinfo.display; | ||||
|                             modalDefaultValue.pk_currency.value = response.data.currinfo.value; | ||||
|                         } | ||||
|                          | ||||
| 
 | ||||
|                         modalDefaultValue.pk_org = response.data.unit.value; | ||||
|                         modalDefaultValue.account_currency = response.data.currinfo.value; | ||||
|                         modalDefaultValue.isCrossAccountVerify = response.data.isCrossAccountVerify; | ||||
|  | @ -1311,7 +1311,7 @@ class ExportVrify extends Component { | |||
|             // self.verifyIsControlFun(pk_accountingbook.value,pk_accasoa.value);
 | ||||
|             verifyUnverifySum(self); | ||||
|             self.handleSumAmount('credit'); | ||||
|             self.handleSumAmount('debit');  | ||||
|             self.handleSumAmount('debit'); | ||||
|         }) | ||||
|     } | ||||
|     //及时核销判断核销对象是否为严格控制
 | ||||
|  | @ -1487,7 +1487,7 @@ class ExportVrify extends Component { | |||
|                 }, () => { | ||||
|                     verifyUnverifySum(self); | ||||
|                     self.handleSumAmount('credit'); | ||||
|                     self.handleSumAmount('debit');  | ||||
|                     self.handleSumAmount('debit'); | ||||
|                 }) | ||||
|             } | ||||
|         } | ||||
|  | @ -1797,7 +1797,7 @@ class ExportVrify extends Component { | |||
|         } | ||||
|         return cUZ_num; | ||||
|     } | ||||
|     | ||||
| 
 | ||||
|     // 单选 控制 debitBoxClicked状态
 | ||||
|     handleChecked(type, index) { | ||||
|         const { | ||||
|  | @ -1993,10 +1993,10 @@ class ExportVrify extends Component { | |||
|                     debitDataArr[j].m_dDebit_Money_B.display = debitDataArr[j].m_dDebit_Money_B.display?accAdd(debitDataArr[j].m_dDebit_Money_B.display,debitDataArr[j].m_Balancelocaldebitamount.value):debitDataArr[j].m_Balancelocaldebitamount.value; | ||||
|                     debitDataArr[j].m_dDebit_Money_Y.value = brr[j].m_dDebit_Money_Y; | ||||
|                     debitDataArr[j].m_dDebit_Money_B.value = debitDataArr[j].m_dDebit_Money_B.value?accAdd(debitDataArr[j].m_dDebit_Money_B.value,debitDataArr[j].m_Balancelocaldebitamount.value):debitDataArr[j].m_Balancelocaldebitamount.value; | ||||
|                      | ||||
| 
 | ||||
|                     debitDataArr[j].m_Balancedebitamount.display = brr[j].m_Balancedebitamount;//debitDataArr[j].m_dDebit_Money_Y.value&&debitDataArr[j].m_dDebit_Money_Y.prevValue?debitDataArr[j].m_Balancedebitamount.display:brr[j].m_Balancedebitamount;
 | ||||
|                     debitDataArr[j].m_Balancelocaldebitamount.display =0;//debitDataArr[j].m_dDebit_Money_B.value&&debitDataArr[j].m_dDebit_Money_Y.prevValue?debitDataArr[j].m_Balancelocaldebitamount.display: 0;
 | ||||
|                      | ||||
| 
 | ||||
|                     debitDataArr[j].m_Balancedebitamount.value = brr[j].m_Balancedebitamount;//debitDataArr[j].m_dDebit_Money_Y.value&&debitDataArr[j].m_dDebit_Money_Y.prevValue?debitDataArr[j].m_Balancedebitamount.value:brr[j].m_Balancedebitamount;
 | ||||
|                     debitDataArr[j].m_Balancelocaldebitamount.value =0;// debitDataArr[j].m_dDebit_Money_B.value&&debitDataArr[j].m_dDebit_Money_Y.prevValue?debitDataArr[j].m_Balancelocaldebitamount.value:0;
 | ||||
|                     debitDataArr[j].m_dDebit_Money_Y.prevValue = brr[j].m_dDebit_Money_Y; | ||||
|  | @ -2008,7 +2008,7 @@ class ExportVrify extends Component { | |||
|                     debitDataArr[j].m_dDebit_Money_B.value = 0; | ||||
|                     debitDataArr[j].m_Balancedebitamount.display = debitDataArr[j].empty_m_Balancedebitamount.value; | ||||
|                     debitDataArr[j].m_Balancelocaldebitamount.display = debitDataArr[j].empty_m_Balancelocaldebitamount.value; | ||||
|                      | ||||
| 
 | ||||
|                     debitDataArr[j].m_Balancedebitamount.value = debitDataArr[j].empty_m_Balancedebitamount.value; | ||||
|                     debitDataArr[j].m_Balancelocaldebitamount.value = debitDataArr[j].empty_m_Balancelocaldebitamount.value; | ||||
|                     debitDataArr[j].m_dDebit_Money_Y.prevValue = 0//brr[j].m_dDebit_Money_Y;
 | ||||
|  | @ -2041,10 +2041,10 @@ class ExportVrify extends Component { | |||
|                     creditDataArr[n].m_dCredit_Money_B.display = creditDataArr[n].m_dCredit_Money_B.display?accAdd(creditDataArr[n].m_dCredit_Money_B.display,creditDataArr[n].m_Balancelocalcreditamount.value):creditDataArr[n].m_Balancelocalcreditamount.value; | ||||
|                     creditDataArr[n].m_dCredit_Money_Y.value = brr[n].m_dCredit_Money_Y; | ||||
|                     creditDataArr[n].m_dCredit_Money_B.value = creditDataArr[n].m_dCredit_Money_B.value?accAdd(creditDataArr[n].m_dCredit_Money_B.value,creditDataArr[n].m_Balancelocalcreditamount.value):creditDataArr[n].m_Balancelocalcreditamount.value; | ||||
|                      | ||||
| 
 | ||||
|                     creditDataArr[n].m_Balancecreditamount.display =brr[n].m_Balancecreditamount;// creditDataArr[n].m_dCredit_Money_Y.value&&creditDataArr[n].m_dCredit_Money_Y.prevValue?creditDataArr[n].m_Balancecreditamount.display:brr[n].m_Balancecreditamount;
 | ||||
|                     creditDataArr[n].m_Balancelocalcreditamount.display =0;// creditDataArr[n].m_dCredit_Money_B.value&&creditDataArr[n].m_dCredit_Money_Y.prevValue?creditDataArr[n].m_Balancelocalcreditamount.display:0;
 | ||||
|                      | ||||
| 
 | ||||
|                     creditDataArr[n].m_Balancecreditamount.value =brr[n].m_Balancecreditamount;// creditDataArr[n].m_dCredit_Money_Y.value&&creditDataArr[n].m_dCredit_Money_Y.prevValue?creditDataArr[n].m_Balancecreditamount.value:brr[n].m_Balancecreditamount;
 | ||||
|                     creditDataArr[n].m_Balancelocalcreditamount.value =0;// creditDataArr[n].m_dCredit_Money_B.value&&creditDataArr[n].m_dCredit_Money_Y.prevValue?creditDataArr[n].m_Balancelocalcreditamount.value:0;
 | ||||
|                     creditDataArr[n].m_dCredit_Money_Y.prevValue = brr[n].m_dCredit_Money_Y; | ||||
|  | @ -2056,7 +2056,7 @@ class ExportVrify extends Component { | |||
|                     creditDataArr[n].m_dCredit_Money_B.value = 0; | ||||
|                     creditDataArr[n].m_Balancecreditamount.display = creditDataArr[n].empty_m_Balancecreditamount.value; | ||||
|                     creditDataArr[n].m_Balancelocalcreditamount.display = creditDataArr[n].empty_m_Balancelocalcreditamount.value; | ||||
|                      | ||||
| 
 | ||||
|                     creditDataArr[n].m_Balancecreditamount.value = creditDataArr[n].empty_m_Balancecreditamount.value; | ||||
|                     creditDataArr[n].m_Balancelocalcreditamount.value = creditDataArr[n].empty_m_Balancelocalcreditamount.value; | ||||
|                     creditDataArr[n].m_dCredit_Money_Y.prevValue = 0// brr[n].m_dCredit_Money_Y;
 | ||||
|  | @ -2082,7 +2082,7 @@ class ExportVrify extends Component { | |||
|         return h; | ||||
|     } | ||||
|      //合并计算本次核销/未核销的原币组织本币的合计
 | ||||
|      handleSumAmount=(type)=>{  | ||||
|      handleSumAmount=(type)=>{ | ||||
|         let {SumAmount,checkedArrayDebit,debitDataArr,checkedArrayCredit,creditDataArr,}=this.state; | ||||
|         let cY_num = 0,cZ_num = 0,cUY_num = 0,cUZ_num = 0; | ||||
|         if (type == "debit") { | ||||
|  | @ -2320,6 +2320,17 @@ class ExportVrify extends Component { | |||
|                             ); | ||||
|                         } | ||||
|                     }, | ||||
|                     { | ||||
|                         title: (<div fieldid="currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理: 币种*/ | ||||
|                         dataIndex: "currtypeName", | ||||
|                         key: "currtypeName", | ||||
|                         width: 100, | ||||
|                         render: (text, record, index) => { | ||||
|                             return ( | ||||
|                                <div fieldid="currtypeName"  className="defovercol">{text==null||(text&&!text.display)?<span> </span>:text.display}</div> | ||||
|                             ); | ||||
|                         } | ||||
|                     }, | ||||
|                     { | ||||
|                         title: (<div fieldid="m_prepareddate" className="mergecells">{json['20020VRIFYPAGE-000021']}</div>),/* 国际化处理: 凭证日期*/ | ||||
|                         dataIndex: "m_prepareddate", | ||||
|  | @ -2473,7 +2484,7 @@ class ExportVrify extends Component { | |||
|                                                                 // creditDataArr[index].m_Balancecreditamount.display =creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|                                                                 // creditDataArr[index].m_dCredit_Money_Y.value = 0;
 | ||||
|                                                                 // creditDataArr[index].m_Balancecreditamount.value =creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|              | ||||
| 
 | ||||
|                                                                 if (queryCondition.pk_currency ==queryCondition.account_currency) { | ||||
|                                                                     //币种相同组织本币不可以编辑的,跟着原币变化
 | ||||
|                                                                     creditDataArr[index].m_dCredit_Money_B.display = this.handleConversion(creditDataArr[index].m_dCredit_Money_Y.value); | ||||
|  | @ -2483,12 +2494,12 @@ class ExportVrify extends Component { | |||
|                                                                 } | ||||
|                                                             } else { | ||||
|                                                                 if (Math.abs(v - 0) > Math.abs(creditDataArr[index].empty_m_Balancecreditamount.value - 0)) { | ||||
|              | ||||
| 
 | ||||
|                                                                     creditDataArr[index].m_dCredit_Money_Y.display = creditDataArr[index].m_dCredit_Money_Y.prevValue;// creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|                                                                     creditDataArr[index].m_dCredit_Money_Y.value = creditDataArr[index].m_dCredit_Money_Y.prevValue;// creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|                                                                     creditDataArr[index].m_Balancecreditamount.value = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|                                                                     creditDataArr[index].m_Balancecreditamount.display = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|              | ||||
| 
 | ||||
|                                                                     if (queryCondition.pk_currency ==queryCondition.account_currency) { | ||||
|                                                                         //币种相同组织本币不可以编辑的,跟着原币变化
 | ||||
|                                                                         creditDataArr[index].m_dCredit_Money_B.display = this.handleConversion(creditDataArr[index].m_dCredit_Money_Y.value); | ||||
|  | @ -2520,7 +2531,7 @@ class ExportVrify extends Component { | |||
|                                                                     creditDataArr[index].m_dCredit_Money_Y.value = creditDataArr[index].m_dCredit_Money_Y.prevValue;//creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|                                                                     creditDataArr[index].m_Balancecreditamount.value = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|                                                                     creditDataArr[index].m_Balancecreditamount.display = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|              | ||||
| 
 | ||||
|                                                                     if (queryCondition.pk_currency ==queryCondition.account_currency) { | ||||
|                                                                         //币种相同组织本币不可以编辑的,跟着原币变化
 | ||||
|                                                                         creditDataArr[index].m_dCredit_Money_B.display = this.handleConversion([index].m_dCredit_Money_Y.value); | ||||
|  | @ -2547,7 +2558,7 @@ class ExportVrify extends Component { | |||
|                                                                 creditDataArr[index].m_dCredit_Money_Y.value = creditDataArr[index].m_dCredit_Money_Y.prevValue;// creditDataArr[index].empty_m_Balancecreditamount.value;
 | ||||
|                                                                 creditDataArr[index].m_Balancecreditamount.value = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|                                                                 creditDataArr[index].m_Balancecreditamount.display = Subtr(creditDataArr[index].empty_m_Balancecreditamount.value, creditDataArr[index].m_dCredit_Money_Y.value);//0;
 | ||||
|              | ||||
| 
 | ||||
|                                                                 if (queryCondition.pk_currency ==queryCondition.account_currency) { | ||||
|                                                                     //币种相同组织本币不可以编辑的,跟着原币变化
 | ||||
|                                                                     creditDataArr[index].m_dCredit_Money_B.display = this.handleConversion(creditDataArr[index].m_dCredit_Money_Y.value); | ||||
|  | @ -2805,6 +2816,17 @@ class ExportVrify extends Component { | |||
|                             ); | ||||
|                         } | ||||
|                     }, | ||||
|                     { | ||||
|                         title: (<div fieldid="currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理: 币种*/ | ||||
|                         dataIndex: "currtypeName", | ||||
|                         key: "currtypeName", | ||||
|                         width: 100, | ||||
|                         render: (text, record, index) => { | ||||
|                             return ( | ||||
|                                <div fieldid="currtypeName" className="defovercol">{text==null||(text&&!text.display)?<span> </span>:text.display}</div> | ||||
|                             ); | ||||
|                         } | ||||
|                     }, | ||||
|                     { | ||||
|                         title: (<div fieldid="m_prepareddate" className="mergecells">{json['20020VRIFYPAGE-000021']}</div>),/* 国际化处理: 凭证日期*/ | ||||
|                         dataIndex: "m_prepareddate", | ||||
|  | @ -3117,9 +3139,9 @@ class ExportVrify extends Component { | |||
|                                                         } else {//未核销数为负数
 | ||||
|                                                             if (v - 0 < 0) { | ||||
|                                                                 if (Math.abs(v - 0) > Math.abs(debitDataArr[index].empty_m_Balancelocaldebitamount.value - 0)) { | ||||
|                                                                     debitDataArr[index].m_dDebit_Money_B.display = debitDataArr[index].m_dDebit_Money_B.prevValue;// 0; 
 | ||||
|                                                                     debitDataArr[index].m_dDebit_Money_B.display = debitDataArr[index].m_dDebit_Money_B.prevValue;// 0;
 | ||||
|                                                                     debitDataArr[index].m_Balancelocaldebitamount.display = Subtr(debitDataArr[index].empty_m_Balancelocaldebitamount.value, debitDataArr[index].m_dDebit_Money_B.value);// debitDataArr[index].empty_m_Balancelocaldebitamount.value;
 | ||||
|                                                                     debitDataArr[index].m_dDebit_Money_B.value =debitDataArr[index].m_dDebit_Money_B.prevValue;// 0; 
 | ||||
|                                                                     debitDataArr[index].m_dDebit_Money_B.value =debitDataArr[index].m_dDebit_Money_B.prevValue;// 0;
 | ||||
|                                                                     debitDataArr[index].m_Balancelocaldebitamount.value = Subtr(debitDataArr[index].empty_m_Balancelocaldebitamount.value, debitDataArr[index].m_dDebit_Money_B.value);// debitDataArr[index].empty_m_Balancelocaldebitamount.value;
 | ||||
|                                                                 } else { | ||||
|                                                                     debitDataArr[index].m_dDebit_Money_B.display = v; | ||||
|  | @ -3272,10 +3294,10 @@ class ExportVrify extends Component { | |||
|         if(columns_debitArr){ | ||||
|             columnsDebit = that.renderColumnsMultiSelectDebit(columns_debitArr); | ||||
|         } | ||||
|          | ||||
| 
 | ||||
|         return ( | ||||
|             <div className={that.state.position ? "content" : "content vertical"} id="query_body"> | ||||
|                 <HeaderArea  | ||||
|                 <HeaderArea | ||||
|                     verifyflag={that.props.voucherVerifyflag} | ||||
|                     title = {(!that.props.voucherVerifyflag) ? that.state.json['20020VRIFYPAGE-000081']: ''}/* 国际化处理: 往来核销处理*/ | ||||
|                     searchContent = { | ||||
|  | @ -3314,7 +3336,7 @@ class ExportVrify extends Component { | |||
| 
 | ||||
|                             } | ||||
|                         </div> | ||||
|                          | ||||
| 
 | ||||
|                     } | ||||
|                 /> | ||||
|                 {/*  */} | ||||
|  | @ -3328,7 +3350,7 @@ class ExportVrify extends Component { | |||
|                 /> | ||||
|                 <VerifyStandardModal | ||||
|                     loadData={that.verifyStandard} | ||||
|                     flag={'1'}//1 表示自动核销弹框       
 | ||||
|                     flag={'1'}//1 表示自动核销弹框
 | ||||
|                     queryCondition={queryCondition} | ||||
|                     showOrHide={verifyStandardshowModal} | ||||
|                     onConfirm={handleAutoVerify.bind(that, that.state)} | ||||
|  | @ -3414,4 +3436,4 @@ ExportVrify = createPage({ | |||
| })(ExportVrify); | ||||
| 
 | ||||
| export default ExportVrify; | ||||
| /*6/qQ0+hrESXLl3knz4rqBwsPkvQ7kJhaHJtTHUlF3V4=*/ | ||||
| /*6/qQ0+hrESXLl3knz4rqBwsPkvQ7kJhaHJtTHUlF3V4=*/ | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue