Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

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

@@ -251,7 +251,7 @@
                 <h1>接诊信息</h1>
                 <el-form-item label="接诊医生" prop="doctorName">
 <!--                    <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
-                    <el-select @change="doctorChanged($event)" filterable v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" :disabled="editorType== 2 || this.formData.status == 4">
+                    <el-select @change="doctorChanged($event)" filterable v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled>
                         <el-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorName" :value="item.doctorId"></el-option>
                     </el-select>
                 </el-form-item>
@@ -590,7 +590,6 @@ export default {
                     { required: true, message: '请选择证件类型', trigger: 'change' }
                 ],
                 idCard: [
-                    { required: true, message: '请输入证件号', trigger: 'blur' },
                     { min: 18,  message: '长度18个字符', trigger: 'blur' },
                     { pattern: /[0-9A-Za-z]{6,24}$/, message: '只能是数字或字母' }
                 ],