Merge remote-tracking branch 'origin/master'

.env.development

 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统
 
 # 开发环境配置
 ENV = 'development'

.env.edit

 # 开发使用的环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统
 
 # 生产环境配置
 ENV = 'edit'

.env.production

 # 演示环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统
 
 # 生产环境配置
 ENV = 'production'

.env.staging

 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统
 
 NODE_ENV = production
 

.env.test

 # 测试环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统
 
 # 生产环境配置
 ENV = 'test'

src/api/business/mdeicalRecord.js

@@ -118,7 +118,7 @@ export function addDrug(data) {
 // 删除药品
 export function deleteDrug(id) {
   return request({
-    url: '/finance/stock/outbound/{id}' + id,
+    url: '/finance/stock/outbound/' + id,
     method: 'delete'
   })
 }

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

@@ -148,6 +148,11 @@
             <span>{{ scope.row.ownerName || '-' }}</span>
           </template>
         </el-table-column>
+        <el-table-column align="left" label="宠主ID" prop="ownersId" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.ownersId || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="left" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row.petOwnerPhone || '-' }}</span>

src/views/service-management/hospitalization-management/hospitalization-management.vue

@@ -204,8 +204,8 @@
             @click="handleDetails(scope.row)"
           >详情</el-button>
           <el-button
-            v-hasPermi="['business:hospital:edit']"
             v-if="scope.row.status==='2' || scope.row.status==='0'"
+            v-hasPermi="['business:hospital:edit']"
             icon="el-icon-paperclip"
             plain
             size="mini"
@@ -223,8 +223,8 @@
             :disabled="true"
           >办理入院</el-button>
           <el-button
-            v-hasPermi="['business:hospital:edit']"
             v-else-if="scope.row.status==='3'"
+            v-hasPermi="['business:hospital:edit']"
             icon="el-icon-paperclip"
             plain
             size="mini"

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

@@ -186,15 +186,15 @@
         <span class="title-text" style="font-size: 16px;font-weight: bold;">检查进度</span>
       </div>
       <!-- 步骤条 -->
-<!--      <div>-->
-<!--        <el-steps :active="schedule" align-center>-->
-<!--          <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />-->
-<!--          <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />-->
-<!--          <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />-->
-<!--          <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />-->
-<!--        </el-steps>-->
-<!--      </div>-->
-      <CheckSchedule :scheduleKey="scheduleKey" />
+      <!--      <div>-->
+      <!--        <el-steps :active="schedule" align-center>-->
+      <!--          <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />-->
+      <!--          <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />-->
+      <!--          <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />-->
+      <!--          <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />-->
+      <!--        </el-steps>-->
+      <!--      </div>-->
+      <CheckSchedule :schedule-key="scheduleKey" />
       <!-- 缴费信息 -->
       <div class="title-paragraph">
         <span class="title-text" style="font-size: 16px;font-weight: bold;">缴费信息</span>
@@ -346,7 +346,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="影像报告" label-width="84px">
-<!--              <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
+              <!--              <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
               <span v-if="checkDetail.shadowReport === null || checkDetail.shadowReport === ''">{{ '暂未上传' }}</span>
               <el-link
                 v-else

src/views/service-management/medical-record-management/check-schedule.vue

@@ -2,13 +2,13 @@
   <!--进度信息模块封装-->
   <div class="schedule-info">
     <!--   1--tip样式-->
-<!--    <div class="progress-tip">-->
-<!--      <div class="tip-green" />-->
-<!--      <div-->
-<!--        class="tip-content"-->
-<!--      >进度信息-->
-<!--      </div>-->
-<!--    </div>-->
+    <!--    <div class="progress-tip">-->
+    <!--      <div class="tip-green" />-->
+    <!--      <div-->
+    <!--        class="tip-content"-->
+    <!--      >进度信息-->
+    <!--      </div>-->
+    <!--    </div>-->
     <!--   2--内容样式-->
     <div class="progress-base">
       <div class="display-base">

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -19,6 +19,7 @@
           placeholder="请输入宠物ID"
           @keyup.enter.native="handleQuery"
           @blur="handleQuery"
+          @clear="handleQuery"
         />
       </el-form-item>
       <div class="basicInformation">
@@ -31,6 +32,7 @@
           placeholder="请输入宠主姓名"
           @keyup.enter.native="handleQuery"
           @blur="handleQuery"
+          @clear="handleQuery"
         />
       </el-form-item>
       <el-form-item prop="phone" label="手机号">
