Merge remote-tracking branch 'origin/master'

44e3a905 · 高滢 · 47229f0e · 9ae9c095 · 44e3a905 · 44e3a905
Commit 44e3a905 authored Aug 15, 2023 by 高滢
22 changed files
--- a/.env.development
+++ b/.env.development
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统

 # 开发环境配置
 ENV = 'development'

--- a/.env.edit
+++ b/.env.edit
 # 开发使用的环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统

 # 生产环境配置
 ENV = 'edit'

--- a/.env.production
+++ b/.env.production
 # 演示环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统

 # 生产环境配置
 ENV = 'production'

--- a/.env.staging
+++ b/.env.staging
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统

 NODE_ENV = production


--- a/.env.test
+++ b/.env.test
 # 测试环境配置文件
 # 页面标题
-VUE_APP_TITLE = 萌宠医院信息管理平台
+VUE_APP_TITLE = 百邦萌宠医院管理系统

 # 生产环境配置
 ENV = 'test'

--- a/src/views/equipment-management/equipment-management/equipment-add.vue
+++ b/src/views/equipment-management/equipment-management/equipment-add.vue
@@ -365,11 +365,11 @@ export default {
      rules: {
        deviceName: [
          { required: true, message: '请输入设备名称', trigger: 'blur' },
-          { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
        ],

        head: [
-          { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
        ],
        phone: [
          {

--- a/src/views/equipment-management/equipment-management/equipment-detail.vue
+++ b/src/views/equipment-management/equipment-management/equipment-detail.vue
@@ -699,11 +699,11 @@ export default {
      rules: {
        deviceName: [
          { required: true, message: '请输入设备名称', trigger: 'blur' },
-          { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
        ],

        head: [
-          { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
        ],
        phone: [
          {
@@ -795,21 +795,6 @@ export default {
      serviceAreaS: [],
      // 检查项目下拉框
      checkItemOptions: [],
-
-      serviceAreaList: [
-        {
-          value: '1',
-          label: '天津市-天津市-和平区'
-        },
-        {
-          value: '2',
-          label: '北京市-北京市-大兴区'
-        },
-        {
-          value: '3',
-          label: '河北省-张家口市-阳原县'
-        }
-      ],
      serviceArea: [],
      // 可用时段
      useTime: {

--- a/src/views/medical-record-management/medical-edit.vue
+++ b/src/views/medical-record-management/medical-edit.vue
--- a/src/views/medical-record-management/medical-record-management.vue
+++ b/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>

--- a/src/views/service-management/hospitalization-management/hospitalization-management.vue
+++ b/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"

--- a/src/views/service-management/medical-record-management/check-detail.vue
+++ b/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

--- a/src/views/service-management/medical-record-management/check-schedule.vue
+++ b/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">

--- a/src/views/service-management/registration-queue/components/choose-pet.vue
+++ b/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>
@@ -286,6 +289,8 @@ export default {
          this.total = response.total
          this.loading = false
        })
+      } else {
+        this.petsList = []
      }
    }
  }

--- a/src/views/service-management/registration-queue/components/doctor-card.vue
+++ b/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() {

--- a/src/views/service-management/registration-queue/components/doctor-detail.vue
+++ b/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>

--- a/src/views/service-management/registration-queue/components/register-modle.vue
+++ b/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()
    }
  },

--- a/src/views/service-management/registration-queue/components/schedule-info.vue
+++ b/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>
        <!-- 箭头指示-->

--- a/src/views/service-management/registration-queue/registration-add.vue
+++ b/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: [

--- a/src/views/service-management/registration-queue/registration-detail.vue
+++ b/src/views/service-management/registration-queue/registration-detail.vue
@@ -344,8 +344,8 @@
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
-                    <!--门诊诊查费-->
-                    <el-form-item label="门诊诊查费">
+                    <!--门诊诊察费-->
+                    <el-form-item label="门诊诊察费">
                      <div class="reg-payAmount">
                        <el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled />
                        <span>元</span>
@@ -402,6 +402,7 @@
                <div class="base-inner">
                  <!--挂号方式-->
                  <el-row>
+                    <el-form ref="visitForm" class="register-detail__form" :model="visitForm" label-width="81px" size="small">
                      <el-col :span="8" class="form__left">
                        <el-form-item label="病历号">
                          <el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled />
@@ -432,9 +433,11 @@
                        <el-form-item
                          label="主诉"
                          prop="mainSuit"
-                        :rules="[{validator: (rules, value, callback) => {
+                          :rules="[
+                            { required: true, message: '请输入主诉', trigger: 'change' },
+                            {validator: (rules, value, callback) => {
                              if (isEmpty(visitForm.mainSuit)) {
-                            callback(new Error('请输入患者主诉'))
+                                callback(new Error('请输入主诉'))
                              } else {
                                callback()
                              }
@@ -452,7 +455,9 @@
                        <el-form-item
                          label="医嘱"
                          prop="doctorAdvice"
-                        :rules="[{validator: (rules, value, callback) => {
+                          :rules="[
+                            { required: true, message: '请输入医嘱', trigger: 'change' },
+                            {validator: (rules, value, callback) => {
                              if (isEmpty(visitForm.doctorAdvice)) {
                                callback(new Error('请输入医嘱'))
                              } else {
@@ -472,7 +477,9 @@
                        <el-form-item
                          label="诊断结果"
                          prop="diagnosisResult"
-                        :rules="[{validator: (rules, value, callback) => {
+                          :rules="[
+                            { required: true, message: '请输入诊断结果', trigger: 'change' },
+                            {validator: (rules, value, callback) => {
                              if (isEmpty(visitForm.diagnosisResult)) {
                                callback(new Error('请输入诊断结果'))
                              } else {
@@ -500,6 +507,7 @@
                          </el-button>
                        </el-form-item>
                      </el-col>
+                    </el-form>
                  </el-row>
                </div>
              </div>
@@ -592,10 +600,10 @@ export default {
        label: '全部',
        value: ''
      }, {
-        label: '是',
+        label: '首诊',
        value: '0'
      }, {
-        label: '否',
+        label: '复诊',
        value: '1'
      }],
      // 缴费状态（待改）
@@ -608,6 +616,9 @@ export default {
      }, {
        label: '已缴费',
        value: '1'
+      }, {
+        label: '挂账',
+        value: '2'
      }],
      // 会员等级下拉框
      membershipLevelList: [
@@ -687,6 +698,8 @@ export default {
    },
    // 提交表单
    submitForm() {
+      this.$refs.visitForm.validate(valid => {
+        if (valid) {
          const temp = {
            'id': this.regiterForm.medicalRecordId,
            'medicalRecordNo': this.regiterForm.medicalRecordNo,
@@ -738,6 +751,8 @@ export default {
              this.goBack()
            }
          })
+        }
+      })
    },
    parseTime,
    selectDictLabel,

--- a/src/views/service-management/treatment-management/treatment-detail.vue
+++ b/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}`"

--- a/src/views/service-management/treatment-management/treatment-schedule.vue
+++ b/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">

--- a/vue.config.js
+++ b/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 // 端口