Merge remote-tracking branch 'origin/master'

src/views/banner_management/banner_add.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="bannerAddMain">
       <div style="display: flex;margin: 20px;">
-        <div style="height: 30px;border-left: 10px solid #5FB54B;" />
+        <div style="height: 30px;border-left: 5px solid #5FB54B;" />
         <div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div>
       </div>
       <div>
@@ -32,13 +32,17 @@
             <span style="height: 2.5rem;line-height: 2.5rem">{{ form.createTime }}</span>
           </el-form-item>
           <el-form-item label="状态：" prop="status">
-            <el-switch
-              v-model="form.status"
-              active-color="#13ce66"
-              inactive-color="#dcdfe6"
-              active-value="1"
-              inactive-value="2"
-            />
+            <span style="height: 2.5rem;line-height: 2.5rem">
+              <el-switch
+                v-model="form.status"
+                active-color="#13ce66"
+                inactive-color="#f5aa6c"
+                active-value="1"
+                inactive-value="2"
+              />
+            </span>
+            <span v-if="form.status === '1'" style="height: 2.5rem;line-height: 2.5rem;color: #67C23A;margin-left: 5px;">已发布</span>
+            <span v-else style="height: 2.5rem;line-height: 2.5rem;color: #f5aa6c;margin-left: 5px;">未发布</span>
           </el-form-item>
           <el-form-item label="备注：" prop="notes">
             <el-input v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />

src/views/banner_management/banner_detail.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="bannerAddMain">
       <div style="display: flex;margin: 20px;">
-        <div style="height: 30px;border-left: 10px solid #5FB54B;" />
+        <div style="height: 30px;border-left: 5px solid #5FB54B;" />
         <div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div>
       </div>
       <div>

src/views/banner_management/banner_edit.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="bannerAddMain">
       <div style="display: flex;margin: 20px;">
-        <div style="height: 30px;border-left: 10px solid #5FB54B;" />
+        <div style="height: 30px;border-left: 5px solid #5FB54B;" />
         <div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div>
       </div>
       <div>
@@ -33,14 +33,18 @@
             <span style="height: 2.5rem;line-height: 2.5rem">{{ form.createTime }}</span>
           </el-form-item>
           <el-form-item label="状态：" prop="status">
-            <el-switch
-              v-model="form.status"
-              active-color="#13ce66"
-              inactive-color="#dcdfe6"
-              active-value="1"
-              inactive-value="2"
-              :disabled="form.id === 1"
-            />
+            <span style="height: 2.5rem;line-height: 2.5rem">
+              <el-switch
+                v-model="form.status"
+                active-color="#13ce66"
+                inactive-color="#f5aa6c"
+                active-value="1"
+                inactive-value="2"
+                :disabled="form.id === 1"
+              />
+              <span v-if="form.status === '1'" style="color: #67C23A;margin-left: 5px;">已发布</span>
+              <span v-else style="color: #f5aa6c;margin-left: 5px;">未发布</span>
+            </span>
           </el-form-item>
           <el-form-item label="备注：" prop="notes">
             <el-input :disabled="form.id === 1" v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
