Przeglądaj źródła

1. 转换长编号调整
2. 变更后数量明细界面调整

MaiXinRong 4 dni temu
rodzic
commit
8079f8eb41
2 zmienionych plików z 16 dodań i 3 usunięć
  1. 15 2
      app/public/js/shares/db2full_code.js
  2. 1 1
      app/public/js/stage.js

+ 15 - 2
app/public/js/shares/db2full_code.js

@@ -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 = '';

+ 1 - 1
app/public/js/stage.js

@@ -3023,7 +3023,7 @@ $(document).ready(() => {
                 callback: function(key, opt, menu, e) {
                     const curBills = SpreadJsObj.getSelectObject(slSheet);
                     const curPos = SpreadJsObj.getSelectObject(spSheet);
-                    $('#tz2d-hint').html(`当前清单:${curBills.b_code || ''} ${curBills.name || ''} - [${curPos.name || ''}]`);
+                    $('#tz2d-hint').html(`当前清单:${curBills.b_code || ''} ${curBills.name || ''} - ${curPos.name || ''}`);
                     $('#tz2d-tz').html(`台账数量:${ curPos.quantity || 0}`);
                     $('#tz2d-qc').html(`变更数量:${ ZhCalc.sub(curPos.tz2_qty, curPos.quantity) || 0}`);
                     $('#tz2d-sum').html(`变更后数量:${ curPos.tz2_qty || 0}`);