Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/medical-record-management/medical-record-management.vue

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

@@ -3,8 +3,8 @@
     <div style="background-color: #fff">
       <div class="app-container-container">
         <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span style="color: #666666; font-weight: 600; font-size: 17px;">新增</span>
+          <div style=" text-align: center;padding-top: 40px;height: 100px;">
+            <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">新增</span>
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
@@ -14,7 +14,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="设备名称" prop="deviceName">
-                  <el-input v-model="form.deviceName" placeholder="请输入设备名称" style="width: 250px" />
+                  <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -44,7 +44,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号" prop="phone">
-                  <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" style="width: 250px" />
+                  <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11" style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -92,10 +92,13 @@
               <el-col :span="8">
                 <el-form-item label="单位时段服务数" prop="useNum">
                   <el-input-number
+                    :min="0"
+                    :max="20"
                     v-model.trim="form.useNum"
                     controls-position="right"
                     style="width: 220px"
-                    @blur="handleBlur"
+                    @blur="handleuseNum"
+                    @keydown.native="keydown($event)"
                   />
                   <span style="margin-left: 15px">{{ "次" }}</span>
                 </el-form-item>
@@ -202,6 +205,7 @@
                     :max="9999"
                     style="width: 250px"
                     @blur="handleBlur"
+                    @keydown.native="keydown($event)"
                   />
                 </el-form-item>
               </el-col>
