Merge branch 'master' into dev

@@ -255,13 +255,13 @@
   }
   }
 }
 }
 
 
+.el-textarea.is-disabled .el-textarea__inner {
+  background-color: transparent !important;
+  color: #4a4a4a;
+}
+
 // 登簿日志弹出框
 // 登簿日志弹出框
 .commonDialog {
 .commonDialog {
-  .el-textarea.is-disabled .el-textarea__inner {
-    background-color: none !important;
-    color: #4a4a4a;
-  }
-
   .el-dialog__headerbtn .el-dialog__close {
   .el-dialog__headerbtn .el-dialog__close {
     font-size: 20px;
     font-size: 20px;
     color: #4162D8
     color: #4162D8
@@ -304,8 +304,6 @@
 
 
       .el-textarea.is-disabled .el-textarea__inner {
       .el-textarea.is-disabled .el-textarea__inner {
         @include borderColor("border");
         @include borderColor("border");
-        background-color: none !important;
-        color: #4a4a4a;
       }
       }
 
 
       .editXML {
       .editXML {

 import { Message } from "element-ui";
 import { Message } from "element-ui";
-export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
-
+export function removeTreeListItem (treeList, dictId, idName = 'dictid') {
   if (!treeList || !treeList.length) {
   if (!treeList || !treeList.length) {
     return
     return
   }
   }

@@ -287,6 +287,7 @@
         });
         });
       },
       },
       handleMinus (index, row) {
       handleMinus (index, row) {
+        console.log(this.tableData, row.dictid, 'dictid');
         removeTreeListItem(this.tableData, row.dictid, 'dictid');
         removeTreeListItem(this.tableData, row.dictid, 'dictid');
         this.tableData = judgeSort(this.tableData)
         this.tableData = judgeSort(this.tableData)
         this.key++;
         this.key++;