| @@ -77,11 +77,11 @@ const FormPanel = ({ formData }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| if(paymentMethod=="demandNote"){ | |||||
| paymentMethod = isOverDnReviseDeadline()?"":paymentMethod; | |||||
| }else if(paymentMethod=="office"){ | |||||
| paymentMethod = isOverNpgoReviseDeadline?"":paymentMethod; | |||||
| let pm = paymentMethod; | |||||
| if(pm=="demandNote"){ | |||||
| pm = isOverDnReviseDeadline()?"":pm; | |||||
| }else if(pm=="office"){ | |||||
| pm = isOverNpgoReviseDeadline?"":pm; | |||||
| } | } | ||||
| if (actionValue == false && isOverReviseDeadline()) { | if (actionValue == false && isOverReviseDeadline()) { | ||||
| @@ -89,7 +89,7 @@ const FormPanel = ({ formData }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| else if(formData.creditor == false && paymentMethod == "") { | |||||
| else if(formData.creditor == false && pm == "") { | |||||
| setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| @@ -109,7 +109,7 @@ const FormPanel = ({ formData }) => { | |||||
| id: data.id, | id: data.id, | ||||
| action: actionValue, | action: actionValue, | ||||
| vaild: values.vaild, | vaild: values.vaild, | ||||
| paymentMethod: paymentMethod | |||||
| paymentMethod: pm | |||||
| }, | }, | ||||
| files: attachments ? attachments : [], | files: attachments ? attachments : [], | ||||
| onSuccess: function (responseData) { | onSuccess: function (responseData) { | ||||