Merge remote-tracking branch 'origin/dev5.3.1' into test

src/components/icss/AddIndeptLabel.vue

@@ -69,7 +69,7 @@
       this.isEditOrCopy = true
       this.editData = data;
       } else if(isCopy) {
-        this.txt = '独立标签维护-添加独立标签';
+        this.txt = '独立标签维护-复制独立标签';
         this.isEditOrCopy = true
         const copyData = JSON.parse(JSON.stringify(data))
         copyData.id = ""

src/components/icss/AddMedicalMultRelation.vue

@@ -33,7 +33,7 @@
             default-expand-all
             :expand-on-click-node="false">
             <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span class="custom-tree-node-name ellipsis" :title="node.label">{{ node.label }}</span>
+                <span class="custom-tree-node-name ellipsis" :class="{colorGray: data.isDeletedConcept == 'Y'}" :title="node.label">{{ node.label }}</span>
                 <span class="btn-box">
                   <el-button
                       class="btn-add fl"
@@ -376,5 +376,7 @@ import api from '@api/icss.js';
   display: inline-block;
   width: 270px;
 }
-  
+.colorGray {
+  color: #c1c1c1;
+} 
 </style>

src/components/icss/PubIndeptTag.vue

@@ -226,7 +226,7 @@
                 <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
                 <el-select
                         v-model="form.region7"
-                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
+                        :disabled="isEditOrCopy || !form.region1 || form.region2 == '99'"
                         @change="(e)=>readyChangeSelect(e,3)"
                 >
                     <el-option