bug fix

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

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

src/views/service-management/registration-queue/registration-detail.vue

@@ -99,15 +99,17 @@ color: #333333;"
                   <el-col :span="8">
                     <!--宠物年龄-->
                     <el-form-item label="宠物年龄">
-                      <el-input v-model="detailInfo.petAge" disabled />
-                      岁
+                      <el-input v-model="detailInfo.petAge" disabled>
+                        <template #suffix>岁</template>
+                      </el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <!--宠物体重-->
                     <el-form-item label="宠物体重">
-                      <el-input v-model="detailInfo.petWeight" disabled />
-                      kg
+                      <el-input v-model="detailInfo.petWeight" disabled>
+                        <template #suffix>kg</template>
+                      </el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -345,8 +347,9 @@ color: #333333;"
                   <el-col :span="8">
                     <!--门诊诊查费-->
                     <el-form-item label="门诊诊查费">
-                      <el-input v-model="detailInfo.payAmount" disabled />
-                      元
+                      <el-input v-model="detailInfo.payAmount" disabled>
+                        <template #suffix>元</template>
+                      </el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -419,7 +422,19 @@ color: #333333;"
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="主诉">
+                      <!-- 新学的第二种方法-->
+                      <el-form-item
+                        required
+                        label="主诉"
+                        prop="mainSuit"
+                        :rules="[{validator: (rules, value, callback) => {
+                          if (isEmpty(visitForm.mainSuit)) {
+                            callback(new Error('请输入患者主诉'))
+                          } else {
+                            callback()
+                          }
+                        }, trigger: 'blur'}]"
+                      >
                         <el-input
                           v-model="visitForm.mainSuit"
                           maxlength="400"
@@ -429,9 +444,20 @@ color: #333333;"
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="医嘱">
+                      <el-form-item
+                        label="医嘱"
+                        required
+                        prop="doctorAdvice"
+                        :rules="[{validator: (rules, value, callback) => {
+                          if (isEmpty(visitForm.doctorAdvice)) {
+                            callback(new Error('请输入医嘱'))
+                          } else {
+                            callback()
+                          }
+                        }, trigger: 'blur'}]"
+                      >
                         <el-input
-                          v-model="visitForm.doctorAdvice"
+                          v-model.trim="visitForm.doctorAdvice"
                           maxlength="200"
                           placeholder="请输入医嘱"
                           type="textarea"
@@ -439,8 +465,24 @@ color: #333333;"
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="诊断结果">
-                        <el-input v-model="visitForm.diagnosisResult" maxlength="30" placeholder="请输入诊断结果" />
+                      <el-form-item
+                        required
+                        label="诊断结果"
+                        prop="diagnosisResult"
+                        :rules="[{validator: (rules, value, callback) => {
+                          if (isEmpty(visitForm.diagnosisResult)) {
+                            callback(new Error('请输入诊断结果'))
+                          } else {
+                            callback()
+                          }
+                        }, trigger: 'blur'}]"
+                      >
+                        <el-input
+                          v-model.trim="visitForm.diagnosisResult"
+                          maxlength="30"
+                          placeholder="请输入诊断结果"
+                          style="width: 90% !important"
+                        />
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -481,7 +523,7 @@ color: #333333;"
 <script>
 // 导入获取宠物信息的接口
 import { checkRole } from '@/utils/permission'
-import { parseTime, selectDictLabel } from '@/utils/ruoyi'
+import { isEmpty, parseTime, selectDictLabel } from '@/utils/ruoyi'
 import { getRegister, inputDiagnosis, queryPrescribing } from '@/api/business/register'
 
 import scheduleInfo from '@/views/service-management/registration-queue/components/schedule-info'
@@ -635,6 +677,8 @@ export default {
     this.getInfo(this.$route.params.id)
   },
   methods: {
+    isEmpty,
+    Error: Error,
     prescribClose() {
       this.showPrescribing = false
     },
@@ -696,6 +740,7 @@ export default {
      * 开具处方
      */
     prescribing() {
+      this.$refs.form.validate().then(_ => {
         this.showPrescribing = true
         console.log('这是弹窗需要的父组件传的信息:', this.regiterForm)
         this.regiterForm['registId'] = this.regiterForm.id
@@ -709,6 +754,7 @@ export default {
           this.regiterForm['medicalRecordNo'] = response.data.medicalRecordNo
           this.regiterForm['medicalRecordId'] = response.data.id
         })
+      })
     },
     /**
      * 字典获取完成的回调

src/views/service-management/registration-queue/registration-queue.vue

@@ -151,7 +151,11 @@
           prop="hospitalDepartmentName"
           show-overflow-tooltip
         />
-        <el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip />
+        <el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip />
         <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
           <template slot-scope="scope">