Merge remote-tracking branch 'origin/master'

src/api/business/baseConfig.js

+import request from '@/utils/request'
+
+// 查询基础配置列表
+export function listConfig(query) {
+  return request({
+    url: '/system/baseConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询基础配置详细
+export function getConfig(id) {
+  return request({
+    url: '/system/baseConfig/' + id,
+    method: 'get'
+  })
+}
+
+// 新增基础配置
+export function addConfig(data) {
+  return request({
+    url: '/system/baseConfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改基础配置
+export function updateConfig(data) {
+  return request({
+    url: '/system/baseConfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除基础配置
+export function delConfig(id) {
+  return request({
+    url: '/system/baseConfig/' + id,
+    method: 'delete'
+  })
+}
+
+export function listBaseConfig(query) {
+  return request({
+    url: '/system/baseConfig/wechat/list',
+    method: 'get',
+    params: query
+  })
+}

src/assets/styles/element-ui.scss

@@ -55,6 +55,10 @@
 .el-input--small .el-input__icon {
   color: #AFAFAF;
 }
+.el-input.is-disabled .el-input__inner{
+  color: #333;
+  background-color: #f4f4f4;
+}
 
 .el-form-item__label {
   font-size: 14px;

src/components/ImageUpload/imgUploadForBanner.vue

@@ -45,6 +45,7 @@
           class="el-upload-list__item-thumbnail customer-upload-error"
           :src="file.url"
           :preview-src-list="[file.url]"
+          @error="imgError"
         >
           <div
             slot="error"
@@ -66,6 +67,7 @@
         </label>
         <span class="el-upload-list__item-actions">
           <span
+            v-if="showZoom"
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
           >
@@ -138,6 +140,7 @@ export default {
   },
   data() {
     return {
+      showZoom: true,
       // 图片访问
       baseURL: process.env.VUE_APP_TEST_API,
       queryParams: {
@@ -195,9 +198,14 @@ export default {
     }
   },
   methods: {
+    imgError() {
+      this.showZoom = false
+    },
     // 文件状态改变时
     changeUpload(file) {
       var img = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const fileName = file.name.substring(0, file.name.lastIndexOf('.'))
+      console.log('fileName', fileName)
       const suffix = img === 'jpg' || img === 'png' || img === 'jpeg'
       if (!suffix) {
         this.$message.error('文件格式不正确, 请上传png/jpg/jpeg图片格式文件')
@@ -212,6 +220,13 @@ export default {
           return false
         }
       }
+      const nameTest = /^[^~!@#$^&()_+\-\[\]{};',.]*$/
+      console.log('nameTest', !nameTest.test(fileName))
+      if (!nameTest.test(fileName)) {
+        this.$modal.msgError('不能含有~!@#$^&()_+-[]{};\',.等特殊字符')
+        this.$refs.imageUpload.clearFiles()
+        return false
+      }
       // URL.createObjectURL的参数只能是blob或者file类型
       // 第一种方法用FileReader，URL.createObjectURL接收blob类型
       const reader = new FileReader()
@@ -274,6 +289,7 @@ export default {
     },
     // 上传前loading加载
     handleBeforeUpload(file) {
+      this.showZoom = true
       console.log('图片file---,', file.name)
       const nameTest = /^[^%;]*$/
       if (!nameTest.test(file.name)) {
@@ -328,6 +344,7 @@ export default {
     },
     // 删除图片
     handleDelete(file) {
+      this.showZoom = true
       const findex = this.fileList.map(f => f.name).indexOf(file.name)
       if (findex > -1) {
         this.fileList.splice(findex, 1)

src/components/ImageUpload/index.vue

@@ -45,6 +45,7 @@
           class="el-upload-list__item-thumbnail customer-upload-error"
           :src="file.url"
           :preview-src-list="[file.url]"
+          @error="imgError"
         >
           <div
             slot="error"
@@ -66,6 +67,7 @@
         </label>
         <span class="el-upload-list__item-actions">
           <span
+            v-if="showZoom"
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
           >
@@ -139,6 +141,7 @@ export default {
   },
   data() {
     return {
+      showZoom: true,
       // 图片访问
       baseURL: process.env.VUE_APP_TEST_API,
       queryParams: {
@@ -196,9 +199,14 @@ export default {
     }
   },
   methods: {
+    imgError() {
+      this.showZoom = false
+    },
     // 文件状态改变时
     changeUpload(file) {
       var img = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const fileName = file.name.substring(0, file.name.lastIndexOf('.'))
+      console.log('fileName', fileName)
       const suffix = img === 'jpg' || img === 'png' || img === 'jpeg'
       if (!suffix) {
         this.$message.error('文件格式不正确, 请上传png/jpg/jpeg图片格式文件')
@@ -213,6 +221,13 @@ export default {
           return false
         }
       }
+      const nameTest = /^[^~!@#$^&()_+\-\[\]{};',.]*$/
+      console.log('nameTest', !nameTest.test(fileName))
+      if (!nameTest.test(fileName)) {
+        this.$modal.msgError('不能含有~!@#$^&()_+-[]{};\',.等特殊字符')
+        this.$refs.imageUpload.clearFiles()
+        return false
+      }
       // URL.createObjectURL的参数只能是blob或者file类型
       // 第一种方法用FileReader，URL.createObjectURL接收blob类型
       const reader = new FileReader()
@@ -279,6 +294,7 @@ export default {
 
     // 上传前loading加载
     handleBeforeUpload(file) {
+      this.showZoom = true
       console.log('图片file---,', file.name)
       const nameTest = /^[^%;]*$/
       if (!nameTest.test(file.name)) {
@@ -333,6 +349,7 @@ export default {
     },
     // 删除图片
     handleDelete(file) {
+      this.showZoom = true
       const findex = this.fileList.map(f => f.name).indexOf(file.name)
       if (findex > -1) {
         this.fileList.splice(findex, 1)

src/components/copyRight/copyRight.vue

+<template>
+  <div class="bootmText">
+    <pre v-if="platformMessage.phone ==='' " style="font-family: Microsoft YaHei-Regular, Microsoft YaHei">{{ "Copyright：" + (platformMessage.copyright || '-') }}   {{ "ICP备： "+ ( platformMessage.ICP || '-' ) }}</pre>
+    <pre v-else style="font-family: Microsoft YaHei-Regular, Microsoft YaHei">{{ "Copyright：" +platformMessage.copyright }} {{ "("+platformMessage.phone+") " }}  {{ "ICP备："+platformMessage.ICP }}</pre>
+  </div>
+</template>
+
+<script>
+import { listConfig } from '@/api/business/baseConfig'
+import { parseStrEmpty } from '@/utils/ruoyi'
+
+export default {
+  name: 'CopyRight',
+  data() {
+    return {
+      // 平台信息
+      platformMessage: {
+        logo: null, // 平台log
+        ICP: null, // ICP备案号
+        copyright: null, // 版权所有
+        phone: null, // 客服电话
+        email: null // 客服邮箱
+      }
+    }
+  },
+  watch: {},
+  created() {
+    this.getPlatformMessage()
+  },
+  methods: {
+    // 获取平台的基础配置
+    getPlatformMessage() {
+      listConfig({ type: '2' }).then(response => {
+        if (response.rows.length !== 0) {
+          const data = response.rows[0]
+          // 如果查询出来的平台基础数据个数不为0, 将内容反序列化赋给平台信息
+          this.platformMessage = JSON.parse(data.content)
+          this.platformMessage.phone = parseStrEmpty(this.platformMessage.phone)
+          console.log('获取平台基础设置', this.platformMessage)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bootmText{
+  padding-top: 20px;
+  width: 100%;
+  text-align: center;
+  color: #999999;
+  font-size: 12px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+  font-weight: 400;
+  line-height: 25px;
+  position: absolute;
+  bottom: 0;
+}
+</style>

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

@@ -86,7 +86,7 @@
               @click="handleExport"
             >
               <!-- 导入svg文件-->
-              <svg-icon icon-class="shaixuan_icon_daochu" style="font-size: 11px" />
+              <svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />
               批量导出
             </el-button>
           </el-form-item>

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

@@ -132,7 +132,7 @@
 
     <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#F4F4F4'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
-      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column type="index" label="序号" min-width="50" />
       <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
       <el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />
       <el-table-column label="负责人" align="left" prop="head" show-overflow-tooltip>

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

@@ -7,6 +7,7 @@
           v-model.trim="queryParams.searchText"
           placeholder="请输入设备名称/设备ID"
           clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item prop="status">
@@ -89,7 +90,7 @@
 
     <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys" :header-cell-style="{background:'#F4F4F4'}" @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
-      <el-table-column type="index" label="序号" min-width="60" />
+      <el-table-column type="index" label="序号"  width="80" />
       <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.deviceName || '-' }}</span>

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

@@ -434,8 +434,8 @@ color: #333333;"
                 <el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="margin-left: -40px">
-              <el-form-item label="主诉" prop="mainSuit">
+            <el-col :span="24">
+              <el-form-item label="主诉" prop="mainSuit" style="margin-left: -40px">
                 <el-input
                   v-model.trim="detailInfo.mainSuit"
                   :disabled="!isEdit"
@@ -443,7 +443,7 @@ color: #333333;"
                   :placeholder="isEdit? '请输入主诉' : '-'"
                   type="textarea"
                   show-word-limit
-                  style="width: 97.4%!important"
+                  style="width: 97.6%!important"
                 />
               </el-form-item>
             </el-col>
@@ -456,7 +456,7 @@ color: #333333;"
                   maxlength="400"
                   :placeholder="isEdit? '请输入医嘱' : '-'"
                   type="textarea"
-                  style="width: 97.4%!important"
+                  style="width: 97.6%!important"
                 />
               </el-form-item>
             </el-col>
@@ -467,7 +467,7 @@ color: #333333;"
                   :disabled="!isEdit"
                   maxlength="20"
                   :placeholder="isEdit? '请输入诊断结果' : '-'"
-                  style="width: 97.4%!important"
+                  style="width: 97.6%!important"
                 />
               </el-form-item>
             </el-col>
@@ -606,9 +606,9 @@ color: #333333;"
                   <span v-if="scope.row.inputShow">-</span>
                   <span
                     v-else
-                    :style="showStatus(scope.row.payStatus) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payStatus) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
+                    :style="showStatus(scope.row.paymentStatus) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.paymentStatus) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
                   >{{
-                    showStatus(scope.row.payStatus) || '-'
+                    showStatus(scope.row.paymentStatus) || '-'
                   }}</span>
                 </template>
               </el-table-column>
@@ -810,9 +810,9 @@ color: #333333;"
                   <span v-if="scope.row.inputShow">-</span>
                   <span
                     v-else
-                    :style="showStatus(scope.row.payStatus) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payStatus) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
+                    :style="showStatus(scope.row.payType) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payType) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
                   >{{
-                    showStatus(scope.row.payStatus) || '-'
+                    showStatus(scope.row.payType) || '-'
                   }}</span>
                 </template>
               </el-table-column>
@@ -996,9 +996,9 @@ color: #333333;"
                   <span v-if="scope.row.inputShow">-</span>
                   <span
                     v-else
-                    :style="showStatus(scope.row.payStatus) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payStatus) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
+                    :style="showStatus(scope.row.payType) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payType) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')"
                   >{{
-                    showStatus(scope.row.payStatus) || '-'
+                    showStatus(scope.row.payType) || '-'
                   }}</span>
                 </template>
               </el-table-column>
@@ -1353,13 +1353,34 @@ color: #333333;"
           </el-col>
         </el-form>
         <!--底部返回按钮-->
-        <el-button v-if="isEdit" class="queryBtn" style="margin-top: 10px; margin-left: 85px;" icon="el-icon-check" @click="submit">提 交
-        </el-button>
-        <el-button v-if="isEdit"  class="resetBtn" style="margin-top: 10px; margin-left: 16px;" icon="el-icon-back" @click="goBack">返
-          回
-        </el-button>
-<!--详情情况下-->
-        <el-button v-else-if="!isEdit" class="resetBtn" style="margin-top: 10px; margin-left: 84px;" icon="el-icon-back" @click="goBack">返
+        <back-btn
+          v-if="isEdit"
+          :loading="submiting"
+          :button-class="'queryBtn'"
+          style="margin-top: 10px; margin-left: 85px;"
+          :button-icon="'el-icon-check'"
+          :click-action="submit"
+          class="queryBtn"
+          button-text="提 交"
+          :is-show-confirm="$route.params.type === type"
+        />
+        <back-btn
+          v-if="isEdit"
+          button-text="返 回"
+          button-class="resetBtn"
+          style="margin-top: 10px; margin-left: 16px;"
+          :click-action="goBack"
+          class="resetBtn"
+          :is-show-confirm="$route.params.type === type"
+        />
+        <!--详情情况下-->
+        <el-button
+          v-else-if="!isEdit"
+          class="resetBtn"
+          style="margin-top: 10px; margin-left: 84px;"
+          icon="el-icon-back"
+          @click="goBack"
+        >返
           回
         </el-button>
       </div>
@@ -1386,6 +1407,7 @@ color: #333333;"
   </div>
 </template>
 <script>
+import backBtn from '@/components/BackBtn'
 import { isEmpty, parseTime, selectDictLabel } from '@/utils/ruoyi'
 // 引入进度信息模组件
 import scheduleInfo from '@/views/service-management/registration-queue/components/schedule-info'
@@ -1413,7 +1435,9 @@ export default {
   dicts: ['pet_sex', 'ward_type', 'payment_status', 'hospital_status_in', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'pet_breed', 'other_breed', 'check_type', 'payment_status', 'disease_level', 'treat_type'],
   components: {
     // 引入进度信息模组件
-    scheduleInfo
+    scheduleInfo,
+    /* 二次删除 */
+    backBtn
   },
   /* 缴费金额的格式化 */
   filters: {
@@ -1425,6 +1449,7 @@ export default {
   },
   data() {
     return {
+      submiting: false, // 提交按钮loading flag
       /* 默认头像 */
       defaultImage: a,
       drugOptions: [], // 药品列表
@@ -1836,6 +1861,7 @@ export default {
     submit() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.submiting = true
           const temp = {
             'id': this.detailInfo.id,
             'medicalRecordNo': this.detailInfo.medicalRecordNo,
@@ -1863,23 +1889,15 @@ export default {
             'followStatus': this.detailInfo.followStatus
           }
           console.log('病例编辑页的提交字段大集合!!!', temp)
-          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            customClass: 'box-logout',
-            cancelButtonClass: 'resetBtn',
-            confirmButtonClass: 'queryBtn',
-            type: 'warning',
-            closeOnClickModal: false
-          }).then(() => {
-            editRecord(temp).then(res => {
-              this.$message({
-                type: 'success',
-                message: '编辑成功'
-              })
-              console.log('editRecord', res)
-              this.$router.push('/medical-record-management/index')
+          editRecord(temp).then(res => {
+            this.$message({
+              type: 'success',
+              message: '编辑成功'
             })
+            console.log('editRecord', res)
+            this.$router.push('/medical-record-management/index')
+          }).finally(() => {
+            this.submiting = false
           })
         }
       })
@@ -2023,6 +2041,7 @@ export default {
         }
         console.log(this.stockDispenseOutboundList, 'kkkkkkkkkkkkkkkkkkkkkkk')
         // 住院情况
+        this.petInHospitalList = []
         if (response.data.inHospitalBo.status === '0' || response.data.inHospitalBo.status === '1' || response.data.inHospitalBo.status === '2') {
           this.petInHospitalList.push(response.data.inHospitalBo)
           this.petInHospitalStatus = false

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

@@ -224,6 +224,7 @@
         :limit.sync="queryParams.pageSize"
         :page.sync="queryParams.pageNum"
         :total="total"
+        style="margin-bottom: unset !important;"
         @pagination="getList"
       />
     </div>
@@ -651,5 +652,11 @@ export default {
     width: 100% !important;
   }
 }
+::v-deep .el-select .el-input.is-disabled .el-input__inner {
+  color: #333333 !important;
+}
 
+::v-deep .el-select__tags-text {
+  color: #333333 !important;
+}
 </style>

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

@@ -91,10 +91,11 @@
       <el-button
         v-hasPermi="['business:check:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-back"
         size="mini"
         @click="reverseSelect()"
-      >反向选择
+      >
+        <svg-icon icon-class="shuaixuan_icon_fanxiang" />
+        反向选择
       </el-button>
       <el-button
         v-hasPermi="['business:check:export']"

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

@@ -262,6 +262,7 @@ export default {
       }
       this.total = 0
       this.petsList = []
+      this.$refs.table.clearSelection()
       this.$emit('petModleClose', false)
     },
     /** 功能按钮--搜索按钮操作 */

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

@@ -221,6 +221,7 @@
         :limit.sync="queryParams.pageSize"
         :page.sync="queryParams.pageNum"
         :total="total"
+        style="margin-bottom: unset !important;"
         @pagination="getList"
       />
     </div>

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

@@ -61,10 +61,11 @@
       <el-button
         v-hasPermi="['business:manage:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-back"
         size="mini"
         @click="reverseSelect(treatmentList)"
-      >反向选择
+      >
+        <svg-icon icon-class="shuaixuan_icon_fanxiang" />
+        反向选择
       </el-button>
       <el-button
         v-hasPermi="['business:manage:export']"