@@ -41,6 +43,7 @@
           @keyup.enter.native="handleQuery"
           @blur="handleQuery"
           @input="handleInput"
+          @clear="handleQuery"
         />
       </el-form-item>
     </el-form>
@@ -109,6 +112,7 @@
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
+      :pageSizes="[6,20,50]"
       @pagination="getList"
     />
     <div slot="footer" class="dialog-footer">
@@ -166,7 +170,7 @@ export default {
       queryParams: {
         // 导出列表
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 6,
         petCode: '',
         ownerName: '',
         phone: '',
@@ -286,6 +290,8 @@ export default {
           this.total = response.total
           this.loading = false
         })
+      } else {
+        this.petsList = []
       }
     }
   }

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

@@ -56,19 +56,18 @@
             <div class="divider" />
             <!--卡片中间部分-->
             <div class="mid-bottom-framework">
-              <!--              <div-->
-              <!--                v-for="(pic,picIndex) in item.pictureUrl"-->
-              <!--                :key="`picIndex${picIndex}`"-->
-              <!--                class="mid-bottom"-->
-              <!--              >-->
-              <!--                <el-image-->
-              <!--                  :src="baseURL+pic"-->
-              <!--                  class="mid-bottom-inner"-->
-              <!--                  fit="cover"-->
-              <!--                />-->
-              <!--              </div>-->
-              <!--              <div v-if="item.pictureUrl && item.pictureUrl.length === 0" class="mid-bottom-nobody">-->
-              <div class="mid-bottom-nobody">
+              <div
+                v-for="(pic,picIndex) in item.pictureUrl"
+                :key="`picIndex${picIndex}`"
+                class="mid-bottom"
+              >
+                <el-image
+                  :src="baseURL+pic"
+                  class="mid-bottom-inner"
+                  fit="cover"
+                />
+              </div>
+              <div v-if="item.pictureUrl && item.pictureUrl.length === 0" class="mid-bottom-nobody">
                 当前时段暂无等候中...
               </div>
             </div>
@@ -201,10 +200,6 @@ export default {
     /** 获取当日值班医生列表*/
     this.getDoctorList()
   },
