Merge remote-tracking branch 'origin/master'

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

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >详情</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--  文章信息 -->
           <div class="tip-green" />

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

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >编辑</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -154,6 +154,9 @@ export default {
           this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
             type: 'warning'
           }).then(() => {
             updateArticle(this.form).then(response => {
@@ -288,7 +291,9 @@ export default {
     background-color: #F6FCF5 !important;
   }
 }
-
+::v-deep .el-card__body {
+  padding: unset !important;
+}
 //富文本宽设置
 ::v-deep .el-form-item__content {
   width: 700px;

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

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >新增</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -256,6 +256,9 @@ export default {
   display: flex;
   text-align: left;
 }
+::v-deep .el-card__body {
+  padding: unset !important;
+}
 
 //小标题样式
 .title-font-style {

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

@@ -137,7 +137,7 @@
             </el-table-column>
             <el-table-column label="状态" min-width="60" prop="articleStatus" show-overflow-tooltip>
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.article_status" :value="scope.row.articleStatus" />
+                <span :style="showStatus(scope.row.articleStatus) === '• 已上架' ? 'color: #67C23A' : 'color: #F56C6C'">{{ showStatus(scope.row.articleStatus) || '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column class-name="small-padding fixed-width" label="操作" min-width="100">
@@ -306,7 +306,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         articleTitle: null,
         articleCreateTime: null,
         articleStatus: null,
@@ -330,6 +330,16 @@ export default {
     this.getList()
   },
   methods: {
+    // 上架状态 value 和label 的转换
+    showStatus(date) {
+      if (date === null) {
+        return null
+      } else if (date === '0') {
+        return '• 已上架'
+      } else if (date === '1') {
+        return '• 已下架'
+      }
+    },
     cellClass(row) {
       if (row.columnIndex === 0) {
         return 'disabledCheck'

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

@@ -370,7 +370,8 @@ export default {
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         selectedOptions: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' }
+          { required: true, message: '请选择服务地点', trigger: 'blur' },
+          { type: 'number', validator: this.validaddress, trigger: 'change' }
         ],
         useNum: [
           { required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' },
@@ -405,10 +406,12 @@ export default {
           { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
         ],
         serviceArea: [
-          { required: true, message: '请选择支持服务地区', trigger: 'blur' }
+          { required: true, message: '请选择支持服务地区', trigger: 'blur' },
+          { type: 'number', validator: this.validserviceArea, trigger: 'change' }
         ],
         checkType: [
-          { required: true, message: '请选择支持检查类型', trigger: 'blur' }
+          { required: true, message: '请选择支持检查类型', trigger: 'blur' },
+          { type: 'number', validator: this.validcheckType, trigger: 'change' }
         ]
       },
       // 是否医院自有设备
@@ -574,6 +577,33 @@ export default {
       }
       console.log('中文', this.addForm)
     },
+    // 服务地点表单校验
+    validaddress(rule, value, callback) {
+      console.log('validaddress', this.form.selectedOptions)
+      if (this.form.selectedOptions.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择服务地点'))
+      }
+    },
+    // 支持服务地区表单校验
+    validserviceArea(rule, value, callback) {
+      console.log('validaddress', this.form.serviceArea)
+      if (this.form.serviceArea.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持检查项目'))
+      }
+    },
+    // 支持检查类型表单校验
+    validcheckType(rule, value, callback) {
+      console.log('validaddress', this.form.checkType)
+      if (this.form.checkType.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持服务地区'))
+      }
+    },
     // 四个时间的表单校验
     validateMorningStart(rule, value, callback) {
       // // TODO: please clear this log

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

@@ -266,7 +266,7 @@
               <el-col>
                 <el-form-item label="支持服务地区">
                   <el-input
-                    v-model.trim="form.serviceAreaList"
+                    v-model.trim="form.serviceAreaText"
                     type="textarea"
                     style="width:705%;;"
                     :row="4"
@@ -278,11 +278,11 @@
             <!--            9-->
             <el-row>
               <el-col>
-                <el-form-item label="支持检查类型">
+                <el-form-item label="支持检查项目">
                   <el-input
-                    v-model.trim="form.checkTypeList"
+                    v-model.trim="form.checkTypeText"
                     type="textarea"
-                    style="width:705%;;"
+                    style="width:705%;"
                     :row="4"
                     disabled
                   />
@@ -674,8 +674,8 @@ export default {
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
-        serviceAreaList: [],
-        checkTypeList: [],
+        serviceAreaText: [],
+        checkTypeText: [],
         head: '',
         phone: '',
         deviceType: '',
@@ -1058,8 +1058,8 @@ export default {
         // }
         // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
         console.log('this.form.serviceArea', this.form.serviceArea)
-        this.form.serviceAreaList = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
-        console.log(' this.form.serviceAreaList', this.form.serviceAreaList)
+        this.form.serviceAreaText = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
+        console.log(' this.form.serviceAreaText', this.form.serviceAreaText)
         this.form.serviceArea = response.data.serviceArea.split(',')
 
         // this.getDicts('service_area').then(response => {
@@ -1071,8 +1071,8 @@ export default {
         // })
         // }
         if (this.form.checkType != null && this.form.checkType !== '') {
-          this.form.checkTypeList = selectDictLabels(this.dict.type.check_type, this.form.checkType)
-          console.log(' this.form.checkTypeList', this.form.checkTypeList)
+          this.form.checkTypeText = selectDictLabels(this.dict.type.exam_type, this.form.checkType)
+          console.log(' this.form.checkTypeText', this.form.checkTypeText)
           this.form.checkType = response.data.checkType.split(',')
         }
 

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

@@ -87,13 +87,13 @@
         >新增设备
         </el-button>
         <el-button
-          icon="el-icon-top-left"
+          icon="el-icon-finished"
           class="fourWordsBtn"
           @click="selectAll()"
         >选择全部
         </el-button>
         <el-button
-          icon="el-icon-top-right"
+          icon="el-icon-back"
           class="fourWordsBtn"
           @click="reverseSelect(deviceList)"
         >反向选择
@@ -101,14 +101,14 @@
         <el-button
           v-hasPermi="['business:device:import']"
           class="fourWordsBtn"
-          icon="el-icon-bottom-left"
+          icon="el-icon-download"
           @click="handleImport"
         >批量导入
         </el-button>
         <el-button
           v-hasPermi="['business:device:export']"
           class="fourWordsBtn"
-          icon="el-icon-top-right"
+          icon="el-icon-upload2"
           @click="handleExport"
         >批量导出
         </el-button>
@@ -126,7 +126,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" :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 label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />

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

 <template>
   <div>
     <div style="background-color: #fff;height: 100%;margin-top: 20px;">
-      <div style=" text-align: center;padding-top: 30px;height: 100px;">
+      <div style=" text-align: center;padding-top: 35px;height: 100px;">
         <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
       </div>
-      <div style="display: flex; padding-left: 20px;padding-top: 10px;padding-bottom: 10px;">
+      <div style="display: flex; padding-left: 20px;padding-bottom: 10px;">
         <div class="tip1" />
         <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div>
       </div>

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

@@ -41,7 +41,7 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="daterangeCreateTime"
+          v-model="queryParams.reportTime"
           type="date"
           style="width: 240px"
           placeholder="选择检查日期"
@@ -245,8 +245,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        isAsc: '',
-        orderByColumn: '',
+        isAsc: 'desc',
+        orderByColumn: 'c.report_time',
         searchText: '',
         insureList: '',
         checkItemsIdList: '',
@@ -297,8 +297,8 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        isAsc: '',
-        orderByColumn: '',
+        isAsc: 'desc',
+        orderByColumn: 'c.report_time',
         searchText: '',
         insureList: '',
         checkItemsIdList: '',
@@ -328,10 +328,10 @@ export default {
     },
     // 获取列表数据
     getUseList() {
-      if (this.daterangeCreateTime !== '') {
-        this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
-        this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
-      }
+      // if (this.daterangeCreateTime !== '') {
+      //   this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
+      //   this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
+      // }
       listUseManagement(this.queryParams).then(res => {
         this.total = res.total
         this.userList = res.rows

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

@@ -29,7 +29,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="hospitalName">
+        <el-form-item v-if="!checkRole(['pt-admin'])" prop="hospitalName">
           <el-select v-model="queryParams.hospitalName" clearable placeholder="所属医院">
             <el-option
               v-for="item in HospitalList"
@@ -216,6 +216,8 @@
 <script>
 import { listRecord } from '@/api/business/record'
 import { getDepartment, getDoctorment, getHospital } from '@/api/business/register'
+import { checkRole } from '@/utils/permission'
+import { getInfo } from '@/api/login'
 
 export default {
   name: 'MedicalRecordManagement',
@@ -299,16 +301,20 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+      user: {}
     }
   },
-  created() {
+  async created() {
+    const { user } = await getInfo()
+    this.user = user
     this.getList()
     this.getDoctorList()
     this.getDeptList()
     this.getHospitalList()
   },
   methods: {
+    checkRole,
     /** 查询科室下拉*/
     getDeptList() {
       getDepartment().then(res => {
@@ -324,8 +330,9 @@ export default {
     },
     /** 查询医生名字下拉*/
     getHospitalList() {
-      getHospital().then(res => {
-        this.HospitalList = res.data
+      getHospital().then(({ data }) => {
+        data = data.filter(({ deptId: hospitalDept }) => hospitalDept === this.user.deptId)
+        this.HospitalList = data
         console.log('这是我要的医院下拉框:', this.HospitalList)
       })
     },

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

@@ -289,7 +289,8 @@ export default {
         payStatus: '0',
         // 给传个null
         petPicture: null,
-
+        // 医院地址
+        hosAddress: this.singleDoctor.hosAddress,
         doctorSignatureUrl: this.singleDoctor.doctorSignatureUrl,
         visitLocation: this.singleDoctor.visitLocation,
         doctorTitleLabel: this.singleDoctor.doctorTitleValue