Merge remote-tracking branch 'origin/master'

src/views/article-management/article-edit.vue

@@ -31,7 +31,7 @@
                 />
               </el-form-item>
               <el-form-item label="文章封面" prop="articleCover">
-                <image-upload v-model="form.articleCover" limit="1" :is-show-tip="false" />
+                <image-upload v-model="form.articleCover" :limit="1" :is-show-tip="false" />
               </el-form-item>
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex;">

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

@@ -379,7 +379,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: 'change' }

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

@@ -26,10 +26,10 @@
                 <el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="isPrivate">
                   <el-select v-model="form.isPrivate" disabled style="width: 250px">
                     <el-option
-                      v-for="index in optionss"
+                      v-for="(item, index) in optionss"
                       :key="index"
-                      :label="index.label"
-                      :value="index.value"
+                      :label="item.label"
+                      :value="item.value"
                     />
                   </el-select>
                 </el-form-item>
@@ -69,6 +69,7 @@
                   <el-cascader
                     ref="serviceArea"
                     v-model="form.selectedOptions"
+                    disabled
                     size="large"
                     :options="cityOptions"
                     placeholder="暂无数据"
@@ -180,7 +181,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <e-col :span="8">
+              <el-col :span="8">
                 <el-form-item label="下午开始时间">
                   <el-time-select
                     v-model="form.useTime.pme"
@@ -198,7 +199,7 @@
                     }"
                   />
                 </el-form-item>
-              </e-col>
+              </el-col>
             </el-row>
             <!--            6-->
             <el-row>
@@ -335,9 +336,9 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
+                <el-form-item v-if="hpshow" label="医院自有设备">
 
-                  <el-select v-model="form.isPrivate"disabled style="width: 250px" placeholder="请选择医院自有设备">
+                  <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="(item ,index) in optionss"
                       :key="index"
@@ -381,7 +382,7 @@
                 <el-form-item label="服务地点" prop="selectedOptions">
                   <el-cascader
                     ref="serviceArea"
-                    v-model="selectedOptions"
+                    v-model="form.selectedOptions"
                     size="large"
                     :options="cityOptions"
                     placeholder="请选择服务地点"
