Merge remote-tracking branch 'origin/master'

src/views/banner_management/banner_add.vue

+<template>
+  <div>
+    新增轮播图
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BannerAdd',
+  data() {
+    return {}
+  },
+  watch: {},
+  created() {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/banner_management/banner_management.vue

@@ -13,37 +13,44 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item prop="img">
-              <el-input
-                v-model="queryParams.img"
-                placeholder="请输入图片地址"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="imgBoolean">
+              <el-select v-model.trim="queryParams.imgBoolean" clearable placeholder="轮播图">
+                <el-option
+                  v-for="item in imgStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
-            <el-form-item prop="url">
-              <el-input
-                v-model="queryParams.url"
-                placeholder="请输入跳转链接"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="status">
+              <el-select v-model.trim="queryParams.status" clearable placeholder="状态">
+                <el-option
+                  v-for="item in dict.type.banner_status"
+                  :key="item.value"
+                  :label="item.label.substring(1)"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
-            <el-form-item prop="sort">
-              <el-input
-                v-model="queryParams.sort"
-                placeholder="请输入权重"
+            <el-form-item prop="createTime">
+              <el-date-picker
+                v-model.trim="queryParams.createTime"
                 clearable
-                @keyup.enter.native="handleQuery"
+                placeholder="请选择创建日期"
+                type="date"
+                value-format="yyyy-MM-dd"
               />
             </el-form-item>
-            <el-form-item prop="notes">
-              <el-input
-                v-model="queryParams.notes"
-                placeholder="请输入备注"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="sortWay">
+              <el-select v-model.trim="queryParams.sortWay" clearable placeholder="请选择排序方式">
+                <el-option
+                  v-for="item in dict.type.banner_order"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <div>
               <!--顶部操作按钮-->
@@ -70,20 +77,24 @@
           <el-table
             v-loading="loading"
             :data="bannerList"
-            @selection-change="handleSelectionChange"
             :header-cell-style="{background:'#E8E9E8'}"
+            @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
-            <el-table-column label="标题" prop="title" show-overflow-tooltip/>
-            <el-table-column label="图片地址" prop="img" show-overflow-tooltip/>
-            <el-table-column label="跳转链接" prop="url" show-overflow-tooltip/>
-            <el-table-column label="权重" prop="sort" width="60"/>
+            <el-table-column label="标题" prop="title" show-overflow-tooltip />
+            <el-table-column label="轮播图" prop="img" show-overflow-tooltip width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.img ? '已上传':'未上传' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="跳转链接" prop="url" show-overflow-tooltip />
+            <el-table-column label="权重" prop="sort" width="60" />
+            <el-table-column label="创建日期" prop="createTime" width="80" />
             <el-table-column label="状态" prop="status" width="80">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.banner_status" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column label="备注" prop="notes" show-overflow-tooltip/>
             <el-table-column label="操作" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <div style="display: flex;">
@@ -110,7 +121,7 @@
                     >编辑
                     </el-button>
                   </div>
-                  <div v-if="scope.row.articleStatus==='1'">
+                  <div v-if="scope.row.status==='2' && scope.row.id !== 1">
                     <el-button
                       key="1"
                       v-hasPermi="['business:article:remove']"
@@ -123,7 +134,7 @@
                     >删除
                     </el-button>
                   </div>
-                  <div v-else-if="scope.row.articleStatus==='0'">
+                  <div v-else-if="scope.row.status==='1' && scope.row.id !== 1">
                     <el-button
                       key="2"
                       icon="el-icon-video-pause"
@@ -131,7 +142,7 @@
                       size="mini"
                       style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
                       type="warning"
-                      @click="handleChange(scope.row)"
+                      @click="deListBanner(scope.row)"
                     >下架
                     </el-button>
                   </div>
@@ -158,7 +169,7 @@ import { listBanner, getBanner, delBanner, addBanner, updateBanner } from '@/api
 
 export default {
   name: 'BannerManagement',
-  dicts: ['banner_status'],
+  dicts: ['banner_status', 'banner_order'],
   data() {
     return {
       activeName: 'first',
@@ -185,12 +196,29 @@ export default {
         pageNum: 1,
         pageSize: 10,
         title: null,
-        img: null,
+        imgBoolean: null,
+        sortWay: null,
         url: null,
         sort: null,
         status: null,
-        notes: null
+        notes: null,
+        createTime: null
       },
+      // 轮播图状态下拉框
+      imgStatus: [
+        // {
+        //   label: '全部',
+        //   value: 'all'
+        // },
+        {
+          label: '已上传',
+          value: 'y'
+        },
+        {
+          label: '未上传',
+          value: 'n'
+        }
+      ],
       // 表单参数
       form: {},
       // 表单校验
@@ -301,6 +329,18 @@ export default {
       this.download('business/banner/export', {
         ...this.queryParams
       }, `banner_${new Date().getTime()}.xlsx`)
+    },
+    /** 下架轮播图 */
+    deListBanner(row) {
+      const update = {
+        id: row.id,
+        status: '2'
+      }
+      updateBanner(update).then(res => {
+        if (res.code === 200) {
+          this.getBannerList()
+        }
+      })
     }
   }
 }

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/service-management/medical-record-management/check-detail.vue

@@ -180,7 +180,7 @@
           <el-col :span="8">
             <el-form-item label="检查状态">
               <span v-show="checkDetail.checkSchedule === '0' || checkDetail.checkSchedule === '1'">-</span>
-              <span v-show="checkDetail.checkSchedule === '2'">未检查</span>
+              <span v-show="checkDetail.checkSchedule === '2'">待检查</span>
               <span v-show="checkDetail.checkSchedule === '3'">已检查</span>
             </el-form-item>
           </el-col>

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

@@ -167,7 +167,7 @@
       <el-table-column label="检查状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
         <template slot-scope="scope">
           <span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span>
-          <span v-show="scope.row.checkSchedule === '2'">未检查</span>
+          <span v-show="scope.row.checkSchedule === '2'">待检查</span>
           <span v-show="scope.row.checkSchedule === '3'">已检查</span>
         </template>
       </el-table-column>
@@ -378,7 +378,7 @@ export default {
         },
         {
           value: '1',
-          label: '未检查'
+          label: '待检查'
         }
       ],
       deviceQueryParams: {