Merge remote-tracking branch 'origin/master' into referMaster

src/components/cdssManage/plan/Plan.vue

@@ -61,7 +61,7 @@
             <el-button
               type="text"
               size="small"
-              :class="scope.row.hospitalId===-1&&codeArr.includes(scope.row.planCode) ? 'active-t': 'delete'"
+              :class="scope.row.hospitalId===-1&&codeArr.includes(scope.row.planCode) ? '': 'delete'"
               :disabled = 'scope.row.hospitalId===-1&&codeArr.includes(scope.row.planCode)'
               @click="enableOrAble(scope.row,0)"
               v-if="scope.row.planStatus === 1"
@@ -176,11 +176,9 @@ export default {
       const res = await api.getListBack()
          if(res.data.code === '0'){
             this.disablelist = res.data.data[60]
-            console.log('禁用2', this.codeArr);
             this.codeArr = this.disablelist.map(item => {
                 return item.val
             })
-            console.log('禁用2021', this.codeArr);
 
          }
     },
@@ -504,7 +502,7 @@ export default {
 }
 
 .el-table__row {
-  /deep/ .is-disabled,.el-button.is-disabled.is-plain {
+  .el-button.is-disabled {
     border-color: transparent !important;
   }
 }
@@ -518,8 +516,4 @@ export default {
     top: -2px;
   }
 }
-
-/deep/.el-button.is-disabled.active-t {
-  color: #dad7d7;
-}
 </style>