@@ -650,7 +651,7 @@ export default {
 
       cityOptions: regionData,
       // 存储省市区选中的地址码
-      selectedOptions: [],
+      // selectedOptions: [],
       // 地址码对用的文字
       addtions: {
         names: ''
@@ -702,9 +703,13 @@ export default {
         deviceType: [
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
-        addressCode: [
-          { required: true, message: '请选择服务地点', trigger: 'change,blur' }
+        selectedOptions: [
+          // { required: true, message: '请选择服务地点', trigger: 'blur' }
+          { required: true, validator: this.validaddress, trigger: 'blur' }
         ],
+        // addressCode: [
+        //   { required: true, message: '请选择服务地点', trigger: 'change,blur' }
+        // ],
         address: [
           { required: true, message: '请输入服务地址', trigger: 'blur' }
         ],
@@ -861,7 +866,7 @@ export default {
     },
     // 权重不能为0
     validWeigh(rule, value, callback) {
-      console.log('value', value)
+      // console.log('value', value)
       if (value > 0) {
         callback()
       } else {
@@ -870,22 +875,30 @@ export default {
     },
     // 单位时段服务数不能为0
     validUseNum(rule, value, callback) {
-      console.log('value', value)
+      // console.log('value', value)
       if (value > 0) {
         callback()
       } else {
         callback(new Error('单位时段服务数不能为0'))
       }
     },
+    validaddress(rule, value, callback) {
+      console.log('validaddress', this.form.selectedOptions)
+      if (this.form.selectedOptions.length>0) {
+        callback()
+      } else {
+        callback(new Error('请选择服务地点'))
+      }
+    },
     // 四个时间的表单校验
     validateMorningStart(rule, value, callback) {
       // // TODO: please clear this log
       const morningEnd = this.form.useTime.ame
-      console.log('value', value)
-      console.log('morningEnd', morningEnd)
-      console.log('this.form.useTime.ame', this.form.useTime.ame)
-      console.log('this.form.useTime.pms', this.form.useTime.pms)
-      console.log('his.form.useTime.pme', this.form.useTime.pme)
+      // console.log('value', value)
+      // console.log('morningEnd', morningEnd)
+      // console.log('this.form.useTime.ame', this.form.useTime.ame)
+      // console.log('this.form.useTime.pms', this.form.useTime.pms)
+      // console.log('his.form.useTime.pme', this.form.useTime.pme)
       // if (isEmpty(value) && isEmpty(this.form.useTime.ams) || isEmpty(this.form.useTime.ame))
       if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
         console.log('上午开始时间第一层报错')
@@ -943,16 +956,16 @@ export default {
     },
     // 选择地址
     handleChangeAddress(value) {
-      this.selectedOptions = value
-      console.log('地区码', this.selectedOptions)
+      this.form.selectedOptions = value
+      console.log('地区码', this.form.selectedOptions)
       var name = ''
-      this.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起
+      this.form.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起
       this.addtions.names = name
       console.log(this.addtions.names)
       // 运用了CodeToText把编码转成了中文
-      this.addForm.province = CodeToText[this.selectedOptions[0]]
-      this.addForm.county = CodeToText[this.selectedOptions[1]]
-      this.addForm.area = CodeToText[this.selectedOptions[2]]
+      this.addForm.province = CodeToText[ this.form.selectedOptions[0]]
+      this.addForm.county = CodeToText[ this.form.selectedOptions[1]]
+      this.addForm.area = CodeToText[ this.form.selectedOptions[2]]
       if (this.addForm.county === '市辖区' || this.addForm.county === '县') {
         this.city = this.addForm.province
       } else {
@@ -964,9 +977,9 @@ export default {
     // 提交
     submitForm() {
       const form = deepClone(this.form)
-      console.log('selectedOptions', this.selectedOptions)
-      if (this.selectedOptions != null) {
-        form.addressCode = this.selectedOptions.join(',')
+      console.log('selectedOptions', form.selectedOptions)
+      if (form.selectedOptions != null) {
+        form.addressCode = form.selectedOptions.join(',')
       }
       if (this.addtions.names != null) {
         form.addressText = this.addtions.names
@@ -1022,15 +1035,13 @@ export default {
     handleUpdate() {
       getDevice(this.id).then(response => {
         this.form = response.data
-        if (this.selectedOptions != null && this.selectedOptions !== '') {
-          this.selectedOptions = response.data.addressCode.split(',')
-          console.log(':fsdfsddddddddd???????', response.data.addressCode)
-          console.log('详细个bbbbb', this.selectedOptions)
-          console.log('详细个ccccccccccc', this.form.selectedOptions)
-        }
-        if (this.form.serviceArea != null && this.form.serviceArea !== '') {
-          this.form.serviceArea = response.data.serviceArea.split(',')
-        }
+        // if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
+        this.form.selectedOptions = response.data.addressCode.split(',')
+        //
+        // }
+        // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
+        this.form.serviceArea = response.data.serviceArea.split(',')
+        // }
         if (this.form.checkType != null && this.form.checkType !== '') {
           this.form.checkType = response.data.checkType.split(',')
         }
@@ -1039,7 +1050,9 @@ export default {
           this.form.useTime = JSON.parse(response.data.useTime)
         }
         // this.checkType = response.data.checkType.split(',')
-
+        console.log(':fsdfsddddddddd???????', response.data.addressCode)
+        console.log('详细个bbbbb', this.selectedOptions)
+        console.log('详细个ccccccccccc', this.form.selectedOptions)
         console.log('详情数据---', this.form)
         // this.serviceAreaS = this.form.serviceArea.split(';')
         // this.serviceArea = []

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

@@ -53,12 +53,18 @@
       <el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip />
       <el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip />
       <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip />
+      <!--      <el-table-column-->
+      <!--        align="center"-->
+      <!--        label="宠物品种"-->
+      <!--        min-width="80"-->
+      <!--        prop="petBreed"-->
+      <!--        show-overflow-tooltip-->
+      <!--     />-->
       <el-table-column
+        :formatter="(row, col, cell) => cell && options[cell.substring(0, 1)].children.find(({value}) => value == Number(cell.substring(1))) && options[cell.substring(0, 1)].children.find(({value}) => value == Number(cell.substring(1))).label"
         align="center"
         label="宠物品种"
-        min-width="80"
         prop="petBreed"
-        show-overflow-tooltip
       />
       <el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -86,6 +92,8 @@
 import { getPetInfo } from '@/api/business/registration'
 import { deepClone } from '@/utils'
 export default {
+  // 数据字典
+  dicts: ['pet_breed', 'cat_breed', 'dog_breed', 'other_breed'],
   name: 'ChoosePet',
   props: {
     isShow: {
@@ -137,6 +145,20 @@ export default {
     // this.getList()
   },
   methods: {
+    /**
+     * 字典获取完成的回调
+     */
+    onDictReady() {
+      this.setPetBreed()
+    },
+    /**
+     * 设置宠物品种信息
+     */
+    setPetBreed() {
+      this.options[0].children = this.dict.type.cat_breed
+      this.options[1].children = this.dict.type.dog_breed
+      this.options[2].children = this.dict.type.other_breed
+    },
     /** 列表区--多选框选中数据 */
     handleSelectionChange(selection) {
       console.log('selection', selection)

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

@@ -348,6 +348,16 @@ export default {
     }
 
   },
+  watch: {
+    registerForm(val) {
+      if (val.checkManageBos.length > 0) {
+        this.prescribingForm.inspect = [...val.checkManageBos]
+      }
+      if (val.treatManageBo.length > 0) {
+        this.prescribingForm.treatment = [...val.treatManageBo]
+      }
+    }
+  },
   data() {
     const validNum = (rule, value, callback) => {
       console.log('这是自定义校验', value)
@@ -452,7 +462,8 @@ export default {
           return {
             label: item.name,
             value: item.id,
-            type: item.type
+            type: item.type,
+            price: item.price
           }
         })
         console.log('treatItemOptions!!!!!!!!!!!!!', this.treatItemOptions)

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

@@ -56,7 +56,7 @@
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="160">
         <template #default="{row}">
           <el-button
-            :disabled="!inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1])"
+            :disabled="registrationType !== '0' ? !inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1]) : afterTime(row.hours.split('~')[0], row.hours.split('~')[1])"
             icon="el-icon-document"
             plain
             size="mini"
@@ -180,6 +180,7 @@ export default {
      * @param end 结束时间 时:分
      */
     inTimeRange(start, end) {
+      console.log(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] })
@@ -191,6 +192,17 @@ export default {
       console.log(`endTime.format('YYYY/MM/DD HH:mm:ss')`, endTime.format('YYYY/MM/DD HH:mm:ss'))
       return current.isBetween(startTime, endTime, 'minute')
     },
+    /**
+     * 判断当前时间是否在传入的时间范围后
+     * @param start 开始时间 时:分
+     * @param end 结束时间 时:分
+     */
+    afterTime(start, end) {
+      console.log(start, end)
+      const current = moment()
+      const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] })
+      return current.isAfter(endTime)
+    },
     parseTime,
     /**
      * 获取医生当日排班列表
@@ -240,7 +252,7 @@ export default {
         petOwnersName: this.doctorForm.nickName,
         petOwnersPhone: this.doctorForm.phoneNumber,
         petNickname: this.doctorForm.petNickname,
-        petBreed: this.doctorForm.petBreed,
+        petBreed: this.doctorForm.petBreed.join(),
         petSex: this.doctorForm.petSex,
         petBirthday: this.doctorForm.petBirthday.replaceAll('-', '/'),
         petWeight: this.doctorForm.petWeight,

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

@@ -36,20 +36,17 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物品种:" prop="petBreed">
-            <el-select
-              v-model="form.petBreed"
-              :disabled="!isEdit"
-              clearable
-              placeholder="请选择宠物品种"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="(item, index) in dict.type.pet_breed"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
+            <el-form-item prop="petBreed">
+              <el-cascader
+                v-model.trim="form.petBreed"
+                placeholder="请选择宠物品种"
+                :options="options"
+                :disabled="!isEdit"
+                :props="props"
+                clearable
+                collapse-tags
               />
-            </el-select>
+            </el-form-item>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -89,6 +86,7 @@
               <div>
                 <el-input
                   v-model="form.petWeight"
+                  maxlength="10"
                   :disabled="!isEdit"
                 />
               </div>
@@ -98,7 +96,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物毛色:" prop="petColor">
-            <el-input v-model="form.petColor" :disabled="!isEdit" maxlength="20" placeholder="请输入宠物毛色" />
+            <el-input v-model="form.petColor" :disabled="!isEdit" maxlength="10" placeholder="请输入宠物毛色" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -250,7 +248,7 @@ import { checkPetOwner } from '@/api/business/registration'
 export default {
   name: 'RegistrationAdd',
   // 数据字典
-  dicts: ['pet_breed', 'pet_sex', 'sterilization_status', 'pet_insure', 'vaccine_situation'],
+  dicts: ['pet_breed', 'pet_sex', 'sterilization_status', 'pet_insure', 'vaccine_situation', 'cat_breed', 'dog_breed', 'other_breed'],
   components: {
     choosePet,
     doctorDetail,
@@ -295,7 +293,7 @@ export default {
         // 宠物状态位
         petStatus: '',
         petNickname: '',
-        petBreed: '',
+        petBreed: [],
         petSex: '',
         petBirthday: '',
         petWeight: '',
@@ -357,7 +355,22 @@ export default {
           { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
           { pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
-      }
+      },
+      // 宠物品种下拉框--一级选项(二级进行字典维护)
+      props: { expandTrigger: 'hover' },
+      options: [{
+        value: '0',
+        label: '猫',
+        children: []
+      }, {
+        value: '1',
+        label: '狗',
+        children: []
+      }, {
+        value: '2',
+        label: '其它',
+        children: []
+      }]
     }
   },
   watch: {
@@ -367,7 +380,7 @@ export default {
       const temp = {
         petsId: '-',
         petNickname: '',
-        petBreed: '',
+        petBreed: [],
         petSex: '',
         petBirthday: '',
         petWeight: '',
@@ -506,6 +519,7 @@ export default {
     },
     // 获取所有医生列表
     getpesonlist() {
+
       // queryPeopleList1().then(res => {
       //   console.log('医生列表', res)
       //   this.pesonlist = res.data
@@ -521,6 +535,20 @@ export default {
         this.form.personName = this.pesonlist.find(item => item.userId === value).nickName
         this.form.phone = this.pesonlist.find(item => item.userId === value).phonenumber
       }
+    },
+    /**
+     * 字典获取完成的回调
+     */
+    onDictReady() {
+      this.setPetBreed()
+    },
+    /**
+     * 设置宠物品种信息
+     */
+    setPetBreed() {
+      this.options[0].children = this.dict.type.cat_breed
+      this.options[1].children = this.dict.type.dog_breed
+      this.options[2].children = this.dict.type.other_breed
     }
   }
 }

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

@@ -61,8 +61,15 @@ color: #333333;"
                   </el-col>
                   <el-col :span="8">
                     <!--宠物品种-->
-                    <el-form-item label="宠物品种">
-                      <el-input v-model="detailInfo.petBreed" disabled />
+                    <el-form-item label="宠物品种" prop="petBreed">
+                      <el-cascader
+                        v-model.trim="detailInfo.petBreed"
+                        placeholder="请选择宠物品种"
+                        :options="options"
+                        disabled
+                        :props="props"
+                        collapse-tags
+                      />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -580,6 +587,8 @@ export default {
           value: '5'
         }
       ],
+      // 宠物品种下拉框--一级选项(二级进行字典维护)
+      props: { expandTrigger: 'hover' },
       // 品种数据字典
       options: [{
         value: '0',