Merge remote-tracking branch 'origin/master'

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -634,7 +634,7 @@ export default {
       customerStatistics: {},
       mapData: [],
       yData1: {
-        label: '新增用户量',
+        label: '新增注册量',
         data: [],
         line_color: '#3490CE',
         area_color: 'rgba(52,144,206,0.3)',

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

@@ -77,25 +77,26 @@
 
               <el-col :span="16">
                 <el-form-item label="服务地点">
-                  <el-cascader
-                    ref="serviceArea"
-                    v-model="form.selectedOptions"
-                    size="large"
-                    :options="areaOptions"
-                    placeholder="-"
-                    expand-trigger="hover"
-                    clearable
-                    class="overflow-hidden"
-                    @change="handleChangeCascader"
-                    @mouseover.native="showTooltip = true"
-                    @mouseout.native="showTooltip = false"
-                  >
-                    <template #suffix>
-                      <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">
-                        <i class="el-icon-question" />
-                      </el-tooltip>
-                    </template>
-                  </el-cascader>
+                  <InputTips :text="form.selectedOptions" class="inputWidth" />
+                  <!--                  <el-cascader-->
+                  <!--                    ref="serviceArea"-->
+                  <!--                    v-model="form.selectedOptions"-->
+                  <!--                    size="large"-->
+                  <!--                    :options="areaOptions"-->
+                  <!--                    placeholder="-"-->
+                  <!--                    expand-trigger="hover"-->
+                  <!--                    clearable-->
+                  <!--                    class="overflow-hidden"-->
+                  <!--                    @change="handleChangeCascader"-->
+                  <!--                    @mouseover.native="showTooltip = true"-->
+                  <!--                    @mouseout.native="showTooltip = false"-->
+                  <!--                  >-->
+                  <!--                  <template #suffix>-->
+                  <!--                    <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">-->
+                  <!--                      <i class="el-icon-question" />-->
+                  <!--                    </el-tooltip>-->
+                  <!--                  </template>-->
+                  <!--                  </el-cascader>-->
                 </el-form-item>
                 <el-form-item prop="address">
                   <el-input
@@ -652,11 +653,13 @@ import { getInfo } from '@/api/login'
 import { listCheckManage } from '@/api/business/manage'
 import { isEmpty, parseTime } from '@/utils/ruoyi'
 import { deepClone } from '@/utils'
-import { listItemByType } from '@/api/business/item'
+import { listAllByType, listItemByType } from '@/api/business/item'
 import { mapGetters } from 'vuex'
 import { signHospitalMessage } from '@/api/business/hospital'
+import InputTips from '@/components/InputTips/InputTips.vue'
 export default {
   name: 'EquipmentDetail',
+  components: { InputTips },
   dicts: ['device_status', 'device_type', 'exam_type', 'check_type', 'service_area'],
   data() {
     return {
@@ -894,6 +897,8 @@ export default {
           this.itemType = 3
         }
         this.getItemByType()
+        this.getAllByType()
+
         console.log('登陆人', res)
       })
     },
@@ -1043,6 +1048,22 @@ export default {
         console.log('  this.checkTypeText', this.form.checkTypeText)
       })
     },
+    getAllByType() {
+      listAllByType({ itemType: this.itemType }).then(res => {
+        console.log('检查全部项目', res)
+        this.checkItemOptions = res.rows
+        // console.log('xdddd', this.checkItemOptions)
+        const result = []
+        const ids = [... this.form.checkType]
+        for (let i = 0; i < this.checkItemOptions.length; i++) {
+          if (ids.includes(parseInt(this.checkItemOptions[i].id))) {
+            result.push(this.checkItemOptions[i].name)
+          }
+        }
+        // this.form.checkTypeText = result
+        // console.log('  this.checkTypeText', this.form.checkTypeText)
+      })
+    },
     // 获取地址数据
     getAreaData() {
       getAreTreeStructure().then(response => {
@@ -1208,6 +1229,8 @@ export default {
         this.form = response.data
         console.log('查询是否为医院设备', this.form.isPrivate)
         this.form.selectedOptions = response.data.addressCode.split(',').map(Number)
+        console.log('地址编码-------------', this.form.selectedOptions)
+        this.getAreNameById(this.form.selectedOptions)
         // if (this.form.isPrivate === '1') {
         //   signHospitalMessage().then(response => {
         //     console.log('查到医院信息', response)

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

@@ -176,7 +176,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="宠物品种">
-                <el-input v-model="form.petBreed" :disabled="true" placeholder="-" />
+                <el-input v-model="form.petBreed" :disabled="true" placeholder="-"  class="half__-5px"  />
+                <el-input
+                  v-model="form.petChildBreed"
+                  placeholder="-"
+                  class="petChildBreed half"
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -566,6 +572,15 @@ export default {
 
 }
 
+.half__-5px {
+  width: calc(50% - 5px) !important;
+}
+.half {
+  width: 50% !important;
+}
+.petChildBreed {
+  margin-left: 5px;
+}
 .tip1 {
   height: 30px;
   border-left: 5px solid #5bb647;

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

@@ -1090,7 +1090,7 @@ color: #333333;"
               >
                 <template slot-scope="scope">
                   <el-button
-                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
+                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && ( scope.row.status === '0' || scope.row.status === '1' )"
                     icon="el-icon-edit"
                     plain
                     size="mini"