@@ -293,7 +297,7 @@ import { getInfo } from '@/api/login'
 
 export default {
   name: 'EquipmentAdd',
-  dicts: ['device_status', 'device_type', 'exam_type', 'check_type','service_area'],
+  dicts: ['device_status', 'device_type', 'exam_type', 'check_type', 'service_area'],
 
   data() {
     return {
@@ -370,7 +374,7 @@ export default {
         ],
         sort: [
           { required: true, message: '请输入权重', trigger: 'change' },
-          { pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' }
+          { type: 'number', validator: this.validWeigh, trigger: 'change' }
         ],
         status: [
           { required: true, message: '请选择设备状态', trigger: 'change' }
@@ -500,11 +504,35 @@ export default {
     getpm() {
       console.log(this.useTime)
     },
-    // 权重不可以输入小数
+    // 是权重不可以输入小数
+    handleuseNum() {
+      const parsedValue = parseFloat(this.form.useNum)
+      if (!isNaN(parsedValue)) {
+        // this.form.sort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+        this.form.useNum = parsedValue.toFixed(0)
+      }
+    },
+    // 是权重不可以输入小数
     handleBlur() {
       const parsedValue = parseFloat(this.form.sort)
       if (!isNaN(parsedValue)) {
         this.form.sort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+
+      }
+    },
+    // 权重不能为0
+    validWeigh(rule, value, callback) {
+      console.log('value', value)
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('权重不能为0'))
+      }
+    },
+    // 禁止输入空格
+    keydown(e) {
+      if (e.keyCode === 32) {
+        e.returnValue = false
       }
     },
     // // 三级联动 字符串转换为数组

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

@@ -3,8 +3,8 @@
     <div v-if="identify ==='2'" style="background-color: #fff">
       <div class="app-container-container">
         <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span style="color: #666666; font-weight: 600; font-size: 17px;">详情</span>
+          <div style=" text-align: center;padding-top: 40px;height: 100px;">
+            <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
@@ -71,7 +71,7 @@
                     v-model="form.selectedOptions"
                     size="large"
                     :options="cityOptions"
-                    placeholder="请选择地区"
+                    placeholder="暂无数据"
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
@@ -84,7 +84,7 @@
                 <el-form-item prop="address" style="margin-left: 11%">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入服务地址"
+                    placeholder="暂无数据"
                     maxlength="40"
                     clearable
                     disabled
@@ -96,12 +96,14 @@
               <el-col :span="8">
                 <el-form-item label="单位时段服务数">
                   <el-input-number
+                    :min="0"
+                    :max="20"
                     v-model.trim="form.useNum"
                     disabled
-                    placeholder="请输入单位时段服务数"
+                    placeholder="暂无数据"
                     controls-position="right"
                     style="width: 220px"
-                    @blur="handleBlur"
+
                   />
                   <span style="margin-left: 15px">{{ "次" }}</span>
                 </el-form-item>
@@ -128,7 +130,7 @@
                     is-range
                     disabled
                     style="width: 250px"
-                    placeholder="开始时间"
+                    placeholder="暂无数据"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -146,7 +148,7 @@
                     is-range
                     disabled
                     style="width: 250px"
-                    placeholder="结束时间"
+                    placeholder="暂无数据"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -169,7 +171,7 @@
                     is-range
                     disabled
                     style="width: 250px"
-                    placeholder="开始时间"
+                    placeholder="暂无数据"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -187,7 +189,7 @@
                     is-range
                     disabled
                     style="width: 250px"
-                    placeholder="结束时间"
+                    placeholder="暂无数据"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -211,7 +213,6 @@
                     :min="0"
                     :max="9999"
                     style="width: 250px"
-                    @blur="handleBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -243,7 +244,7 @@
                       v-model.trim="form.remark"
                       disabled
                       type="textarea"
-                      placeholder="-"
+                      placeholder="暂无数据"
                       maxlength="200"
                       style="width:1050px;"
                       :rows="4"
@@ -306,8 +307,8 @@
     <div v-if="identify ==='1'" style="background-color: #fff">
       <div class="app-container-container">
         <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span style="color: #666666; font-weight: 600; font-size: 17px;">编辑</span>
+          <div style=" text-align: center;padding-top: 40px;height: 100px;">
+            <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">编辑</span>
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
@@ -353,7 +354,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="负责人" prop="head">
-                  <el-input v-model="form.head" placeholder="请输入负责人名称" style="width: 250px" />
+                  <el-input v-model.trim="form.head" placeholder="请输入负责人名称" style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -401,6 +402,7 @@
                     placeholder="请输入服务地址"
                     maxlength="60"
                     clearable
+
                   >
                     <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
                   </el-input>
@@ -414,6 +416,7 @@
                     controls-position="right"
                     style="width: 220px"
                     @blur="handleBlur"
+                    @keydown.native="keydown($event)"
                   />
                   <span style="margin-left: 15px">{{ "次" }}</span>
                 </el-form-item>
@@ -519,6 +522,7 @@
                     :max="9999"
                     style="width: 250px"
                     @blur="handleBlur"
+                    @keydown.native="keydown($event)"
                   />
                 </el-form-item>
               </el-col>
@@ -548,7 +552,7 @@
                     <el-input
                       v-model.trim="form.remark"
                       type="textarea"
-                      placeholder="请输入备注"
+                      placeholder="请输入备注（2~200字）"
                       maxlength="200"
                       style="width:1050px;"
                       :rows="4"
@@ -698,16 +702,16 @@ export default {
           }
         ],
         deviceType: [
-          { required: true, message: '请选择设备类型', trigger: 'blur' }
+          { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         addressCode: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' }
+          { required: true, message: '请选择服务地点', trigger: 'change,blur' }
         ],
         useNum: [
           { required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' }
         ],
         address: [
-          { required: true, message: '请输入详细地址', trigger: 'blur' }
+          { required: true, message: '请输入服务地址', trigger: 'blur' }
         ],
         ams: [
           { required: true, validator: this.validateMorningStart, trigger: 'blur' }
@@ -723,13 +727,13 @@ export default {
         ],
         sort: [
           { required: true, message: '请输入权重', trigger: 'change' },
-          { pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' }
+          { type: 'number', validator: this.validWeigh, trigger: 'change' }
         ],
         status: [
-          { required: true, message: '请选择设备状态', trigger: 'blur' }
+          { required: true, message: '请选择设备状态', trigger: 'change' }
         ],
         reservationMethod: [
-          { required: true, message: '请选择预约方式', trigger: 'blur' }
+          { required: true, message: '请选择预约方式', trigger: 'change' }
         ],
         remark: [
           { min: 2, max: 200, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
@@ -837,11 +841,26 @@ export default {
     getpm() {
       console.log(this.useTime)
     },
-    // 权重不可以输入小数
+    // 禁止输入空格
+    keydown(e) {
+      if (e.keyCode === 32) {
+        e.returnValue = false
+      }
+    },
+    // 是权重不可以输入小数
     handleBlur() {
-      const parsedValue = parseFloat(this.form.sort)
+      const parsedValue = parseFloat(this.form.sort,this.form.reservationMethod)
       if (!isNaN(parsedValue)) {
-        this.form.sort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+        this.form.roleSort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+      }
+    },
+    // 权重不能为0
+    validWeigh(rule, value, callback) {
+      console.log('value', value)
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('权重不能为0'))
       }
     },
     // },

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

@@ -115,7 +115,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border @selection-change="handleSelectionChange"  :row-key="getRowKeys">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip />
@@ -147,23 +147,22 @@
           <span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预约方式" align="center" prop="reservationMethod" show-overflow-tooltip >
+      <el-table-column label="预约方式" align="center" prop="reservationMethod" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.reservationMethod == 1 ? "按时段预约"  :"-" }}</span>
+          <span>{{ scope.row.reservationMethod == 1 ? "按时段预约" :"-" }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice" >
+      <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice">
         <template slot-scope="scope">
-          <span>{{(scope.row.orderPrice == "" ||scope.row.orderPrice==null)? "-" :scope.row.orderPrice +"元"}}</span>
-<!--          <span>{{ scope.row.orderPrice +"元" || "-" }}</span>-->
+          <span>{{ (scope.row.orderPrice == "" ||scope.row.orderPrice==null)? "-" :scope.row.orderPrice +"元" }}</span>
+          <!--          <span>{{ scope.row.orderPrice +"元" || "-" }}</span>-->
         </template>
       </el-table-column>
 
       <el-table-column label="设备服务费" align="center" prop="servicePrice">
         <template slot-scope="scope">
-          <span>{{(scope.row.servicePrice == "" ||scope.row.servicePrice==null)? "-" :scope.row.servicePrice +"元"}}</span>
-<!--          <span>{{ scope.row.servicePrice +"元"|| "-" }}</span>-->
+          <span>{{ (scope.row.servicePrice == "" ||scope.row.servicePrice==null)? "-" :scope.row.servicePrice +"元" }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip>
@@ -335,7 +334,7 @@ export default {
         checkTypeList: '',
         searchText: '',
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         id: null,
         deviceCode: null,
         deptId: null,
@@ -465,18 +464,7 @@ export default {
       this.queryParams.orderByColumn = val.nameColumn
       this.queryParams.isAsc = val.collation
     },
-    // 三级联动 字符串转换为数组
-    handleChange(value) {
-      // 地区数组
-      const textArray = []
-      // 编码数组
-      const codeArray = []
-      for (let i = 0; i < value.length; i++) {
-        codeArray.push(value[i].toString())
-        textArray.push(CodeToText[value[i][0]] + CodeToText[value[i][1]] + CodeToText[value[i][2]])
-      }
-      this.form.serviceArea = codeArray.join(';')
-    },
+
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = '用户导入'
@@ -556,16 +544,19 @@ export default {
         option: '',
         createTime: '',
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         personName: '',
         isPrivate: null,
         sortedColumn: ''
       }
       //   this.handleQuery()
       // this.queryParams.checkTypeList = ''
-      this.resetForm('queryForm')
+      // this.resetForm('queryForm')
       this.handleQuery()
     },
+    getRowKeys(row) {
+      return row.id
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
@@ -599,53 +590,56 @@ export default {
       })
     },
 
-    // 全部选择
-    selectAll() {
-      this.$refs.table.toggleAllSelection()
+    /**
+     * 全部选择
+     * @param selection 已选择内容
+     * @param all 是否永远进行全选操作
+     */
+    async selectAll(selection = [], all = true) {
+      if (this.deviceList.length !== selection.length && !all) {
+        this.effectTableSelect([])
+      } else {
+        await this.changeTableAllSelect()
+      }
+    },
+    /**
+     * 控制table的选择项
+     * @param data
+     */
+    effectTableSelect(data = []) {
+      this.$refs.table.store.states.selection = data
+      this.$refs.table.store.updateSelectionByRowKey()
+      this.$refs.table.store.updateAllSelected()
+      this.$refs.table.$emit('selection-change', data)
+    },
+    /**
+     * 全选请求项
+     * @param notIncludeIds 需要排除的id列表
+     */
+    async changeTableAllSelect(notIncludeIds = []) {
+      // 获取反选的数据
+      const { data } = await listDeviceAll({ notIncludeIds })
+      console.log('fsdfsdfsd', data)
+      this.effectTableSelect(data)
+    },
+    /**
+     * 反选请求项
+     * @param notIncludeIds 需要排除的id列表
+     */
+    async changeTableSelect(notIncludeIds = []) {
+      /**
+       * 如果当前没有选择任何table项 则反选不生效
+       */
+      if (notIncludeIds !== null && notIncludeIds !== '') {
+        const { data } = await listDeviceAll({ notIncludeIds })
+        this.effectTableSelect(data)
+      }
     },
     // 反向选择
-    reverseSelect(rows) {
-      rows.forEach(row => {
-        this.$refs.table.toggleRowSelection(row)
-      })
+    reverseSelect() {
+      this.changeTableSelect(this.ids)
     },
 
-    // /**
-    //  * 全部选择
-    //  * @param selection 已选择内容
-    //  * @param all 是否永远进行全选操作
-    //  */
-    // async selectAll(selection = [], all = true) {
-    //   if (this.deviceList.length !== selection.length && !all) {
-    //     this.effectTableSelect([])
-    //   } else {
-    //     await this.changeTableSelect()
-    //   }
-    // },
-    // /**
-    //  * 控制table的选择项
-    //  * @param data
-    //  */
-    // effectTableSelect(data = []) {
-    //   this.$refs.table.store.states.selection = data
-    //   this.$refs.table.store.updateSelectionByRowKey()
-    //   this.$refs.table.store.updateAllSelected()
-    //   this.$refs.table.$emit('selection-change', data)
-    // },
-    // /**
-    //  * 改变table选择项
-    //  * @param notIncludeIds 需要排除的id列表
-    //  */
-    // async changeTableSelect(notIncludeIds = []) {
-    //   // 获取反选的数据
-    //   const { data } = await listDeviceAll({ notIncludeIds })
-    //   console.log("data",data)
-    //   this.effectTableSelect(data)
-    // },
-    // // 反向选择
-    // reverseSelect() {
-    //   this.changeTableSelect(this.ids)
-    // },
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row)

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

@@ -2,7 +2,15 @@
   <div style="background-color: #FFFFFF;">
     <div class="app-container">
       <!--顶部搜索区-->
-      <el-form v-show="showSearch" ref="queryForm" class="form-style" :inline="true" :model="queryParams" label-width="68px" size="small">
+      <el-form
+        v-show="showSearch"
+        ref="queryForm"
+        :inline="true"
+        :model="queryParams"
+        class="form-style"
+        label-width="68px"
+        size="small"
+      >
         <el-form-item prop="petNickname">
           <el-input
             v-model="queryParams.petNickname"
@@ -108,23 +116,33 @@
         border
         @selection-change="handleSelectionChange"
       >
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" show-overflow-tooltip label="序号" min-width="80" type="index" />
-        <el-table-column align="center" show-overflow-tooltip label="病历号" min-width="80" prop="visitNumber" />
-        <el-table-column align="center" show-overflow-tooltip label="宠物昵称" min-width="80" prop="petNickname" />
-        <el-table-column align="center" show-overflow-tooltip label="宠物ID" prop="nickname" />
-        <el-table-column align="center" show-overflow-tooltip label="宠主姓名" prop="nickname" />
-        <el-table-column align="center" show-overflow-tooltip label="宠主手机号" prop="petOwnerNumber" />
-        <el-table-column align="center" show-overflow-tooltip label="归档医院" prop="deptId" />
-        <el-table-column align="center" show-overflow-tooltip label="主治兽医" prop="doctorName" />
-        <el-table-column align="center" show-overflow-tooltip label="所属科室" prop="departmentId" />
-        <el-table-column align="center" show-overflow-tooltip label="就诊日期" prop="visitTime" width="180">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index"/>
+        <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip/>
+        <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip/>
+        <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip/>
+        <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip/>
+        <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip/>
+        <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip/>
+        <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip/>
+        <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip/>
+        <el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.visitDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" show-overflow-tooltip label="宠物保险" prop="visitOffice" />
-        <el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
+        <el-table-column align="center" label="宠物保险" prop="insure" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          class-name="small-padding fixed-width"
+          label="操作"
+          min-width="180"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['business:record:edit']"
@@ -167,6 +185,8 @@ import { listRecord } from '@/api/business/record'
 
 export default {
   name: 'MedicalRecordManagement',
+  // 数据字典
+  dicts: ['pet_insure'],
   data() {
     return {
       doctorNameList: [],
@@ -311,7 +331,9 @@ export default {
     getList() {
       this.loading = true
       listRecord(this.queryParams).then(response => {
+        console.log('病历列表的数据：', response)
         this.recordList = response.rows
+        console.log('这是病历，我要开始取字段了！', this.recordList)
         this.total = response.total
         this.loading = false
       })
@@ -382,8 +404,9 @@ export default {
 ::v-deep .el-table .disabledCheck .cell .el-checkbox__inner {
   display: none;
 }
+
 //顶部搜索框样式
-.form-style{
+.form-style {
   margin-bottom: 20px;
 }
 </style>

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

@@ -148,12 +148,29 @@
       </div>
       <!-- 详细内容-->
       <div>
-        <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')"/>
+        <div
+          style=" margin: 20px;
+height: 303px;
+background: #FFFFFF;
+opacity: 1;
+border: 1px solid #E5E5E5;
+"
+        >
+          <div
+            style="   display: flex;
+          align-items: center;
+          flex-direction: column;margin-top: 9%;"
+          >
+            <div style=" width:115px;height: 74px;">
+              <el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')"/>
+            </div>
+            <div
+              style="font-size: 14px;
+font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+font-weight: 400;
+color: #AFAFAF;"
+            >暂无数据
             </div>
-            <div style="color: #b2b2b2">暂无数据</div>
           </div>
         </div>
       </div>

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

 <template>
-  <el-dialog :visible.sync="isShow" append-to-body class="prescribing-modle" title="开具处方">
-    <el-form ref="prescribingForm" :model="prescribingForm" :rules="rules" label-width="80px" size="small">
+  <el-dialog :visible.sync="isShow" append-to-body class="prescribing-modle" title="">
+    <el-form ref="prescribingForm" :model="prescribingForm" label-width="80px" size="small">
       <!--      标题区域-->
       <div class="prescribing-head">
         <div class="prescribing-title">
@@ -148,7 +148,7 @@
           <el-form-item label="药物处理" prop="medication">
             <div v-for="(item, index) in prescribingForm.medication" :key="index" class="single-medication">
               <div class="single-file">
-                <el-form-item label="宠物名称:" prop="drug">
+                <el-form-item prop="drug">
                   <el-select
                     v-model="item.drug"
                     clearable
@@ -165,13 +165,16 @@
                 </el-form-item>
               </div>
               <div class="single-file">
-                <el-form-item label="数量" prop="num">
-                  <el-input-number v-model="item.num" :max="10" :min="1" controls-position="right"/>
+                <el-form-item label="数量" prop="num" >
+                  <el-input-number v-model="item.num"
+                                   :max="10" :min="1"
+                                   controls-position="right"/>
                 </el-form-item>
               </div>
               <div>
                 <el-form-item label="sig" prop="sig">
-                  <el-input v-model="item.sig" placeholder="请输入具体用法"/>
+                  <el-input v-model="item.sig"
+                            placeholder="请输入具体用法"/>
                 </el-form-item>
               </div>
               <div class="content-option">
@@ -186,7 +189,7 @@
           <el-form-item label="辅助检查" prop="inspect">
             <div v-for="(singleItem, index) in prescribingForm.inspect" :key="index" class="single-medication">
               <div class="single-file">
-                <el-form-item label="检查类型">
+                <el-form-item label="检查类型" prop="checktype">
                   <el-select v-model="singleItem.checkType" clearable placeholder="检查类型"
                              @change="getCheckItemOptions"
                   >
@@ -200,9 +203,10 @@
                 </el-form-item>
               </div>
               <div class="single-file">
-                <el-form-item label="项目">
+                <el-form-item label="项目" prop="checkItemsid"  :rules="{validator: validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目'), trigger: 'blur'}">
                   <el-select v-model="singleItem.checkItemsId" clearable placeholder="请选择"
                              @change="setCheckItemsName(singleItem,checkItemOptions)"
+                             :disabled="validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目')(null, null, msg => {})"
                   >
                     <el-option
                       v-for="(item, index) in checkItemOptions"
@@ -369,10 +373,10 @@ export default {
           { validator: validatePass, trigger: 'change' }
         ],
         // 自定义药品连锁触发校验
-        // num: [
-        //   { required: true, message: '请输入药品数量', trigger: 'change' },
-        //   +{ validator: validNum, trigger: 'change' }
-        // ]
+        num: [
+          { required: true, message: '请输入药品数量', trigger: 'change' },
+          +{ validator: validNum, trigger: 'change' }
+        ]
       }
     }
   },
@@ -386,6 +390,21 @@ export default {
     this.getTreatItemOptions()
   },
   methods: {
+    // 校验触发--后面项目必填校验
+    validatePharmaceuticalsOther(singleItem, key, message) {
+      return (rule, value, callback) => {
+        if (!singleItem.checkType) {
+          callback()
+          return true
+        } else if (!singleItem[key]) {
+          callback(`请填写${message}`)
+          return false
+        } else {
+          callback()
+          return false
+        }
+      }
+    },
     // 设置当前行治疗名称
     setTreatItemsName(rowData, options) {
       console.log('setTreatItemsName', rowData, options)

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/registration-add.vue

@@ -379,9 +379,7 @@ export default {
   methods: {
     /** 返回跳转列表页 */
     goBack() {
-      this.$router.push({
-        name: 'Register'
-      })
+      this.$router.push('/service-management/registration-queue')
     },
     /** 根据手机号判断宠主是否存在，不存在新增宠主 回显宠主信息*/
     checkOwner() {

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

@@ -707,9 +707,7 @@ export default {
     },
     /** 返回跳转列表页 */
     goBack() {
-      this.$router.push({
-        name: 'Register'
-      })
+      this.$router.push('/service-management/registration-queue')
     },
     /** 获取宠物信息(传参传宠物表id)*/
     getInfo(id) {

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

@@ -118,7 +118,7 @@
 
       <el-table v-loading="loading" :data="registerList" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" label="序号" min-width="55" show-overflow-tooltip prop="index" />
+        <el-table-column align="center" label="序号" min-width="55"  type="index" show-overflow-tooltip prop="index" />
         <el-table-column align="center" label="挂号方式" min-width="70" show-overflow-tooltip prop="type" />
         <el-table-column align="center" label="宠物昵称" min-width="70" show-overflow-tooltip prop="petNickname" />
         <el-table-column align="center" label="宠物保险" min-width="70" show-overflow-tooltip prop="insure" />