Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/ledger.js

@@ -561,7 +561,7 @@ $(document).ready(function() {
                         }
                     }
                 }
-                if (col.field === 'node_type' && newValue && newValue !== '0') {
+                if (col.field === 'node_type' && newValue && newValue !== '0' && newValue !== '19') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
                     console.log(newValue, sameNodeType);
                     if (sameNodeType) {

app/public/js/revise.js

@@ -521,7 +521,7 @@ $(document).ready(() => {
                         }
                     }
                 }
-                if (col.field === 'node_type' && newValue && newValue !== '0') {
+                if (col.field === 'node_type' && newValue && newValue !== '0' && newValue !== '19') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
                     if (sameNodeType) {
                         toastr.error('已存在该费用类别，请勿重复选择');