Merge remote-tracking branch 'origin/master'

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

@@ -120,14 +120,46 @@
       >
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
-        <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip />
-        <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip />
-        <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip />
-        <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip />
-        <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip />
-        <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip />
-        <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip />
-        <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip />
+        <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.medicalRecordNo || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petsId || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnerPhone || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.hospitalName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.doctorName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.hospitalDepartmentName || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>

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

@@ -146,11 +146,11 @@ export default {
       fristVisitOptions: [
         {
           label: '是',
-          value: '1'
+          value: '0'
         },
         {
           label: '否',
-          value: '0'
+          value: '1'
         }
       ]
     }

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

@@ -26,12 +26,22 @@
       <el-row :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠物ID:" prop="petsId">
-            <el-input v-model="form.petsId" :placeholder="isEdit? '请输入宠物ID' : '暂无数据'" :disabled="true" maxlength="20" />
+            <el-input
+              v-model="form.petsId"
+              :placeholder="isEdit? '请输入宠物ID' : '暂无数据'"
+              :disabled="true"
+              maxlength="20"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物昵称:" prop="petNickname">
-            <el-input v-model.trim="form.petNickname" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'" />
+            <el-input
+              v-model.trim="form.petNickname"
+              :disabled="!isEdit"
+              maxlength="10"
+              :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -105,14 +115,24 @@
         <el-col :span="8">
           <!--宠物体重-->
           <el-form-item label="宠物体重" prop="petWeight">
-            <el-input v-model.trim="form.petWeight" :placeholder="isEdit? '请输入宠物体重' : '暂无数据'" maxlength="10" :disabled="!isEdit">
+            <el-input
+              v-model.trim="form.petWeight"
+              :placeholder="isEdit? '请输入宠物体重' : '暂无数据'"
+              maxlength="10"
+              :disabled="!isEdit"
+            >
               <template #suffix>kg</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物毛色:" prop="petColor">
-            <el-input v-model.trim="form.petColor" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'" />
+            <el-input
+              v-model.trim="form.petColor"
+              :disabled="!isEdit"
+              maxlength="10"
+              :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -178,7 +198,13 @@
       <el-row v-if="isEdit && !showPetInfo" :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠主手机号:" prop="masterPhone">
-            <el-input v-model.trim="form.masterPhone" :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'" :disabled="!isEdit" maxlength="11" @blur="checkOwner" />
+            <el-input
+              v-model.trim="form.masterPhone"
+              :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'"
+              :disabled="!isEdit"
+              maxlength="11"
+              @blur="checkOwner"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -547,6 +573,7 @@ export default {
           this.doctorIdNd = params.data.userId
           console.log('超级超级超级超级重要！！！', this.doctorIdNd)
           this.registrationType = params.type
+          console.log('这是我从新增挂号页面赋值的挂号类型!!!!', this.registrationType)
           this.singleDoctor = params.data
           this.currentPage = params.cur
           this.test = { ...this.form }
@@ -654,12 +681,13 @@ export default {
 .registration-add-module {
   .el-form-item.petBreed {
     .el-form-item.el-form-item--small {
-      margin-right: 0!important;
-      margin-bottom: 0!important;
+      margin-right: 0 !important;
+      margin-bottom: 0 !important;
 
       .el-form-item__content {
         display: flex;
-        .petChildBreed{
+
+        .petChildBreed {
           margin-left: 5px;
         }
       }

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

@@ -131,14 +131,26 @@
             <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip />
+        <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
           </template>
         </el-table-column>
-        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip />
-        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip />
+        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnersName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnersPhone || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
@@ -157,7 +169,11 @@
             <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="70" prop="firstVisit" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.firstVisit || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>