Merge remote-tracking branch 'origin/master'

src/assets/icons/svg/zhuyuan_bingwei.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.a{fill:#fff;stroke:#db4747;}.b{fill:#db4747;font-size:14px;font-family:MicrosoftYaHei, Microsoft YaHei;}.c{stroke:none;}.d{fill:none;}</style></defs><g transform="translate(-429 -530)"><g class="a" transform="translate(429 530)"><circle class="c" cx="12" cy="12" r="12"/><circle class="d" cx="12" cy="12" r="11.5"/></g><text class="b" transform="translate(434 547)"><tspan x="0" y="0">危</tspan></text></g></svg>
\ No newline at end of file

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

@@ -41,13 +41,9 @@
                   disabled
                 />
               </el-form-item>
-              <el-form-item label="文章封面" prop="articleCover">
+              <el-form-item label="文章封面" prop="articleCover" style="height: 150px">
                 <!--   0-- 文章信息的页面--文章封面 -->
-                <div class="base-msg">
-                  <div class="petPicture" style="">
-                    <ImagePreview :height="150" :src="baseURL+form.articleCover" :width="150" />
-                  </div>
-                </div>
+                <ImagePreview :height="150" :src="baseURL+form.articleCover" :width="150" style="box-shadow: none" />
               </el-form-item>
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex; ">
@@ -219,7 +215,7 @@ export default {
 
   //1--基本信息--模块内信息整体样式
   .base-msg {
-    width: 700px;
+    width: 900px;
     //color: #666666;
     //display: grid !important;
     //grid-template-columns: repeat(3, auto);

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

@@ -139,10 +139,10 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column class-name="small-padding fixed-width" label="操作" min-width="120">
+        <el-table-column class-name="small-padding fixed-width" label="操作" width="205">
           <template slot-scope="scope">
             <div style="display: flex;">
-              <div style="padding-right: 20px;">
+              <div style="padding-right: 10px;">
                 <el-button
                   icon="el-icon-document"
                   plain
@@ -153,7 +153,7 @@
                 >详情
                 </el-button>
               </div>
-              <div style="padding-right: 20px;">
+              <div style="padding-right: 10px;">
                 <el-button
                   v-hasPermi="['business:article:edit']"
                   plain

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

@@ -865,4 +865,27 @@ export default {
 ::v-deep .cell {
   line-height: 2.125rem;
 }
+::v-deep .el-loading-spinner .circular {
+  display: none;
+}
+::v-deep .el-loading-spinner {
+  width: 56px;
+  height: 56px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-28px, -28px);
+  background: url("../../../assets/images/loading.png");
+  background-size: 100% 100%;
+  animation: loading-rotate 2s linear infinite;
+  @keyframes loading-rotate {
+    0% {
+      transform: rotate(0deg);
+
+    }
+    100% {
+      transform: rotate(360deg);
+
+    }
+  }
+}
 </style>

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

@@ -1220,4 +1220,27 @@ export default {
 ::v-deep .cell {
   line-height: 2.125rem;
 }
+::v-deep .el-loading-spinner .circular {
+  display: none;
+}
+::v-deep .el-loading-spinner {
+  width: 56px;
+  height: 56px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-28px, -28px);
+  background: url("../../../assets/images/loading.png");
+  background-size: 100% 100%;
+  animation: loading-rotate 2s linear infinite;
+  @keyframes loading-rotate {
+    0% {
+      transform: rotate(0deg);
+
+    }
+    100% {
+      transform: rotate(360deg);
+
+    }
+  }
+}
 </style>

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

@@ -1463,4 +1463,27 @@ export default {
 .mapDiv {
   height: 674px;
 }
+::v-deep .el-loading-spinner .circular {
+  display: none;
+}
+::v-deep .el-loading-spinner {
+  width: 56px;
+  height: 56px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-28px, -28px);
+  background: url("../../../assets/images/loading.png");
+  background-size: 100% 100%;
+  animation: loading-rotate 2s linear infinite;
+  @keyframes loading-rotate {
+    0% {
+      transform: rotate(0deg);
+
+    }
+    100% {
+      transform: rotate(360deg);
+
+    }
+  }
+}
 </style>

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

@@ -669,7 +669,7 @@ 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 { listItem } from '@/api/business/item'
 import { mapGetters } from 'vuex'
 import { signHospitalMessage } from '@/api/business/hospital'
 import InputTips from '@/components/InputTips/InputTips.vue'
@@ -842,12 +842,14 @@ export default {
         //   label: '待定'
         // }
       ],
+      itemType: '',
       // 城市
       citys: regionData,
       // 支持服务地区
       serviceAreaS: [],
       // 检查项目下拉框
       checkItemOptions: [],
+      checkItemAll: [],
       serviceArea: [],
       // 可用时段
       useTime: {
@@ -868,6 +870,13 @@ export default {
     this.id = this.$route.query.id
     this.identify = this.$route.query.identify
     this.form.isPrivate = this.$route.query.isPrivate
+    // if (this.form.isPrivate === '0') {
+    //   this.itemType = 3
+    // }
+    // if (this.form.isPrivate === '1') {
+    //   this.itemType = 0
+    // }
+    console.log('是否为医院自有设备', this.form.isPrivate)
     // console.time('start option')
     Promise.all([this.getAreaData(), this.getuseList(), this.getItemByType()])
       .then(_ => {
@@ -1014,8 +1023,10 @@ export default {
       } else if (this.userType === '00') {
         this.itemType = 3
       }
-      return listItemByType({ itemType: this.itemType }).then(res => {
+      return listItem({ itemType: this.itemType }).then(res => {
+        console.log('这是我查到的检查项目', res)
         this.checkItemOptions = res.rows
+        this.checkItemAll = res.rows
       })
     },
     // getAllByType() {
@@ -1144,26 +1155,30 @@ export default {
         this.getUserInfo()
         if (data.checkType != null && data.checkType !== '') {
           data.checkType = data.checkType.split(',').map(Number)
+          console.log(':支持检查项目', data.checkType)
         }
         if (data.useTime !== null && data.useTime !== '') {
           data.useTime = JSON.parse(data.useTime)
         }
         data.createTimeShow = this.replace(data.createTime)
 
-        // 回显检查项目
-        data.checkType = data.checkType.filter(item => {
-          let flag = false
-          this.checkItemOptions.forEach(row => {
-            if (row.id === item) {
-              flag = true
-            }
-          })
-          return flag
-        })
+        // // 回显检查项目
+        // data.checkType = data.checkType.filter(item => {
+        //   let flag = false
+        //   this.checkItemOptions.forEach(row => {
+        //     if (row.id === item) {
+        //       flag = true
+        //     }
+        //   })
+        //   return flag
+        // })
+        console.log(':支持检查项目2', data.checkType)
+        console.log(':支持检查项目All', this.checkItemAll)
 
-        data.checkTypeText = this.checkItemOptions.filter(({ id }) => data.checkType.includes(id))
+        data.checkTypeText = this.checkItemAll.filter(({ id }) => data.checkType.includes(id))
           .map(({ name }) => name)
           .join(',')
+        console.log('支持检查项目文本', data.checkTypeText)
         // 回显服务地区
         const valueGroups = data.serviceArea
         const labelList = []

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

@@ -227,14 +227,27 @@
           >详情
           </el-button>
           <el-button
+            v-if="scope.row.isPrivate === '0'&& userType === '3'"
             v-hasPermi="['business:device:edit']"
             plain
             size="mini"
             type="primary"
             class="el-button--primary--solid"
+            disabled
             @click="editDevice(scope.row)"
           ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
           </el-button>
+          <el-button
+            v-else
+            v-hasPermi="['business:device:edit']"
+            plain
+            size="mini"
+            type="primary"
+            class="el-button--primary--solid"
+            @click="editDevice(scope.row)"
+          ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
+          </el-button>
+
         </template>
       </el-table-column>
 
@@ -253,11 +266,10 @@
 
 <script>
 import { regionData } from 'element-china-area-data'
-import { listDevice, delDevice, listDeviceAll } from '@/api/business/device'
+import { listDevice, delDevice } from '@/api/business/device'
 import { getInfo } from '@/api/login'
 import { parseTime } from '@/utils/ruoyi'
 import { mapGetters } from 'vuex'
-import { listItemByType } from '@/api/business/item'
 
 export default {
   name: 'EquipmentManagement',
@@ -625,65 +637,65 @@ export default {
     //     name: 'EquipmentCheck'
     //   })
     // },
-
-    /**
-     * 全部选择
-     * @param selection 已选择内容
-     * @param all 是否永远进行全选操作
-     */
-    async selectAll(selection = [], all = true) {
-      if (this.deviceList.length !== selection.length && !all) {
-        this.effectTableSelect([])
+    // 选择全部
+    checkAll() {
+      this.ids = this.idsForever
+      // 调用手动勾选
+      this.manualCheck()
+    },
+    // 手动勾选
+    manualCheck() {
+      // 在下一个dom触发
+      this.$nextTick().then(() => {
+        // 当前页结合数据的id只要在临时集合里，就使得复选框勾选
+        this.drugList.forEach(item => {
+          if (this.ids.includes(item.id)) {
+            this.$refs.table.toggleRowSelection(item, true)
           } else {
-        await this.changeTableAllSelect()
+            this.$refs.table.toggleRowSelection(item, false)
           }
+        })
+      })
     },
-    /**
-     * 控制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 })
-        console.log('data', data)
-        this.effectTableSelect(data)
+
+    // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
+    reverseSelection() {
+      const temp = []
+      this.idsForever.forEach(item => {
+        if (!this.ids.includes(item)) {
+          temp.push(item)
         }
-    },
-    // 反向选择
-    reverseSelect() {
-      this.changeTableSelect(this.ids)
-    },
-    // 获取检查项目下拉框
-    getItemByType() {
-      listItemByType({ itemType: this.itemType }).then(res => {
-        console.log('检查项目', res)
-        this.checkItemOptions = res.rows
-        console.log('xdddd', this.checkItemOptions)
       })
+      this.ids = temp
+      console.log('反选的数据', this.ids)
+      this.manualCheck()
+    },
+    // 表格当前手动勾选的
+    selectChange(selection, row) {
+      // 选中行是没有则将当前list里面的数据从ids里情况
+      if (selection.length === 0) {
+        const temp = this.drugList.map(item => {
+          return item.id
+        })
+        this.ids = this.ids.filter(item => {
+          return !temp.includes(item)
+        })
+      } else {
+        // 遍历当前页选中行如果没有的就加上
+        selection.forEach(item => {
+          if (!this.ids.some(idItem => idItem === item.id)) {
+            this.ids.push(item.id)
+          }
+        })
+        // 判断选中行是不是被勾掉了
+        if (row && !selection.some(item => item.id === row.id)) {
+          this.ids = this.ids.filter(item => {
+            return item !== row.id
+          })
+        }
+      }
     },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row)

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

@@ -1274,7 +1274,13 @@ color: #333333;"
               </template>
             </el-table-column>
           </el-table>
-          <div style="color: #FF9D4E; width: 100%;text-align: right;margin-top: 15px">
+          <div
+            style="font-size: 0.875rem;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #FF9D4E;
+    line-height: 1.5625rem;width: 100%;text-align: right;margin-top: 15px"
+          >
             待缴费金额：{{ formatAmount(amountToBePaid) }}
           </div>
         </div>

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

@@ -116,7 +116,11 @@
       <el-table-column label="序号" type="index" align="left" />
       <el-table-column label="病情等级" align="left" prop="diseaseLevel">
         <template slot-scope="scope">
-          <dict-tag v-if="scope.row.diseaseLevel" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
+          <span v-if="scope.row.diseaseLevel==='1'">
+<!--                        <img src="/src/assets/images/zhuyuan_bingwei@2x.png">-->
+            <svg-icon icon-class="zhuyuan_bingwei" />
+          </span>
+          <dict-tag v-else-if="scope.row.diseaseLevel" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
           <span v-else>-</span>
         </template>
       </el-table-column>

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

@@ -229,7 +229,6 @@
     </div>
   </div>
 </template>
-
 <script>
 import { listRegister, getDepartment, checkPet, getDoctorment } from '@/api/business/register'
 import { getInfo } from '@/api/login'