Merge remote-tracking branch 'origin/master'

src/views/medical-record-management/medical-edit.vue

@@ -144,7 +144,7 @@ color: #333333;"
               <el-form-item v-if="!isEdit" label="宠物年龄" prop="petAge">
                 <el-input v-model="detailInfo.petAge" :placeholder="isEdit? '请输入宠物年龄' : '-'" disabled/>
               </el-form-item>
-              <el-form-item v-else label="宠物生日:" prop="petBirthday">
+              <el-form-item v-else label="宠物生日" prop="petBirthday">
                 <el-date-picker
                   v-model="detailInfo.petBirthday"
                   :disabled="!isEdit"

src/views/service-management/registration-queue/components/doctor-card.vue

@@ -192,7 +192,7 @@ border: 1px solid #E5E5E5;
 font-family: Microsoft YaHei-Regular, Microsoft YaHei;
 font-weight: 400;
 color: #AFAFAF;"
-            >-
+            >暂无数据
             </div>
           </div>
         </div>

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -61,7 +61,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="诊断日期" prop="visitDate">
-            <el-input v-model="registerForm.diagnosisTime" placeholder="-" :disabled="true" maxlength="20" />
+            <el-input  v-model="formattedDiagnosisTime"  placeholder="-" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -342,6 +342,7 @@ import { drugList, getTreatOptions, listByType } from '@/api/business/mdeicalRec
 import { mapGetters } from 'vuex'
 import { submitPrescribing } from '@/api/business/registration'
 
+import moment from 'moment'
 export default {
   name: 'PrescribingModle',
   // 数据字典
@@ -449,6 +450,10 @@ export default {
   },
 
   computed: {
+    /* 诊断日期格式化 */
+    formattedDiagnosisTime() {
+      return moment(this.registerForm.diagnosisTime).format('YYYY/MM/DD')
+    },
     ...mapGetters(['deptId', 'name']),
     cItemOptions() {
       return (checkType) => {