取值问题

app/lib/stage_im.js

@@ -10,6 +10,7 @@
 
 const Ledger = require('./ledger');
 const imType = require('../const/tender').imType;
+const mergeChar = ';';
 
 class StageIm {
     constructor (ctx) {
@@ -166,9 +167,9 @@ class StageIm {
             const subPeg2 = this._getNodeByLevel(node, peg.level + 2);
             let result = peg.name;
             if (subPeg1 && subPeg1.id !== peg.id && subPeg1.id !== node.id) {
-                result = result + '-' + subPeg1.name;
+                result = result + mergeChar + subPeg1.name;
                 if (subPeg2 && subPeg2.id !== subPeg1.id && subPeg2.id !== node.id) {
-                    result = result + '-' + subPeg2.name;
+                    result = result + mergeChar + subPeg2.name;
                 }
             }
             return result;
@@ -179,7 +180,7 @@ class StageIm {
                 let parent = this.billsTree.getParent(node), result = parent.name;
                 while (parent.level > 3 && parent) {
                     parent = this._getNodeByLevel(node, parent.level - 1);
-                    result = parent.name + '-' + result;
+                    result = parent.name + mergeChar + result;
                 }
                 return result;
             } else {
@@ -192,7 +193,7 @@ class StageIm {
             const subPeg1 = this._getNodeByLevel(node, peg.level + 1);
             let result = peg.name;
             if (subPeg1 && subPeg1.id !== peg.id) {
-                result = result + '-' + subPeg1.name;
+                result = result + mergeChar + subPeg1.name;
             }
             return result;
         } else {
@@ -202,7 +203,7 @@ class StageIm {
                 let parent = node, result = parent.name;
                 while (parent.level > 3 && parent) {
                     parent = this._getNodeByLevel(node, parent.level - 1);
-                    result = parent.name + '-' + result;
+                    result = parent.name + mergeChar + result;
                 }
                 return result;
             }

app/public/js/gcl_gather.js

@@ -38,6 +38,7 @@ const gclGatherModel = (function () {
     let deal = [];
 
     const gclList = [], leafXmjs = [];
+    const mergeChar = ';';
 
 
 
@@ -201,7 +202,7 @@ const gclGatherModel = (function () {
                 let value = '';
                 for (let level = 4; level < xmj.level; level++) {
                     const node = getNodeByLevel(xmj, level);
-                    value = value === '' ? node.name : node.name + '-' + value;
+                    value = value === '' ? node.name : value + mergeChar + node.name;
                 }
                 return value;
             } else {
@@ -212,7 +213,7 @@ const gclGatherModel = (function () {
                 let value = '';
                 for (let level = peg.level + 2; level < xmj.level; level++) {
                     const node = getNodeByLevel(xmj, level);
-                    value = value === '' ? node.name : node.name + '-' + value;
+                    value = value === '' ? node.name : value + mergeChar + node.name;
                 }
                 return value;
             } else {

app/public/js/stage_im.js

@@ -11,6 +11,7 @@
 const stageIm = (function () {
     const imFields = ['uuid', 'doc_code', 'peg', 'bw', 'xm', 'drawing_code', 'calc_memo', 'calc_img'];
     const splitChar = '-';
+    const mergeChar = ';';
     let stage, imType, details, changes, ImData, pre;
     const gsTreeSetting = {
         id: 'ledger_id',
@@ -123,14 +124,14 @@ const stageIm = (function () {
     function getFbfx (node, pegNode) {
         if (pegNode) {
             const subPegNode = getNodeByLevel(node, pegNode.level + 1);
-            return subPegNode.id === pegNode.id ? pegNode.name : pegNode.name + '-' + subPegNode.name;
+            return subPegNode.id === pegNode.id ? pegNode.name : pegNode.name + ';' + subPegNode.name;
         } else {
             if (node.level < 3) {
                 return node.name;
             } else {
                 const l3Node = getNodeByLevel(node, 3);
                 const l4Node = getNodeByLevel(node, 4);
-                return l3Node.id === l4Node.id ? l3Node.name : l3Node.name + '-' + l4Node.name;
+                return l3Node.id === l4Node.id ? l3Node.name : l3Node.name + ';' + l4Node.name;
             }
         }
         return node.name;
@@ -196,9 +197,9 @@ const stageIm = (function () {
             const subPeg2 = getNodeByLevel(node, peg.level + 2);
             let result = peg.name;
             if (subPeg1 && subPeg1.id !== peg.id && subPeg1.id !== node.id) {
-                result = result + '-' + subPeg1.name;
+                result = result + mergeChar + subPeg1.name;
                 if (subPeg2 && subPeg2.id !== subPeg1.id && subPeg2.id !== node.id) {
-                    result = result + '-' + subPeg2.name;
+                    result = result + mergeChar + subPeg2.name;
                 }
             }
             return result;
@@ -209,7 +210,7 @@ const stageIm = (function () {
                 let parent = gsTree.getParent(node), result = parent.name;
                 while (parent.level > 3 && parent) {
                     parent = getNodeByLevel(node, parent.level - 1);
-                    result = parent.name + '-' + result;
+                    result = parent.name + mergeChar + result;
                 }
                 return result;
             } else {