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

@@ -240,7 +240,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',