-  created() {
-    /** 获取宠物信息 */
-    this.getDoctorList()
-  },
   methods: {
     /** 获取当日值班医生列表*/
     getDoctorList() {

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

@@ -54,7 +54,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item prop="name" label="门诊诊查费">
+          <el-form-item prop="name" label="门诊诊察费">
             <div style="display: flex;">
               <el-input v-model="doctorForm.examinationFee" :disabled="true" maxlength="20" />
               <div style="margin-left: 10px;">元</div>

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

@@ -49,7 +49,7 @@
       <el-table-column label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip />
       <el-table-column label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip />
       <el-table-column
-        label="门诊诊查费"
+        label="门诊诊察费"
         min-width="80"
         prop="fees"
         show-overflow-tooltip
@@ -146,11 +146,11 @@ export default {
       },
       fristVisitOptions: [
         {
-          label: '是',
+          label: '首诊',
           value: '0'
         },
         {
-          label: '否',
+          label: '复诊',
           value: '1'
         }
       ]
@@ -158,7 +158,6 @@ export default {
   },
   watch: {
     doctorId(val) {
-      console.log('KKKK555555555KKKKKKK', val)
       this.getRegisterMsg()
     }
   },

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

@@ -30,7 +30,7 @@
             <div v-if="scheduleKey.registrationTime!=null" class="status-on">
               {{ parseTime(scheduleKey.registrationTime, '{y}/{m}/{d} {h}:{i}') }}
             </div>
-            <div v-else class="status-off">暂未挂号</div>
+            <div v-else class="status-off">进行中</div>
           </div>
         </div>
         <!-- 箭头指示-->

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

@@ -403,7 +403,11 @@ export default {
       rules: {
         // 宠物昵称非空校验
         petNickname: [
-          { required: true, message: '请输入宠物昵称', trigger: 'blur' }
+          { required: true, message: '请输入宠物昵称', trigger: 'blur' },
+          { pattern: /^[a-zA-Z0-9\u4e00-\u9fa5]+$/, message: '仅支持中英文数字', trigger: 'blur' }
+        ],
+        petColor: [
+          { pattern: /^[\u4e00-\u9fa5a-zA-Z]+$/, message: '仅支持中英文', trigger: 'blur' }
         ],
         // 宠物性别非空校验
         petSex: [
@@ -424,7 +428,7 @@ export default {
         // 宠物体重非空校验
         petWeight: [
           { required: true, message: '请输入宠物体重', trigger: 'change' },
-          { pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '请输入整数和小数（只保留小数点后两位）', trigger: 'blur' }
+          { pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '仅支持数字、小数点（保留两位小数）', trigger: 'blur' }
         ],
         // 绝育情况非空校验
         sterilizationStatus: [

src/views/service-management/treatment-management/treatment-detail.vue

@@ -186,14 +186,14 @@
         <span class="title-text" style="font-size: 16px;font-weight: bold;">治疗进度</span>
       </div>
       <!-- 步骤条 -->
-<!--      <div>-->
-<!--        <el-steps :active="schedule" align-center>-->
-<!--          <el-step title="开具处方单" :description="createTime" />-->
-<!--          <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />-->
-<!--          <el-step title="分配诊室" :description="checkDetail.consultRoomTime || '暂未预约'" />-->
-<!--          <el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />-->
-<!--        </el-steps>-->
-<!--      </div>-->
+      <!--      <div>-->
+      <!--        <el-steps :active="schedule" align-center>-->
+      <!--          <el-step title="开具处方单" :description="createTime" />-->
+      <!--          <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />-->
+      <!--          <el-step title="分配诊室" :description="checkDetail.consultRoomTime || '暂未预约'" />-->
+      <!--          <el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />-->
+      <!--        </el-steps>-->
+      <!--      </div>-->
       <TreatmentSchedule :schedule-key="scheduleKey" />
       <!-- 缴费信息 -->
       <div class="title-paragraph">
@@ -334,7 +334,7 @@
             <el-col :span="8">
               <el-form-item label="治疗日志">
                 <span v-if="checkDetail.shadowReport===''||checkDetail.shadowReport===null">{{ '暂未上传' }}</span>
-<!--                <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
+                <!--                <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
                 <el-link
                   v-else
                   :href="`${baseUrl}${checkDetail.shadowReport}`"
@@ -426,7 +426,7 @@
         </el-table-column>
         <el-table-column align="left" label="治疗时长">
           <template slot-scope="scope">
-            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
+            <span>{{ minutesToHours(scope.row.duration)|| '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="userName" align="left" label="治疗负责人">
@@ -737,6 +737,11 @@ export default {
     this.getUserNameList()
   },
   methods: {
+    minutesToHours(minutes) {
+      var hours = Math.floor(minutes / 60) // 计算小时数
+      var remainingMinutes = minutes % 60 // 计算剩余的分钟数
+      return hours + '.' + remainingMinutes + 'h'
+    },
     // 计算结束时间
     calculateEndTime() {
       if (this.reservationForm.startTime.length === 2 && this.reservationForm.duration) {

src/views/service-management/treatment-management/treatment-management.vue

@@ -289,7 +289,7 @@
         </el-table-column>
         <el-table-column align="left" label="治疗时长">
           <template slot-scope="scope">
-            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
+            <span>{{ minutesToHours(scope.row.duration) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="userName" align="left" label="治疗负责人">
@@ -574,6 +574,11 @@ export default {
     // this.getTreatmentDropdown()
   },
   methods: {
+    minutesToHours(minutes) {
+      var hours = Math.floor(minutes / 60) // 计算小时数
+      var remainingMinutes = minutes % 60 // 计算剩余的分钟数
+      return hours + '.' + remainingMinutes + 'h'
+    },
     sTimeValid(rule, value, callback) {
       if (this.startTime.length === 0) {
         callback(new Error('请选择开始时间'))

src/views/service-management/treatment-management/treatment-schedule.vue

@@ -2,13 +2,13 @@
   <!--进度信息模块封装-->
   <div class="schedule-info">
     <!--   1--tip样式-->
-<!--    <div class="progress-tip">-->
-<!--      <div class="tip-green" />-->
-<!--      <div-->
-<!--        class="tip-content"-->
-<!--      >进度信息-->
-<!--      </div>-->
-<!--    </div>-->
+    <!--    <div class="progress-tip">-->
+    <!--      <div class="tip-green" />-->
+    <!--      <div-->
+    <!--        class="tip-content"-->
+    <!--      >进度信息-->
+    <!--      </div>-->
+    <!--    </div>-->
     <!--   2--内容样式-->
     <div class="progress-base">
       <div class="display-base">

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '萌宠医院信息管理平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '百邦萌宠医院管理系统' // 网页标题
 
 const port = 1099 // 端口