Merge branch 'feature/qiao' into 'release'

Feature/qiao

See merge request !280

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -963,26 +963,26 @@
   </div>
 </template>
 <script>
-  import uploadImg from '@/components/editor/upload-img';
-  import uploadMusic from '@/components/editor/upload-music';
   import {
-    TYPE_LIST,
-    PAY_LIST,
-    SOURCE_LIST,
-    STATUS_LIST,
-    CAR_LIST,
-    SEX_LIST,
-    RELATION_LIST,
-    D_S_LIST,
-    FOLLW_LIST,
-  } from '@/utils/constants';
-  import { getBirth } from '@/utils/index';
-  import {
-    getAdminDiagnose,
-    getDoctorList,
-    getDiagnoseLog,
-    diagnoseUpdate,
-  } from '@/api/diagnosis';
+diagnoseUpdate,
+getAdminDiagnose,
+getDiagnoseLog,
+getDoctorList,
+} from '@/api/diagnosis';
+import uploadImg from '@/components/editor/upload-img';
+import uploadMusic from '@/components/editor/upload-music';
+import {
+CAR_LIST,
+D_S_LIST,
+FOLLW_LIST,
+PAY_LIST,
+RELATION_LIST,
+SEX_LIST,
+SOURCE_LIST,
+STATUS_LIST,
+TYPE_LIST,
+} from '@/utils/constants';
+import { getBirth } from '@/utils/index';
 
   const PAY_TYPE = {
     1: '自动付款',
@@ -1519,4 +1519,9 @@
     }
   }
 }
+
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  color: #666;
+}
 </style>