@@ -103,7 +107,7 @@ export default {
           { required: true, message: '请输入跳转地址', trigger: 'blur' }
         ],
         sort: [
-          { required: true, message: '请输入权重', trigger: 'blur' },
+          { required: false, message: '请输入权重', trigger: 'blur' },
           { validator: checkSort, trigger: 'change' }
         ],
         status: [

src/views/banner_management/banner_management.vue

@@ -106,6 +106,7 @@
                 <div style="display: flex;">
                   <div style="padding-right: 20px;">
                     <el-button
+                      v-hasPermi="['business:banner:query']"
                       icon="el-icon-document"
                       plain
                       size="mini"
@@ -117,7 +118,7 @@
                   </div>
                   <div style="padding-right: 20px;">
                     <el-button
-                      v-hasPermi="['business:article:edit']"
+                      v-hasPermi="['business:banner:edit']"
                       icon="el-icon-edit"
                       plain
                       size="mini"
@@ -130,7 +131,7 @@
                   <div v-if="scope.row.status==='2'">
                     <el-button
                       key="1"
-                      v-hasPermi="['business:article:remove']"
+                      v-hasPermi="['business:banner:remove']"
                       icon="el-icon-delete"
                       plain
                       size="mini"
@@ -143,6 +144,7 @@
                   <div v-else-if="scope.row.status==='1'">
                     <el-button
                       key="2"
+                      v-hasPermi="['business:banner:edit']"
                       icon="el-icon-video-pause"
                       plain
                       size="mini"
@@ -238,6 +240,7 @@ export default {
     /** 查询轮播图管理列表 */
     getBannerList() {
       this.loading = true
+      console.log('查询条件', this.queryParams)
       listBanner(this.queryParams).then(response => {
         this.bannerList = response.rows
         this.total = response.total
@@ -336,11 +339,17 @@ export default {
         id: row.id,
         status: '2'
       }
-      updateBanner(update).then(res => {
-        if (res.code === 200) {
-          this.getBannerList()
-        }
-      })
+      this.$modal.confirm('是否确认下架该轮播图信息？').then(function() {
+        updateBanner(update).then(res => {
+          if (res.code === 200) {
+            this.getBannerList()
+          }
+        })
+        return null
+      }).then(() => {
+        this.getBannerList()
+        this.$modal.msgSuccess('下架成功')
+      }).catch(() => {})
     }
   }
 }

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

@@ -6,7 +6,7 @@
       </div>
       <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 style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">当前设备信息</div>
       </div>
       <div style="width: 90%">
         <el-form :model="form" label-width="150px">
@@ -21,7 +21,7 @@
                 <el-input v-model="form.ruleId" :disabled="true" placeholder="暂无数据" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col v-show="userType==='3' || userType==='2'"  :span="8">
               <el-form-item label="医院自有设备" prop="isPrivate">
                 <el-select v-model="form.isPrivate" :disabled="true" placeholder="暂无数据">
                   <el-option
@@ -33,6 +33,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col v-show="userType==='00'" :span="8">
+              <el-form-item label="平台自有设备" prop="isPrivate">
+                <el-input v-model="isPrivate" :disabled="true" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -63,7 +68,7 @@
               <el-form-item label="预约方式" prop="reservationMethod">
                 <el-select v-model="form.reservationMethod" :disabled="true" placeholder="暂无数据">
                   <el-option
-                    v-for="dict in dict.type.device_type"
+                    v-for="dict in dict.type.reservation_method"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -140,8 +145,8 @@
               <el-form-item label="支持检查类型" prop="checkType">
                 <el-select v-model="form.checkType" placeholder="暂无数据" multiple clearable :disabled="true">
                   <el-option
-                    v-for="(item,index) in checkList"
-                    :key="index"
+                    v-for="item in checkList"
+                    :key="item.id"
                     :label="item.dictName"
                     :value="item.id"
                   />
@@ -151,7 +156,7 @@
           </el-row>
           <div style=" display: flex;position: relative;left: 20px;padding-bottom: 20px;">
             <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">宠物信息</div>
+            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠物信息</div>
           </div>
           <el-row>
             <el-col :span="8">
@@ -241,7 +246,7 @@
           </el-row>
           <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
             <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">宠主信息</div>
+            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠主信息</div>
           </div>
           <el-row>
             <el-col :span="8">
@@ -263,7 +268,7 @@
 
           <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
             <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备使用信息</div>
+            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">设备使用信息</div>
           </div>
           <el-row>
             <el-col :span="8">
@@ -303,8 +308,8 @@
           </el-row>
         </el-form>
       </div>
-      <div style="padding-left: 150px;width: 90%;padding-bottom: 20px;">
-        <el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
+      <div style="padding-left: 150px;width: 90%;padding-bottom: 20px;;text-align: center;">
+        <el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
       </div>
     </div>
   </div>
@@ -313,12 +318,15 @@
 <script>
 import { selectCheckItem, useManagementDetail } from '@/api/business/use'
 import { CodeToText } from 'element-china-area-data'
+import { getInfo } from '@/api/login'
 
 export default {
   name: 'UseDetails',
-  dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure'],
+  dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure', 'reservation_method'],
   data() {
     return {
+      isPrivate: '是',
+      userType: '',
       useId: '',
       createTime: '',
       // 检查时间
@@ -352,8 +360,16 @@ export default {
     this.useId = localStorage.getItem('useId')
     this.getUseDetail()
     this.getCheckList()
+    this.getUserLogin()
   },
   methods: {
+    // 获取登陆人信息
+    getUserLogin() {
+      getInfo().then(res => {
+        this.userType = res.user.userType
+        console.log('登陆人', res)
+      })
+    },
     // 检查项目下拉框
     getCheckList() {
       selectCheckItem().then(res => {
@@ -399,11 +415,17 @@ export default {
           const newArr = arr.map(num => Number(num))
           this.form.checkType = newArr
         }
-        this.createTime = (this.form.createTime.slice(0, this.form.createTime.length - 8)).replace(/-/g, '/')
-        this.checkDate = (this.form.checkStartTime.slice(0, this.form.checkStartTime.length - 8)).replace(/-/g, '/')
-        const hour = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(' ') + 1, this.form.checkStartTime.indexOf(':'))
-        const minute = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(':') + 1, this.form.checkStartTime.lastIndexOf(':'))
-        this.checkTime = hour + ':' + minute
+        if (this.form.createTime !== null && this.form.createTime !== '') {
+          this.createTime = (this.form.createTime.slice(0, this.form.createTime.length - 8)).replace(/-/g, '/')
+        }
+        if (this.form.checkStartTime !== null && this.form.checkStartTime !== '') {
+          this.checkDate = (this.form.checkStartTime.slice(0, this.form.checkStartTime.length - 8)).replace(/-/g, '/')
+          const hour = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(' ') + 1, this.form.checkStartTime.indexOf(':'))
+          const minute = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(':') + 1, this.form.checkStartTime.lastIndexOf(':'))
+          this.checkTime = hour + ':' + minute
+        }
+        const payAmount = this.form.payAmount.toFixed(2)
+        this.form.payAmount = payAmount.toString()
       })
     }
   }

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

@@ -138,7 +138,7 @@
       </el-table-column>
       <el-table-column label="缴费金额" align="left" prop="payAmount">
         <template slot-scope="scope">
-          <span>{{ scope.row.payAmount || '-' }}</span>
+          <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="设备当前状态" align="left" prop="status">
@@ -275,6 +275,10 @@ export default {
     this.getCheckList()
   },
   methods: {
+    // 表格显示病房单价保留两位小数
+    formatPrice(cellValue) {
+      return cellValue.toFixed(2) + '元'
+    },
     // 表单选择框对齐
     cellClass(row) {
       if (row.columnIndex === 0) { return 'disabledCheck' }
@@ -332,7 +336,7 @@ export default {
           this.$refs.table.clearSelection()
         })
       } else {
-        this.$modal.msgError('请选择至少一条数据导出')
+        this.$modal.msgWarning('请选择至少一条数据导出')
         return
       }
     },
@@ -344,6 +348,7 @@ export default {
     },
     // 获取列表数据
     getUseList() {
+      this.loading = true
       // if (this.daterangeCreateTime !== '') {
       //   this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
       //   this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
@@ -351,6 +356,7 @@ export default {
       listUseManagement(this.queryParams).then(res => {
         this.total = res.total
         this.userList = res.rows
+        this.loading = false
         console.log('列表', res)
       })
     },
@@ -423,6 +429,10 @@ export default {
 </script>
 
 <style scoped>
+/*表格内容选中后的样式*/
+::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell{
+  background-color: #F6FCF5 !important;
+}
 ::v-deep.app-container{
   background-color:#ffffff;
 }