Merge remote-tracking branch 'origin/master'

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/assets/styles/index.scss

@@ -10,7 +10,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
 label {

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -90,7 +90,7 @@
                 <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入详细地址地址(街道、楼牌号等)"
+                    placeholder="请输入详细地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
                     class="address"
@@ -133,7 +133,6 @@
                 <el-form-item label="上午开始时间" prop="useTime.ams">
                   <el-time-select
                     v-model="form.useTime.ams"
-                    class="inputWidth"
                     is-range
                     placeholder="请选择上午开始时间"
                     format="HH:mm"
@@ -267,7 +266,7 @@
                     size="large"
                     :options="areaOptions"
                     :props="props"
-                    placeholder="请选择服务地点"
+                    placeholder="请选择支持服务地区"
                     collapse-tags
                     expand-trigger="hover"
                     clearable
@@ -390,7 +389,7 @@ export default {
           { type: 'number', validator: this.validUseNum, trigger: 'change' }
         ],
         address: [
-          { required: true, message: '请输入详细地址地址(街道、楼牌号等)', trigger: 'blur' }
+          { required: true, message: '请输入详细地址(街道、楼牌号等)', trigger: 'blur' }
         ],
         'useTime.ams': [
           { required: true, validator: this.validateMorningStart, trigger: 'blur' }
@@ -415,7 +414,7 @@ export default {
           { required: true, message: '请选择预约方式', trigger: 'change' }
         ],
         remark: [
-          { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
+          { min: 2, max: 200, message: '仅支持2~200位字符', trigger: 'blur' }
         ],
         serviceArea: [
           { required: true, message: '请选择支持服务地区', trigger: 'blur' }
@@ -681,7 +680,7 @@ export default {
       if (this.form.checkType.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持服务地区'))
+        callback(new Error('请选择支持检查类型'))
       }
     },
     // 四个时间的表单校验
@@ -840,11 +839,6 @@ export default {
   background-color: #F6FCF5 !important;
 }
 
-//el.time-select-item.selected{
-//  color: #5FB54B;
-//  font-weight: bold;
-//}
-
 /* 修改下拉框文字样式 */
 ::v-deep .el-time-select__input {
   font-size: 16px;
@@ -856,9 +850,6 @@ export default {
   background-color: #5FB54B;
 }
 
-::v-deep.time-select-item.selected:not {
-   background: #f6fcf5;
- }
 .address{
   width: 520px;
 }
@@ -879,5 +870,17 @@ export default {
   line-height: 30px;
   height: 28px;
 }
+::v-deep .el-time-select-item:hover {
+  background: #F6fcf5;
+  color: #5FB54B;
+  font-weight: bold;
+  cursor: pointer;
+}
+//::v-deep.el-time-select-item:hover {
+//  background: #F6fcf5;
+//  color: #5FB54B;
+//  font-weight: bold;
+//  cursor: pointer
+//}
 </style>
 

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -19,7 +19,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备ID">
-                  {{ form.deviceCode }}
+                  <el-input v-model.trim="form.deviceCode" class="inputWidth" disabled placeholder="-" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -50,17 +50,17 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="负责人">
-                  <el-input v-model="form.head" placeholder="暂无数据" disabled class="inputWidth" />
+                  <el-input v-model="form.head" placeholder="-" disabled class="inputWidth" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号">
-                  <el-input v-model="form.phone" placeholder="暂无数据" disabled class="inputWidth" />
+                  <el-input v-model="form.phone" placeholder="-" disabled class="inputWidth" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类型">
-                  <el-select v-model="form.deviceType" disabled class="inputWidth" placeholder="暂无数据">
+                  <el-select v-model="form.deviceType" disabled class="inputWidth" placeholder="-">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -83,17 +83,17 @@
                     disabled
                     size="large"
                     :options="areaOptions"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     expand-trigger="hover"
                     clearable
-                    class="inputWidth"
+                    class="overflow-hidden"
                     @change="handleChangeCascader"
                   />
                 </el-form-item>
                 <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     maxlength="40"
                     clearable
                     class="address"
@@ -109,7 +109,7 @@
                     :min="0"
                     :max="20"
                     disabled
-                    placeholder="暂无数据"
+                    placeholder="-"
                     controls-position="right"
                     class="inputNumber_Width"
                   />
@@ -138,7 +138,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -156,7 +156,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -179,7 +179,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -191,13 +191,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="下午开始时间">
+                <el-form-item label="下午结束时间">
                   <el-time-select
                     v-model="form.useTime.pme"
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -213,7 +213,7 @@
             <!--            6-->
             <el-row>
               <el-col :span="8">
-                <el-form-item label="权重" prop="sort">
+                <el-form-item label="权重">
                   <el-input-number
                     v-model.trim="form.sort"
                     disabled
@@ -226,7 +226,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="创建日期">
-                  <span>{{ replace(form.createTime) || '-' }}</span>
+                  <el-input v-model.trim="form.createTimeShow" class="inputWidth" disabled placeholder="-" />
                 </el-form-item>
 
               </el-col>
@@ -252,7 +252,7 @@
                       v-model.trim="form.remark"
                       disabled
                       type="textarea"
-                      placeholder="暂无数据"
+                      placeholder="-"
                       maxlength="200"
                       class="remark_with"
                       :rows="4"
@@ -271,6 +271,7 @@
                     class="remark_with"
                     :row="4"
                     disabled
+                    placeholder="-"
                   />
                 </el-form-item>
               </el-col>
@@ -285,7 +286,7 @@
                     class="remark_with"
                     pacehpl
                     :row="4"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     disabled
                   />
                 </el-form-item>
@@ -305,7 +306,7 @@
             <el-table-column label="检查状态" align="center" prop="payType" show-overflow-tooltip />
           </el-table>
           <el-row>
-            <el-col style="display: flex;justify-content: center;margin-top: 20px">
+            <el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px">
               <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
@@ -330,8 +331,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="设备ID" prop="deviceID">
-                  {{ form.deviceCode }}
+                <el-form-item label="设备ID">
+                  <el-input v-model.trim="form.deviceCode" class="inputWidth" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -535,7 +536,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="创建日期">
-                  <span>{{ replace(form.createTime) || '-' }}</span>
+                  <el-input v-model="form.createTimeShow" class="inputWidth" disabled placeholder="-" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -577,7 +578,7 @@
                     size="large"
                     :options="areaOptions"
                     :props="props"
-                    placeholder="请选择服务地点"
+                    placeholder="请选择支持服务地区"
                     collapse-tags
                     expand-trigger="hover"
                     clearable
@@ -606,7 +607,7 @@
           <el-row>
             <el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px">
               <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
-              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
+              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返回</el-button>
             </el-col>
           </el-row>
         </el-card>
@@ -752,7 +753,7 @@ export default {
           { required: true, message: '请选择预约方式', trigger: 'change' }
         ],
         remark: [
-          { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
+          { min: 2, max: 200, message: '仅支持2~200位字符', trigger: 'blur' }
         ],
         serviceArea: [
           { required: true, message: '请选择支持服务地区', trigger: 'blur' },
@@ -1043,7 +1044,7 @@ export default {
             if (foundLabel) {
               labelList.push(currentLabel.join(''))
             } else {
-              labelList.push('暂无数据')
+              labelList.push('-')
             }
           }
           this.form.serviceAreaText = labelList
@@ -1177,6 +1178,7 @@ export default {
         if (this.form.useTime != null && this.form.useTime !== '') {
           this.form.useTime = JSON.parse(response.data.useTime)
         }
+        this.form.createTimeShow = this.replace(this.form.createTime)
         console.log('详情数据---', this.form)
       })
     }

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -239,7 +239,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total>20"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -297,21 +297,21 @@ export default {
           collation: 'asc',
           sortedColumn: '按创建日期正序',
           nameColumn: 'e.create_time'
-        },
-        {
-          id: 3,
-          collation: 'desc',
-          sortedColumn: '按服务价格倒序',
-          nameColumn: 'e.service_price'
-
-        },
-        {
-          id: 4,
-          collation: 'asc',
-          sortedColumn: '按服务价格正序',
-          nameColumn: 'e.service_price'
-
         }
+        // {
+        //   id: 3,
+        //   collation: 'desc',
+        //   sortedColumn: '按服务价格倒序',
+        //   nameColumn: 'e.service_price'
+        //
+        // },
+        // {
+        //   id: 4,
+        //   collation: 'asc',
+        //   sortedColumn: '按服务价格正序',
+        //   nameColumn: 'e.service_price'
+        //
+        // }
 
       ],
       // 是否平台自有设备
@@ -532,9 +532,14 @@ export default {
     /** 查询设备列表 */
     getList() {
       this.loading = true
-      if (this.daterangeCreateTime !== '') {
+      console.log('this.daterangeCreateTime', this.daterangeCreateTime)
+      if (this.daterangeCreateTime !== '' && this.daterangeCreateTime !== null) {
+        console.log('通过')
         this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
         this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
+      } else {
+        this.queryParams.beginCheckTime = ''
+        this.queryParams.endCheckTime = ''
       }
       // this.queryParams.isPrivate = this.isPrivate
       listDevice(this.queryParams).then(response => {
@@ -708,7 +713,7 @@ export default {
       if (this.ids.length !== 0) {
         const exportTable = {}
         exportTable.deviceIdList = this.ids
-        this.download('business/device/export', exportTable, `设备管理_${this.exportFormatTime(new Date())}.xlsx`).then(res => {
+        this.download('business/device/export', exportTable, `设备管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })
       } else {

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

@@ -124,7 +124,7 @@
         :data="recordList"
         :header-cell-style="{background:'#F4F4F4'}"
         @select="selectChange"
-        @selection-change="handleSelectionChange"
+        @select-all="selectChange"
       >
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="left" label="序号" min-width="80" show-overflow-tooltip type="index" />
@@ -250,6 +250,10 @@ export default {
   },
   data() {
     return {
+      // 所有信息ID(选择全部-临时表)
+      ids: [],
+      // 所有挂号信息ID(用于辅助, 里面的数据永远不变, 除了 新增/删除 数据时)
+      idsForever: [],
       showHospitalName: '',
       doctorIdList: [],
       // 所属科室下拉框字典写死
@@ -268,8 +272,6 @@ export default {
       departIdList: [],
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -409,12 +411,9 @@ export default {
     },
     // 选择全部
     checkAll() {
-      this.recordIds = this.recordIdsForever
-      // 标志位, 使得@select回调函数判断往哪个临时集合里添加
-      this.isCheckAll = true
+      this.ids = this.idsForever
       // 调用手动勾选
       this.manualCheck()
-      console.log('全部选择', this.isCheckAll)
     },
     // 手动勾选
     manualCheck() {
@@ -422,48 +421,33 @@ export default {
       this.$nextTick().then(() => {
         // 当前页结合数据的id只要在临时集合里，就使得复选框勾选
         this.recordList.forEach(item => {
-          if (this.isCheckAll) {
-            if (this.recordIds.includes(item.id)) {
+          if (this.ids.includes(item.id)) {
             this.$refs.table.toggleRowSelection(item, true)
-            }
           } else {
-            if (this.registerEmptyIds.includes(item.id)) {
-              this.$refs.table.toggleRowSelection(item, true)
-            }
+            this.$refs.table.toggleRowSelection(item, false)
           }
         })
       })
     },
     // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
     reverseSelection() {
-      console.log('永久的集合', this.recordIdsForever)
-      console.log('临时集合', this.registerEmptyIds)
-      if (this.isCheckAll) {
-        this.registerEmptyIds = this.recordIdsForever.filter(id => !this.recordIds.includes(id))
-      } else {
-        this.registerEmptyIds = this.recordIdsForever.filter(id => !this.registerEmptyIds.includes(id))
+      const temp = []
+      this.idsForever.forEach(item => {
+        if (!this.ids.includes(item)) {
+          temp.push(item)
         }
-      this.isCheckAll = false
-      this.getList()
+      })
+      this.ids = temp
+      this.manualCheck()
     },
     // 表格当前手动勾选的
     selectChange(selection, row) {
-      console.log('selectChange', selection, '----', row)
-      if (this.isCheckAll) {
-        // 判断当前选中的存不存在，存在删除;不存在添加
-        if (this.recordIds.includes(row.id)) {
-          this.recordIds = this.recordIds.filter(id => id !== row.id)
-          console.log('filter', this.recordIds.filter(id => id !== row.id))
-        } else {
-          this.recordIds.push(row.id)
-        }
-      } else {
-        if (this.registerEmptyIds.includes(row.id)) {
-          this.registerEmptyIds = this.registerEmptyIds.filter(id => id !== row.id)
-        } else {
-          this.registerEmptyIds.push(row.id)
-        }
+      console.log('selectChange', selection, '22234455555555555555555555555', row)
+      selection.forEach(item => {
+        if (!this.ids.some(idItem => idItem === item.id)) {
+          this.ids.push(item.id)
         }
+      })
     },
 
     /** 功能按钮--导出按钮操作 */
@@ -519,6 +503,7 @@ export default {
         console.log('这是病历，我要开始取字段了！', this.recordList)
         // 获取全部挂号的id
         this.recordIds = response.rows.idList
+        this.idsForever = response.rows.idList
         this.recordIdsForever = response.rows.idList
         this.total = response.total
         this.loading = false

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

@@ -112,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">
@@ -169,7 +170,7 @@ export default {
       queryParams: {
         // 导出列表
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 6,
         petCode: '',
         ownerName: '',
         phone: '',
@@ -298,6 +299,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .pet-choose-modle {
   .basicInformation {
     .title {

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/prescribing-modle.vue

@@ -163,7 +163,7 @@
               <div class="single-file">
                 <el-form-item label="数量" prop="recipelNum">
                   <el-input-number
-                    v-model="singleItem.recipelNum"
+                    v-model.trim="singleItem.recipelNum"
                     :max="100"
                     :min="0"
                     controls-position="right"
@@ -173,8 +173,9 @@
               <div>
                 <el-form-item label="sig" prop="remark">
                   <el-input
-                    v-model="singleItem.remark"
+                    v-model.trim="singleItem.remark"
                     placeholder="请输入具体用法"
+                    maxlength="30"
                   />
                 </el-form-item>
               </div>

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"
@@ -35,7 +34,6 @@
       :data="petsList"
       :header-cell-class-name="cellClass"
       :header-cell-style="{background:'#F4F4F4'}"
-      border
       row-key="id"
       :height="'50vh'"
       @selection-change="handleSelectionChange"
@@ -76,6 +74,7 @@
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
+      :pageSizes="[11,20,50]"
       @pagination="getRegisterMsg"
     />
     <div slot="footer" class="dialog-footer" />
@@ -141,7 +140,7 @@ export default {
         mainDoctor: '',
         firstVisit: '0',
         pageNum: 1,
-        pageSize: 20
+        pageSize: 11
 
       },
       fristVisitOptions: [

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

@@ -29,7 +29,7 @@
           <el-form-item label="宠物ID" prop="petsId">
             <el-input
               v-model="form.petsId"
-              placeholder="暂无数据"
+              placeholder="-"
               :disabled="true"
               maxlength="20"
             />
@@ -41,7 +41,7 @@
               v-model.trim="form.petNickname"
               :disabled="!isEdit"
               maxlength="10"
-              :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'"
+              :placeholder="isEdit? '请输入宠物昵称' : '-'"
             />
           </el-form-item>
         </el-col>
@@ -56,7 +56,7 @@
               :disabled="!isEdit"
               clearable
               class="petBreed"
-              :placeholder="isEdit? '请选择宠物品种' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物品种' : '-'"
               @change="changePetBreedId"
             >
               <el-option
@@ -73,7 +73,7 @@
               :disabled="!isEdit"
               filterable
               clearable
-              :placeholder="isEdit? '请选择宠物子品种' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物子品种' : '-'"
               class="petChildBreed"
               @change="changePetChildBreedId"
             >
@@ -92,7 +92,7 @@
               v-model="form.petSex"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择宠物性别' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物性别' : '-'"
               class="pet-sex"
             >
               <el-option
@@ -111,7 +111,7 @@
               :disabled="!isEdit"
               :picker-options="pickerOptions"
               clearable
-              :placeholder="isEdit? '请选择宠物生日' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物生日' : '-'"
               type="date"
               value-format="yyyy-MM-dd"
             />
@@ -122,7 +122,7 @@
           <el-form-item label="宠物体重" prop="petWeight">
             <el-input
               v-model.trim="form.petWeight"
-              :placeholder="isEdit? '请输入宠物体重' : '暂无数据'"
+              :placeholder="isEdit? '请输入宠物体重' : '-'"
               maxlength="10"
               :disabled="!isEdit"
             >
@@ -136,7 +136,7 @@
               v-model.trim="form.petColor"
               :disabled="!isEdit"
               maxlength="10"
-              :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'"
+              :placeholder="isEdit? '请输入宠物毛色' : '-'"
             />
           </el-form-item>
         </el-col>
@@ -147,7 +147,7 @@
               class="sterilization-status"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择宠物绝育情况' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物绝育情况' : '-'"
             >
               <el-option
                 v-for="(item, index) in dict.type.sterilization_status"
@@ -165,7 +165,7 @@
               class="vaccine-situation"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择宠物疫苗情况' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物疫苗情况' : '-'"
             >
               <el-option
                 v-for="(item, index) in dict.type.vaccine_situation"
@@ -183,7 +183,7 @@
               class="pet-insure"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择宠物是否已购保险' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物是否已购保险' : '-'"
             >
               <el-option
                 v-for="(item, index) in dict.type.pet_insure"
@@ -205,7 +205,7 @@
           <el-form-item label="宠主手机号" prop="masterPhone">
             <el-input
               v-model.trim="form.masterPhone"
-              :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'"
+              :placeholder="isEdit? '请输入宠主手机号' : '-'"
               :disabled="!isEdit"
               maxlength="11"
               @blur="checkOwner"
@@ -223,7 +223,7 @@
           <el-form-item label="宠主姓名">
             <el-input
               v-model.trim="form.nickName"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -232,7 +232,7 @@
           <el-form-item label="手机号">
             <el-input
               v-model.trim="form.phoneNumber"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -241,7 +241,7 @@
           <el-form-item label="用户ID">
             <el-input
               v-model.trim="form.ownersId"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -250,7 +250,7 @@
           <el-form-item label="创建日期">
             <el-input
               v-model.trim="form.createTime"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -259,7 +259,7 @@
           <el-form-item label="会员等级">
             <el-input
               v-model.trim="form.membershipLevel"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -268,7 +268,7 @@
           <el-form-item label="会员卡余额">
             <el-input
               v-model.trim="form.cardBalance"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -277,7 +277,7 @@
           <el-form-item label="绑定宠物数量">
             <el-input
               v-model.trim="form.petCount"
-              placeholder="暂无数据"
+              placeholder="-"
               disabled
             />
           </el-form-item>
@@ -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

@@ -383,6 +383,14 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row v-if="detailInfo.type === '0'">
+                  <el-col :span="8" class="form__left">
+                    <!--缴费时间-->
+                    <el-form-item label="备注信息">
+                      <el-input v-model="detailInfo.remark" placeholder="-" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </div>
             </div>
           </div>
@@ -522,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>
@@ -551,6 +559,7 @@ export default {
   },
   data() {
     return {
+      submiting: false, // 提交按钮loading flag
       // 进度
       scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
       // 挂号处方信息传值
@@ -700,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,
@@ -750,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() {

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

@@ -798,7 +798,7 @@ export default {
       this.sortedColumn = ''
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         searchText: '',
         treatScheduleList: '',
         reportTime: '',
@@ -843,15 +843,36 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       if (this.ids.length !== 0) {
-        const exportTable = {}
-        exportTable.treatIds = this.ids
-        this.download('business/treat/export', exportTable, `manage_${new Date().getTime()}.xlsx`).then(res => {
+        const exportTable = {
+          orderByColumn: this.queryParams.orderByColumn,
+          isAsc: this.queryParams.isAsc,
+          pageNum: 1,
+          pageSize: this.ids.length,
+          treatIds: this.ids
+        }
+        this.download('business/treat/export', exportTable, `治疗管理_${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })
       } else {
         this.$modal.msgWarning('请选择至少一条数据导出')
         return
       }
+    },
+    // 导出格式化
+    exportFormatTime(date) {
+      // 获取年月日
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1 // 月份从0开始，需要加1
+      var day = date.getDate()
+      // 将年月日格式化为字符串
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      const formattedDate = year.toString() + month.toString() + day.toString()
+      return formattedDate
     }
   }
 }

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