|
|
@@ -78,7 +78,17 @@ const dbFullCode = {
|
|
|
_completeFullCode: function (b, index) {
|
|
|
for (let j = index-1; j >= 0; j--) {
|
|
|
if (this.dealBills[j].tag === -1) continue;
|
|
|
- if (this.dealBills[j].tag !== b.tag && this.dealBills[j].level < 4) {
|
|
|
+ if (this.dealBills[j].tag !== b.tag && this.dealBills[j].tag < 3 && this.dealBills[j].level < 4) {
|
|
|
+ b.full_code = this.dealBills[j].full_code + b.code;
|
|
|
+ b.level = this.dealBills[j].level + 1;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ _complete3FullCode: function(b, index) {
|
|
|
+ for (let j = index-1; j >= 0; j--) {
|
|
|
+ if (this.dealBills[j].tag === -1) continue;
|
|
|
+ if (this.dealBills[j].tag < 2 && this.dealBills[j].level < 4) {
|
|
|
b.full_code = this.dealBills[j].full_code + b.code;
|
|
|
b.level = this.dealBills[j].level + 1;
|
|
|
return;
|
|
|
@@ -86,7 +96,7 @@ const dbFullCode = {
|
|
|
}
|
|
|
},
|
|
|
change: function () {
|
|
|
- const regChar = /^-[a-zA-Z]$/, regNum = /^-[0-9]{1,2}$/, regCode = /^[0-9]{3,4}((-[0-9]{1,2})|(-[a-zA-Z]))*$/;
|
|
|
+ const regChar = /^-[a-zA-Z]$/, regNum = /^-[0-9]{1,2}$/, regCode = /^[0-9]{3,4}((-[0-9]{1,2})|(-[a-zA-Z]))*$/, regCharNum = /^-[a-zA-Z](-[0-9]{1,2})+$/;
|
|
|
let invalid = 0;
|
|
|
for (const [i, db] of this.dealBills.entries()) {
|
|
|
if (regCode.test(db.code)) {
|
|
|
@@ -99,6 +109,9 @@ const dbFullCode = {
|
|
|
} else if (regChar.test(db.code)) {
|
|
|
db.tag = 2;
|
|
|
this._completeFullCode(db, i);
|
|
|
+ } else if (regCharNum.test(db.code)) {
|
|
|
+ db.tag = 3;
|
|
|
+ this._complete3FullCode(db, i);
|
|
|
} else {
|
|
|
db.tag = -1;
|
|
|
db.full_code = '';
|