Commit 3ad2d266793b2f7dd181842527cc8d402a8858c9
1 parent
9cdf2fa5
1.五彩：票据校验去掉银行
Showing
4 changed files
with
4 additions
and
4 deletions
src/components/Common/CommonBillEvent.js
| @@ -2484,7 +2484,7 @@ export default (ChildComponent) => { | @@ -2484,7 +2484,7 @@ export default (ChildComponent) => { | ||
| 2484 | } | 2484 | } |
| 2485 | } | 2485 | } |
| 2486 | if (masterData.sSettlementId === 'bill') { | 2486 | if (masterData.sSettlementId === 'bill') { |
| 2487 | - if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sInvoiceNo)) { | 2487 | + if (commonUtils.isEmptyStr(masterData.sInvoiceNo)) { |
| 2488 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ | 2488 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ |
| 2489 | flag = false; | 2489 | flag = false; |
| 2490 | } | 2490 | } |
src/components/Common/CommonGroupBillEvent.js
| @@ -1498,7 +1498,7 @@ export default (ChildComponent) => { | @@ -1498,7 +1498,7 @@ export default (ChildComponent) => { | ||
| 1498 | } | 1498 | } |
| 1499 | } | 1499 | } |
| 1500 | if (masterData.sSettlementId === 'bill') { | 1500 | if (masterData.sSettlementId === 'bill') { |
| 1501 | - if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sInvoiceNo)) { | 1501 | + if (commonUtils.isEmptyStr(masterData.sInvoiceNo)) { |
| 1502 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ | 1502 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ |
| 1503 | flag = false; | 1503 | flag = false; |
| 1504 | } | 1504 | } |
src/components/Common/CommonNewBillEvent.js
| @@ -1925,7 +1925,7 @@ export default ChildComponent => { | @@ -1925,7 +1925,7 @@ export default ChildComponent => { | ||
| 1925 | } | 1925 | } |
| 1926 | } | 1926 | } |
| 1927 | if (masterData.sSettlementId === "bill") { | 1927 | if (masterData.sSettlementId === "bill") { |
| 1928 | - if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sInvoiceNo)) { | 1928 | + if (commonUtils.isEmptyStr(masterData.sInvoiceNo)) { |
| 1929 | message.error(commonFunc.showMessage(app.commonConst, "requiredsInvoiceNo")); /* 收/付款条件为票据时，银行、票据号码为必填项 */ | 1929 | message.error(commonFunc.showMessage(app.commonConst, "requiredsInvoiceNo")); /* 收/付款条件为票据时，银行、票据号码为必填项 */ |
| 1930 | flag = false; | 1930 | flag = false; |
| 1931 | } | 1931 | } |
src/components/Common/CommonSubBillEvent.js
| @@ -2270,7 +2270,7 @@ export default (ChildComponent) => { | @@ -2270,7 +2270,7 @@ export default (ChildComponent) => { | ||
| 2270 | } | 2270 | } |
| 2271 | } | 2271 | } |
| 2272 | if (masterData.sSettlementId === 'bill') { | 2272 | if (masterData.sSettlementId === 'bill') { |
| 2273 | - if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sInvoiceNo)) { | 2273 | + if (commonUtils.isEmptyStr(masterData.sInvoiceNo)) { |
| 2274 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ | 2274 | message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */ |
| 2275 | flag = false; | 2275 | flag = false; |
| 2276 | } | 2276 | } |