Merge branch 'dev-20210702' of...

Merge branch 'dev-20210702' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

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

@@ -363,7 +363,7 @@
                         <el-radio :label="2">否</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="" prop="worthlessReason" >
+                <el-form-item label="" prop="worthlessReason" v-show="formData.valueFlag == 2">
                     <el-input type="textarea" v-model="formData.worthlessReason" placeholder="请输入低价值说明" maxlength="1000" :disabled="editorType== 2" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="其他备注" prop="otherRemark" >
@@ -625,10 +625,10 @@ export default {
                     { required: true, message: '请输入诊断建议', trigger: 'change' }
                 ],
                 worthlessReason: [{
-                  required: true, max: 1000, message: '必填项，最大长度 1000 个字符', trigger: 'change'
+                  required: true, min: 2, max: 1000, message: '必填项，支持2-1000个字符', trigger: 'change'
                 }],
                 otherRemark: [{
-                  required: true, max: 1000, message: '必填项，最大长度 1000 个字符', trigger: 'change'
+                  required: true, min: 2, max: 1000, message: '必填项，支持2-1000个字符', trigger: 'change'
                 }],
                 patInFlag: [{
                   required: true, message: '必填项'