Merge remote-tracking branch 'origin/master'

src/assets/styles/btn.scss

@@ -314,6 +314,11 @@
   border-radius: 6px 6px 6px 6px;
   border: 1px solid rgb(219, 71, 71)!important;
 }
+.el-button--disabled--solid--four{
+  width: 80px!important;
+  border-radius: 6px 6px 6px 6px;
+  border: 1px solid  rgba(201,201,201)!important;
+}
 .icon-list{
   font-size: 11px;
   margin-right: 2px;

src/assets/styles/element-ui.scss

@@ -114,7 +114,9 @@
   font-weight: bold;
   color: #5FB54B;
 }
-
+.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
+  background-color: #F6FCF5;
+}
 .el-form-item--small.el-form-item {
   margin-right: 20px !important;
 }

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

@@ -471,6 +471,7 @@ color: #333333;"
                     <el-select
                       v-model="scope.row.drugId"
                       clearable
+                      filterable
                       :placeholder="isEdit? '请选择药品名称' : '暂无数据'"
                       style="width: 100%"
                       @change="setDrugOthers(scope.row,drugOptions)"
@@ -494,7 +495,7 @@ color: #333333;"
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
                   <span v-else>
-                    {{ scope.row.createTime ? scope.row.createTime : '-' }}
+                    {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY/MM/DD') : '-' }}
                   </span>
                 </template>
               </el-table-column>
@@ -543,7 +544,7 @@ color: #333333;"
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
                   <span v-else>
-                    {{ scope.row.status ? (scope.row.status === '1' ? '已取药' : '待取药') : '-' }}
+                    {{scope.row.paymentStatus === '0' ? '-' : (scope.row.status ? (scope.row.status === '1' ? '已取药' : '待取药') : '-') }}
                   </span>
                 </template>
               </el-table-column>
@@ -1625,11 +1626,9 @@ export default {
                 type: 'success',
                 message: '修改成功'
               })
-              this.goBack()
               console.log('editRecord', res)
               this.$router.push('/medical-record-management/index')
             })
-            this.goBack()
           })
         }
       })

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

@@ -442,12 +442,28 @@ export default {
     },
     // 表格当前手动勾选的
     selectChange(selection, row) {
-      console.log('selectChange', selection, '22234455555555555555555555555', row)
-      selection.forEach(item => {
-        if (!this.ids.some(idItem => idItem === item.id)) {
-          this.ids.push(item.id)
+      // 选中行是没有则将当前list里面的数据从ids里情况
+      if (selection.length === 0) {
+        const temp = this.recordList.map(item => {
+          return item.id
+        })
+        this.ids = this.ids.filter(item => {
+          return !temp.includes(item)
+        })
+      } else {
+        // 遍历当前页选中行如果没有的就加上
+        selection.forEach(item => {
+          if (!this.ids.some(idItem => idItem === item.id)) {
+            this.ids.push(item.id)
+          }
+        })
+        // 判断选中行是不是被勾掉了
+        if (row && !selection.some(item => item.id === row.id)) {
+          this.ids = this.ids.filter(item => {
+            return item !== row.id
+          })
         }
-      })
+      }
     },
 
     /** 功能按钮--导出按钮操作 */

src/views/service-management/hospitalization-management/components/assign-wards.vue

 <template>
   <el-dialog
     :close-on-click-modal="false"
-    title="详情"
+    title="变更病房"
     :visible.sync="isShow"
     :before-close="closeModle"
     width="70%"
@@ -111,7 +111,7 @@
     </div>
     <!--分页-->
     <pagination
-      v-show="total>0"
+      v-show="total>10"
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
@@ -119,7 +119,7 @@
       @pagination="getWardList()"
     />
 
-    <div style="padding: 20px">
+    <div style="padding: 20px;text-align: right;">
       <el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
       <el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
     </div>

src/views/service-management/hospitalization-management/components/handle-discharge.vue

@@ -54,7 +54,7 @@
       </el-form>
     </div>
 
-    <div style="padding: 20px">
+    <div style="padding: 20px;text-align: right;">
       <el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
       <el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
     </div>

src/views/service-management/hospitalization-management/components/handling-admissions.vue

@@ -131,7 +131,7 @@
       @pagination="getWardList()"
     />
 
-    <div style="padding-left: 20px;padding-top: 20px;">
+    <div style="padding-left: 20px;padding-top: 20px;text-align: right;">
       <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
       <el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
     </div>

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

@@ -369,7 +369,7 @@
             <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;"
-            >押金充值信息
+            >押金信息
             </div>
           </div>
 

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

@@ -108,6 +108,7 @@
       v-loading="loading"
       :data="hospitalList"
       :row-key="getRowKeys"
+      :row-class-name="highlightRow"
       :header-cell-style="{ background:'#E8E9E8' }"
       @selection-change="handleSelectionChange"
     >
@@ -178,7 +179,7 @@
       </el-table-column>
       <el-table-column label="押金余额" align="left" prop="deposit" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.deposit || '0.00' }}元</span>
