Merge remote-tracking branch 'origin/master'

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

@@ -341,7 +341,7 @@ color: #333333;"
           </el-row>
         </el-form>
         <!--5--进度信息-->
-        <schedule-info />
+        <schedule-info :schedule-key="scheduleKey" />
         <!--6--就诊信息-->
         <div style="display: flex;margin-bottom: 20px;">
           <div class="tip-green" />
@@ -595,6 +595,8 @@ export default {
   },
   data() {
     return {
+      // 进度
+      scheduleKey: {},
       editCunt: {
         petProtect: 0
       },

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

@@ -338,7 +338,7 @@ color: #333333;"
           </el-row>
         </el-form>
         <!--5--进度信息-->
-        <schedule-info />
+        <schedule-info :schedule-key="scheduleKey" />
         <!--6--就诊信息-->
         <div style="display: flex;margin-bottom: 20px;">
           <div class="tip-green" />
@@ -874,6 +874,8 @@ export default {
   },
   data() {
     return {
+      // 进度
+      scheduleKey: {},
       checkItemOptions: [], // 项目选项列表 根据检查类型变化
       treatItemOptions: [], // 治疗项目选项列表
       checkManageBos: [], // 检查列表数据

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

@@ -5,7 +5,7 @@
     <div v-if="docList.length>0" class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
-        <div class="tip-green" />
+        <div class="tip-green"/>
         <div
           class="tip-content"
         >挂号信息
@@ -53,7 +53,7 @@
               </div>
             </div>
             <!--分割线-->
-            <div class="divider" />
+            <div class="divider"/>
             <!--卡片中间部分-->
             <div class="mid-bottom-framework">
               <div
@@ -111,7 +111,7 @@
             >
               <div class="detail" @click="doctorDetail(item.id)">
                 <div class="detail-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
+                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/>
                 </div>
                 <el-button
                   type="text"
@@ -121,14 +121,14 @@
               <!--给它传一个userId,一个类型和一个默认页数-->
               <div class="register" @click="registration(item.userId,'0',item)">
                 <div class="register-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')" />
+                  <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')"/>
                 </div>
                 <el-button type="text">挂号</el-button>
               </div>
               <!--给它传一个userId,一个类型和一个默认页数-->
               <div class="add" @click="registration(item.userId, '1',item)">
                 <div class="add-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
+                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/>
                 </div>
                 <el-button type="text">加号</el-button>
               </div>
@@ -140,7 +140,7 @@
     <div v-else class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
-        <div class="tip-green" />
+        <div class="tip-green"/>
         <div
           class="tip-content"
         >挂号信息
@@ -151,7 +151,7 @@
         <div style=" margin: 20px; height: 200px; border: 1px solid #d6d7d7;">
           <div style="margin-left:45%;margin-top: 5%;">
             <div style=" width:50px;height: 50px;">
-              <el-image :src="require('@/assets/register/zanwushuju.png')" />
+              <el-image :src="require('@/assets/register/zanwushuju.png')"/>
             </div>
             <div style="color: #b2b2b2">暂无数据</div>
           </div>

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

@@ -9,7 +9,7 @@
   >
     <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
       <el-form-item label="主治兽医：" prop="petNickname">
-        <el-input v-model="queryParams.mainDoctor"/>
+        <el-input v-model="queryParams.mainDoctor" />
       </el-form-item>
       <el-form-item label="是否首诊:" prop="petSex">
         <el-select
@@ -43,9 +43,9 @@
           <span>{{ parseTime(scope.row.workDate, '{y}/{m}/{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="时段" min-width="80" prop="hours" show-overflow-tooltip/>
-      <el-table-column align="center" label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip/>
-      <el-table-column align="center" label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip/>
+      <el-table-column align="center" label="时段" min-width="80" prop="hours" show-overflow-tooltip />
+      <el-table-column align="center" label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip />
+      <el-table-column align="center" label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip />
       <el-table-column
         align="center"
         label="门诊诊查费"
@@ -54,14 +54,15 @@
         show-overflow-tooltip
       />
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="160">
-        <template slot-scope="scope">
+        <template #default="{row}">
           <el-button
             icon="el-icon-document"
             plain
             size="mini"
+            :disabled="!inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1])"
             style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
             type="success"
-            @click="addReservation(scope.row)"
+            @click="addReservation(row)"
           >立即预约
           </el-button>
         </template>
@@ -83,6 +84,7 @@
 <script>
 import { addRegister, checkPet, timeRegister } from '@/api/business/register'
 import { parseTime } from '@/utils/ruoyi'
+import moment from 'moment'
 
 export default {
   name: 'RegisterModle',
@@ -146,6 +148,10 @@ export default {
       ]
     }
   },
+  created() {
+    // 获取当前时间
+    this.currentTime()
+  },
   watch: {
     doctorId(val) {
       console.log('KKKK555555555KKKKKKK', val)
@@ -153,6 +159,30 @@ export default {
     }
   },
   methods: {
+    /**
+     * 获取当前时间
+     */
+    currentTime() {
+      // TODO: 请清除该行输出
+      console.log(`这是我需要的当前时间：`, moment().format('YYYY/MM/DD HH:mm:ss'))
+    },
+    /**
+     * 判断当前时间是否在传入的时间范围中
+     * @param start 开始时间 时:分
+     * @param end 结束时间 时:分
+     */
+    inTimeRange(start, end) {
+      const current = moment()
+      const startTime = moment({hour: start.split(':')[0], minute: start.split(':')[1]})
+      const endTime = moment({hour: end.split(':')[0], minute: end.split(':')[1]})
+      // TODO: 请清除该行输出
+      console.log(`current`, current.format('YYYY/MM/DD HH:mm:ss'))
+      // TODO: 请清除该行输出
+      console.log(`startTime.format('YYYY/MM/DD HH:mm:ss')`, startTime.format('YYYY/MM/DD HH:mm:ss'))
+      // TODO: 请清除该行输出
+      console.log(`endTime.format('YYYY/MM/DD HH:mm:ss')`, endTime.format('YYYY/MM/DD HH:mm:ss'))
+      return current.isBetween(startTime, endTime, 'minute')
+    },
     parseTime,
     // 获取相应id的医生详情
     getRegisterMsg() {

src/views/service-management/registration-queue/components/schedule-info.vue

@@ -3,7 +3,7 @@
   <div class="schedule-info">
     <!--   1--tip样式-->
     <div class="progress-tip">
-      <div class="tip-green" />
+      <div class="tip-green"/>
       <div
         class="tip-content"
       >进度信息
@@ -13,7 +13,7 @@
     <div class="progress-base">
       <div class="display-base">
         <!-- 1--单个的背景,,后面按状态位切换样式-->
-        <div class="bkg-on">
+        <div :class="[scheduleKey.checkSchedule === '0'? 'bkg-on' : 'bkg-off']">
           <!--1.预约/现场挂号-->
           <div
             class="content-inner"
@@ -21,25 +21,23 @@
             <div
               class="avatar"
             >
-              <el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')" />
+              <el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')"/>
             </div>
             <div
               class="title"
             >1.预约/现场挂号
             </div>
-            <div
-              class="status-on"
-            >进行中
-            </div>
+            <div  class="status-on" v-if="scheduleKey.registrationTime!=null">{{ scheduleKey.registrationTime }}</div>
+            <div  class="status-off" v-else>暂未挂号</div>
           </div>
         </div>
         <!-- 箭头指示-->
         <div class="arrow">
-          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
+          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/>
         </div>
         <!-- 2--单个的背景,,后面按状态位切换样式-->
         <div
-          class="bkg-off"
+          :class="[scheduleKey.checkSchedule === '1'? 'bkg-on' : 'bkg-off']"
         >
           <!--2.录入诊断信息-->
           <div
@@ -48,69 +46,64 @@
             <div
               class="avatar"
             >
-              <el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')" />
+              <el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')"/>
             </div>
             <div
               class="title"
             >2.录入诊断信息
             </div>
-            <div
-              class="status-off"
-            >暂未录入
-            </div>
+            <div  class="status-on" v-if="scheduleKey.diagnosisTime!=null">{{ scheduleKey.diagnosisTime }}</div>
+            <div  class="status-off" v-else>暂未录入</div>
           </div>
         </div>
         <!-- 箭头指示-->
         <div class="arrow">
-          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
+          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/>
         </div>
         <!-- 3--单个的背景,,后面按状态位切换样式-->
         <div
-          class="bkg-off"
+          :class="[scheduleKey.checkSchedule === '2'? 'bkg-on' : 'bkg-off']"
         >
-          <!--3.开具处方单-->
+          <!--3.生成病例报告-->
           <div
             class="content-inner"
           >
             <div
               class="avatar"
             >
-              <el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')" />
+              <el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')"/>
             </div>
             <div
               class="title"
-            >3.开具处方单
-            </div>
-            <div
-              class="status-off"
-            >暂未开具
+            >3.生成病例报告
             </div>
+            <div  class="status-on" v-if="scheduleKey.reportTime!=null">{{ scheduleKey.reportTime }}</div>
+            <div  class="status-off" v-else>暂未生成</div>
           </div>
         </div>
         <!-- 箭头指示-->
         <div class="arrow">
-          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
+          <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/>
         </div>
         <!-- 4--单个的背景,,后面按状态位切换样式-->
         <div
-          class="bkg-off"
+          :class="[scheduleKey.checkSchedule === '3'? 'bkg-on' : 'bkg-off']"
         >
-          <!--4.生成病例报告-->
+          <!--4.开具处方单-->
           <div
             class="content-inner"
           >
             <div
               class="avatar"
             >
-              <el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')" />
+              <el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')"/>
             </div>
             <div
               class="title"
-            >4.生成病例报告
+            >4.开具处方单
             </div>
-            <div
-              class="status-off"
-            >暂未生成
+              <div  class="status-on" v-if="scheduleKey.recipelTime!=null">{{ scheduleKey.recipelTime }}</div>
+              <div  class="status-off" v-else>暂未开具</div>
             </div>
           </div>
         </div>
@@ -121,7 +114,15 @@
 
 <script>
 export default {
-  name: 'ScheduleInfo'
+  name: 'ScheduleInfo',
+  props: {
+    scheduleKey: {
+      type: Object
+    },
+    data() {
+      return {}
+    }
+  }
 }
 </script>
 
@@ -198,12 +199,14 @@ export default {
         font-weight: 400;
         color: #AFAFAF;
       }
+
       //头像
       .avatar {
         width: 44px;
         height: 44px;
         margin-bottom: 14px;
       }
+
       //标题
       .title {
         font-size: 14px;
@@ -212,6 +215,7 @@ export default {
         color: #333333;
         margin-bottom: 14px;
       }
+
       //预约/挂号
       .content-inner {
         display: flex;

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

@@ -209,7 +209,7 @@
 
     </el-form>
     <!--进度信息-->
-    <schedule-info/>
+    <schedule-info :schedule-key="scheduleKey"/>
     <!--    医生卡片-->
     <doctor-card @doctorDetail="handleDoctor" @registration="handleRegister"/>
     <!--    宠物选择弹框-->
@@ -228,8 +228,7 @@
     />
     <!--      选择宠物-->
     <div slot="footer" class="dialog-footer">
-      <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提 交</el-button>
-      <el-button class="resetBtn" icon="el-icon-back" @click="cancel">返 回</el-button>
+      <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
     </div>
   </div>
 </template>
@@ -255,6 +254,8 @@ export default {
   },
   data() {
     return {
+      // 进度
+      scheduleKey: { checkSchedule: '0' },
       // 宠物出生日期校验
       pickerOptions: {
         disabledDate(time) {
@@ -317,6 +318,34 @@ export default {
       showDoctorModle: false, // 医生详情弹出框
       showRegistrationModle: false, // 挂号详情弹出框
       rules: {
+        // 宠物昵称非空校验
+        petNickname: [
+          { required: true, message: '宠物昵称不能为空', trigger: 'change' }
+        ],
+        // 宠物性别非空校验
+        petSex: [
+          { required: true, message: '宠物性别不能为空', trigger: 'change' }
+        ],
+        // 宠物生日非空校验
+        petBirthday: [
+          { required: true, message: '宠物生日不能为空', trigger: 'change' }
+        ],
+        // 宠物体重非空校验
+        petWeight: [
+          { required: true, message: '宠物体重不能为空', trigger: 'change' }
+        ],
+        // 绝育情况非空校验
+        sterilizationStatus: [
+          { required: true, message: '绝育情况不能为空', trigger: 'change' }
+        ],
+        // 疫苗情况非空校验
+        vaccineSituation: [
+          { required: true, message: '疫苗情况不能为空', trigger: 'change' }
+        ],
+        // 保险情况非空校验
+        insure: [
+          { required: true, message: '保险情况不能为空', trigger: 'change' }
+        ],
         poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
           { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
           { pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
@@ -348,6 +377,10 @@ export default {
     this.getpesonlist()
   },
   methods: {
+    /** 返回跳转列表页 */
+    goBack() {
+      this.$router.push('/service-management/registration-queue')
+    },
     /** 根据手机号判断宠主是否存在，不存在新增宠主 回显宠主信息*/
     checkOwner() {
       checkPetOwner({ phone: this.form.masterPhone }).then(response => {
@@ -425,35 +458,28 @@ export default {
     closeDoctorModle() {
       this.showDoctorModle = false
     },
-    /** 挂号详情 */
-    handleRegister(params) {
-      console.log('params', params)
-      this.showRegistrationModle = true
-      this.doctorIdNd = params.id
-      this.registrationType = params.type
-      this.singleDoctor = params.data
-      this.test = { ...this.form }
-      this.choosePetTest = { ...this.chooseForm }
-      console.log('this.form', this.form)
-      console.log('this.form', this.chooseForm)
-    },
+
     /** 关闭挂号回调*/
     closeRegisterModle() {
       this.showRegistrationModle = false
     },
+    /** 提交按钮*/
     submitForm() {
-      console.log('表单参数', this.form)
+      console.log('这是提交按钮！')
+    },
+    /** 挂号详情 */
+    handleRegister(params) {
       this.$refs['from'].validate(valid => {
         if (valid) {
-          // addPosition(this.form).then(res => {
-          //   console.log('添加后的信息', res)
-          //   if (res.code === 200) {
-          //     this.$router.push({
-          //       path: '/administrative-management/position-management'
-          //     })
-          //     this.$message.success('操作成功')
-          //   }
-          // })
+          console.log('params', params)
+          this.showRegistrationModle = true
+          this.doctorIdNd = params.id
+          this.registrationType = params.type
+          this.singleDoctor = params.data
+          this.test = { ...this.form }
+          this.choosePetTest = { ...this.chooseForm }
+          console.log('this.form', this.form)
+          console.log('this.form', this.chooseForm)
         }
       })
     },

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

@@ -17,7 +17,7 @@ color: #333333;"
           <!--宠物头像-->
           <div style="display: flex">
             <!--   1-- 宠物基本信息的页面--标签头 -->
-            <div class="tip-green" />
+            <div class="tip-green"/>
             <div
               style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
             >宠物头像
@@ -28,14 +28,14 @@ color: #333333;"
             <div>
               <!--宠物图片-->
               <div class="petPicture" style="padding-bottom: 40px;">
-                <ImagePreview :height="150" :src="baseURL+detailInfo.petPicture" :width="150" />
+                <ImagePreview :height="150" :src="baseURL+detailInfo.petPicture" :width="150"/>
               </div>
             </div>
           </div>
           <!--基本信息-->
           <div style="display: flex">
             <!--   1-- 宠物基本信息的页面--标签头 -->
-            <div class="tip-green" />
+            <div class="tip-green"/>
             <div
               style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
             >宠物信息
@@ -50,19 +50,19 @@ color: #333333;"
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="宠物昵称">
-                      <el-input v-model="detailInfo.petNickname" disabled />
+                      <el-input v-model="detailInfo.petNickname" disabled/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <!--宠物ID-->
                     <el-form-item label="宠物ID">
-                      <el-input v-model="detailInfo.petsId" disabled />
+                      <el-input v-model="detailInfo.petsId" disabled/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <!--宠物品种-->
                     <el-form-item label="宠物品种">
-                      <el-input v-model="detailInfo.petBreed" disabled />
+                      <el-input v-model="detailInfo.petBreed" disabled/>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -92,14 +92,14 @@ color: #333333;"
                   <el-col :span="8">
                     <!--宠物年龄-->
                     <el-form-item label="宠物年龄">
-                      <el-input v-model="detailInfo.petAge" disabled />
+                      <el-input v-model="detailInfo.petAge" disabled/>
                       岁
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <!--宠物体重-->
                     <el-form-item label="宠物体重">
-                      <el-input v-model="detailInfo.petWeight" disabled />
+                      <el-input v-model="detailInfo.petWeight" disabled/>
                       kg
                     </el-form-item>
                   </el-col>
@@ -704,10 +704,7 @@ export default {
     },
     /** 返回跳转列表页 */
     goBack() {
-      // this.$router.back()
-      this.$router.push({
-        path: '/service-management/registration-queue'
-      })
+      this.$router.push('/service-management/registration-queue')
     },
     /** 获取宠物信息(传参传宠物表id)*/
     getInfo(id) {
@@ -839,4 +836,15 @@ export default {
     color: #333333 !important;
   }
 }
+
+//文本框样式
+::v-deep .el-textarea {
+  width: 90% !important;
+}
+.bottom-input-style{
+  //输入框样式
+  ::v-deep .el-input__inner{
+    width: 400% !important;
+  }
+}
 </style>

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

@@ -157,7 +157,7 @@
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
-            />
+            >录入诊断</el-button>
           </template>
         </el-table-column>
       </el-table>

vue.config.js

@@ -69,8 +69,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8091`,
-        target: `http://114.67.241.140:8091`,
+        target: `http://localhost:8091`,
+        // target: `http://114.67.241.140:8091`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''