luolei %!s(int64=4) %!d(string=hai) anos
pai
achega
8657e5f059

+ 2 - 5
src/components/icss/AddMedicinePrompt.vue

@@ -336,8 +336,7 @@ export default {
       const name = newVal.name;
       const typeName = newVal.typeName;
       const type = newVal.type;
-      this.form.selectedTermName =
-        name + (typeName ? '(' + typeName + ')' : '');
+      this.form.selectedTermName = name + (typeName ? '(' + typeName + ')' : '');
       this.form.selectedTerm = name + (typeName ? '(' + typeName + ')' : '');
       this.form.name = name;
       this.form.fileList = [];
@@ -464,7 +463,6 @@ export default {
         });
         this.$refs.groups.validateField('titleChange');
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
-
         if (this.form.titleChange.trim() !== '') {
           // console.log('内容不为空');
           return true;
@@ -587,8 +585,7 @@ export default {
         paramsAll.clinicalPathwayName = types == 1 ? this.form.titleChange : '';
         paramsAll.id = this.conceptId;
         paramsAll.name = this.form.name;
-        paramsAll.noticeName =
-          types == 3 || types == 4 || types == 5 ? this.form.titleChange : '';
+        paramsAll.noticeName = types == 3 || types == 4 || types == 5 || types == 6 ? this.form.titleChange : '';
         paramsAll.type = this.form.typeId;
         paramsAll.details = tempArr;
         param = paramsAll;

+ 1 - 1
src/components/icss/disease/AddChemicalAndCommonMapping.vue

@@ -59,7 +59,7 @@
                     :key="item.icd10Code"
                     :label="item.name"
                     class="searchListNone"
-                    :value="item"
+                    :value="item.name"
                     :title="item.name"
                   ></el-option>
                 </el-select>

+ 7 - 4
src/less/admin.less

@@ -96,13 +96,16 @@
 .el-dropdown-menu__item:focus, .el-checkbox__input.is-checked+.el-checkbox__label,.el-dropdown-menu__item:not(.is-disabled):hover, .el-button--text, .el-date-table td.today span, .el-radio__input.is-checked + .el-radio__label, .el-pagination.is-background .el-pager li:not(.disabled):hover, .el-select-dropdown__item.selected {
   color: @adminBase;
 }
-.el-button--text.delete {
+.el-button--text.delete,.el-button--text.leaveBtn {
   color: red;
 }
-.el-select-dropdown__item.selected.searchListNone {
-  color: #606266;
-  font-weight: normal;
+.el-message-box__btns .el-button--default.leaveBtn {
+  color: @adminBase;
 }
+// .el-select-dropdown__item.selected.searchListNone {
+//   color: #606266;
+//   font-weight: normal;
+// }
 .el-button--text:focus, .el-button--text:hover, .el-date-table td.available:hover {
   color: @adminBase;
   opacity: .6;