+          <span>{{ moneyFormat(scope.row.deposit) || '0.00' }}元</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="left" prop="status" :show-overflow-tooltip="true">
@@ -192,14 +193,14 @@
           <span>{{ parseTime(scope.row.dischargeDate, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180px">
+      <el-table-column label="操作" class-name="small-padding fixed-width" align="center" min-width="180px">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:hospital:query']"
             icon="el-icon-document"
             plain
             size="mini"
-            style="width: 55px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
+            class="el-button--success--solid"
             type="success"
             @click="handleDetails(scope.row)"
           >详情</el-button>
@@ -209,7 +210,7 @@
             icon="el-icon-paperclip"
             plain
             size="mini"
-            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
+            class="el-button--warning--solid--four"
             type="warning"
             @click="handleadmission(scope.row)"
           >办理入院</el-button>
@@ -218,8 +219,7 @@
             icon="el-icon-paperclip"
             plain
             size="mini"
-            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
-            type="warning"
+            class="el-button--disabled--solid--four"
             :disabled="true"
           >办理入院</el-button>
           <el-button
@@ -228,7 +228,7 @@
             icon="el-icon-paperclip"
             plain
             size="mini"
-            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
+            class="el-button--warning--solid--four"
             type="warning"
             @click="handleDischargeMe(scope.row)"
           >办理出院</el-button>
@@ -237,7 +237,7 @@
             icon="el-icon-paperclip"
             plain
             size="mini"
-            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
+            class="el-button--warning--solid--four"
             type="warning"
           >导出明细</el-button>
         </template>
@@ -264,6 +264,7 @@ import { getHospital, listHospital, listInHospitalNoPage, listWardSelect } from
 import HandlingAdmissions
 from '@/views/service-management/hospitalization-management/components/handling-admissions.vue'
 import HandleDischarge from '@/views/service-management/hospitalization-management/components/handle-discharge.vue'
+import { moneyFormat } from '../../../utils'
 
 export default {
   name: 'HospitalizationManagement',
@@ -340,6 +341,12 @@ export default {
     this.getWardSelect()
   },
   methods: {
+    moneyFormat,
+    highlightRow(scope) {
+      if (scope.row.diseaseLevel === '1') {
+        return 'height-line'
+      }
+    },
     // 病房下拉框
     getWardSelect() {
       listWardSelect().then(res => {
@@ -484,6 +491,11 @@ export default {
   }
 }
 </script>
+<style>
+.height-line{
+  background-color: rgba(85, 163, 67, 0.2) !important;
+}
+</style>
 <style scoped lang="scss">
 .app-container{
   background-color: #FFFFFF;

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

@@ -34,12 +34,12 @@
         </el-col>
         <el-col :span="24">
           <el-form-item prop="name" label="擅长领域">
-            <el-input :value="doctorForm.areaExpertise || '暂无数据'" type="textarea" :disabled="true" maxlength="20" />
+            <el-input :value="doctorForm.areaExpertise || '-'" type="textarea" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item prop="name" label="医生简介">
-            <el-input :value="doctorForm.doctorProfile || '暂无数据'" type="textarea" :disabled="true" maxlength="20" />
+            <el-input :value="doctorForm.doctorProfile || '-'" type="textarea" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -56,7 +56,7 @@
         <el-col :span="8">
           <el-form-item prop="name" label="门诊诊察费">
             <div style="display: flex;">
-              <el-input v-model="doctorForm.examinationFee" :disabled="true" maxlength="20" />
+              <el-input v-model="doctorForm.examinationFeeShow" :disabled="true" maxlength="20" />
               <div style="margin-left: 10px;">元</div>
             </div>
           </el-form-item>
@@ -73,6 +73,7 @@
 <script>
 import { getRegisterDetail } from '@/api/business/registration'
 import { selectDictLabel } from '@/utils/ruoyi'
+import { moneyFormat } from '@/utils'
 
 export default {
   name: 'DoctorDetail',
@@ -111,6 +112,7 @@ export default {
       getRegisterDetail(this.doctorId).then(response => {
         console.log('这是单个医生的详情信息:', response)
         this.doctorForm = response.data
+        this.doctorForm['examinationFeeShow'] = moneyFormat(response.data.examinationFee)
       })
     },
     choosePet() {

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

@@ -15,7 +15,6 @@
       <el-form-item label="是否首诊" prop="petSex">
         <el-select
           v-model="queryParams.firstVisit"
-          clearable
           placeholder="请选择首诊情况"
           style="width: 100%"
           @change="handleQuery"

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

@@ -333,6 +333,13 @@ export default {
   },
   data() {
     return {
+      levelMap: {
+        '1': '一级会员',
+        '2': '二级会员',
+        '3': '三级会员',
+        '4': '四级会员',
+        '5': '五级会员'
+      },
       // 进度
       scheduleKey: { checkSchedule: '0' },
       // 宠物出生日期校验
@@ -528,7 +535,7 @@ export default {
             phoneNumber: data.phoneNumber,
             ownersId: data.ownersId,
             createTime: data.createTime,
-            membershipLevel: data.membershipLevel ? data.membershipLevel : '-',
+            membershipLevel: data.membershipLevel ? this.levelMap[data.membershipLevel] : '-',
             customers: data.customers, // 是否是新客 0 是 1 否
             petCount: data.petCount,
             cardBalance: data.cardBalance ? data.cardBalance : '-',
@@ -624,7 +631,7 @@ export default {
         phoneNumber: petOwnerBo.phoneNumber,
         ownersId: petOwnerBo.ownersId,
         createTime: petOwnerBo.createTime,
-        membershipLevel: petOwnerBo.membershipLevel,
+        membershipLevel: this.levelMap[petOwnerBo.membershipLevel],
         customers: petOwnerBo.customers, // 是否是新客 0 是 1 否
         petCount: petOwnerBo.petCount,
         cardBalance: petOwnerBo.cardBalance

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

@@ -530,7 +530,7 @@
             />
           </div>
           <!--底部返回按钮-->
-          <el-button v-if="$route.params.type === 'enter'" class="queryBtn" icon="el-icon-check" @click="submitForm">提
+          <el-button :loading="submiting" v-if="$route.params.type === 'enter'" class="queryBtn" icon="el-icon-check" @click="submitForm">提
             交
           </el-button>
           <el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
@@ -559,6 +559,7 @@ export default {
   },
   data() {
     return {
+      submiting: false, // 提交按钮loading flag
       // 进度
       scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
       // 挂号处方信息传值
@@ -708,6 +709,7 @@ export default {
     submitForm() {
       this.$refs.visitForm.validate(valid => {
         if (valid) {
+          this.submiting = true
           const temp = {
             'id': this.regiterForm.medicalRecordId,
             'medicalRecordNo': this.regiterForm.medicalRecordNo,
@@ -758,6 +760,8 @@ export default {
               this.$message.success('提交成功')
               this.goBack()
             }
+          }).finally(() => {
+            this.submiting = false
           })
         }
       })

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

@@ -498,24 +498,21 @@ export default {
     // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
     reverseSelection() {
       const temp = []
-      this.registerList.forEach(item => {
-        console.log(this.ids.includes(item.id))
-        if (!this.ids.includes(item.id)) {
-          temp.push(item.id)
+      this.idsForever.forEach(item => {
+        if (!this.ids.includes(item)) {
+          temp.push(item)
         }
       })
       this.ids = temp
       this.manualCheck()
     },
     // 表格当前手动勾选的
-    // 表格当前手动勾选的
     selectChange(selection, row) {
-      console.log('selectChange', selection, '----', row)
-      const temp = []
       selection.forEach(item => {
-        temp.push(item.id)
+        if (!this.ids.some(idItem => idItem === item.id)) {
+          this.ids.push(item.id)
+        }
       })
-      this.ids = temp
     },
     /** 功能按钮--导出按钮操作 */
     handleExport() {

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]: ''