禅道232和54

src/views/manager/wbsinfo/edit.vue

@@ -19,7 +19,6 @@
                 v-show="!filterText"
                 class="filter-tree"
                 lazy
-                :data="treeData"
                 :load="loadNode"
                 @node-click="getNodeDetail"
                 :props="defaultProps"
@@ -1493,7 +1492,7 @@ export default {
       curEleTable: {},
       editEleVisible: false,
       editEleList: [],
-      eleReg: /(-|>|<|≥|≤|±|【】)?([^-≥≤±【】]*)/,
+      eleReg: /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
 
       editEleFormulaVisible: false,
       formulaInput: '',
@@ -1542,6 +1541,7 @@ export default {
     paixuMD (data) {
       this.sortTag = true
       this.sortTag2 = true
+      this.curTreeData = data;
       this.findWbsTreeSameLevel(data.parentId)
     },
     bianhua () {
@@ -1559,7 +1559,7 @@ export default {
       if (res.code == 200) {
         this.sortTag = false
         this.sortTag2 = false
-        this.getLazytree()
+        this.updateTreeNewNode();
       }
     },
     async findWbsTreeSameLevel (parentId) {//查询当前节点的同级节点
@@ -1830,12 +1830,13 @@ export default {
     },
 
     updateTreeNewNode () {
-      getLazytree(this.id, this.nodeDetail.parentId).then((res) => {
-        let node = this.$refs.tree.getNode(this.nodeDetail.parentId);
+      let detail = (this.nodeDetail.parentId?this.nodeDetail:this.curTreeData);
+      getLazytree(this.id, detail.parentId).then((res) => {
+        let node = this.$refs.tree.getNode(detail.parentId);
         node.isLeaf = false;
         node.isLeafByUser = false;
         //console.log(node)
-        this.$refs.tree.updateKeyChildren(this.nodeDetail.parentId, res.data.data)
+        this.$refs.tree.updateKeyChildren(detail.parentId, res.data.data)
       })
     },
 
@@ -1858,8 +1859,8 @@ export default {
       selectFormElements(this.curEleTable.id).then((res) => {
         res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
-          // console.log(RegExp.$1)
-          // console.log(RegExp.$2)
+           //console.log(RegExp.$1)
+           //console.log(RegExp.$2)
           element.allow = RegExp.$1 ? RegExp.$1 : '';
           element.deviation = RegExp.$2 ? RegExp.$2 : '';
         })
@@ -2103,11 +2104,17 @@ export default {
           element.eType = Number(element.elementType);
           element.eAllowDeviation = element.elementAllowDeviation;
           element.eInspectionMethod = element.elementInspectionMethod;
-          this.eleReg.exec(element.eAllowDeviation);
-          // console.log(RegExp.$1)
-          // console.log(RegExp.$2)
-          element.allow = RegExp.$1 ? RegExp.$1 : '';
-          element.deviation = RegExp.$2 ? RegExp.$2 : '';
+          if(element.eAllowDeviation.indexOf(',')>0){
+            element.allow = '【】';
+            element.deviation = element.eAllowDeviation;
+          }else{
+            this.eleReg.exec(element.eAllowDeviation);
+            // console.log(RegExp.$1)
+            // console.log(RegExp.$2)
+            element.allow = RegExp.$1 ? RegExp.$1 : '';
+            element.deviation = RegExp.$2 ? RegExp.$2 : '';
+          }
+
         })
         this.eleForm.elementList = res.data.data;
         this.importVisible = false;