Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -153,7 +153,7 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/use-management/use-details'),
         name: 'UseDetails',
-        meta: { title: '详情', icon: 'table', activeMenu: '/use-details' }
+        meta: { title: '详情', icon: 'table' }
       }
     ]
   },

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/use-management/use-details.vue

 <template>
   <div>
     <div style="background-color: #fff;height: 100%;margin-top: 20px;">
-      <div style=" text-align: center;padding-top: 40px;height: 100px;">
+      <div style=" text-align: center;padding-top: 30px;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: 20px;padding-bottom: 20px;">
+      <div style="display: flex; padding-left: 20px;padding-top: 10px;padding-bottom: 10px;">
         <div class="tip1" />
         <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div>
       </div>
@@ -317,14 +317,10 @@ import { CodeToText } from 'element-china-area-data'
 export default {
   name: 'UseDetails',
   dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure'],
-  props: {
-    id: {
-      type: Number,
-      required: true
-    }
-  },
   data() {
     return {
+      useId: '',
+      createTime: '',
       // 检查时间
       checkTime: '',
       // 检查日期
@@ -353,6 +349,7 @@ export default {
     }
   },
   created() {
+    this.useId = localStorage.getItem('useId')
     this.getUseDetail()
     this.getCheckList()
   },
@@ -382,7 +379,7 @@ export default {
     },
     // 查询详情
     getUseDetail() {
-      useManagementDetail(this.id).then(res => {
+      useManagementDetail(this.useId).then(res => {
         this.form = res.data
         console.log('xiangq', res)
         if (res.data.useTime !== '' && res.data.useTime !== null) {

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

@@ -44,7 +44,7 @@
           v-model="daterangeCreateTime"
           type="date"
           style="width: 240px"
-          placeholder="选择创建日期"
+          placeholder="选择检查日期"
           value-format="yyyy-MM-dd"
         />
       </el-form-item>
@@ -88,7 +88,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#E8E9E8'}" @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 label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
@@ -128,12 +128,12 @@
       </el-table-column>
       <el-table-column label="检查日期" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span>
+          <span>{{ parseTime(scope.row.reportTime, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查时间" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-' }}</span>
+          <span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="缴费金额" align="left" prop="payAmount">
@@ -215,29 +215,29 @@ export default {
       sortedColumn: '',
       // 排序规则
       sortedList: [
-        {
-          id: '1',
-          collation: 'asc',
-          sortedColumn: '按检查时间升序',
-          nameColumn: 'checkItemsName'
-        },
         {
           id: '2',
           collation: 'desc',
-          sortedColumn: '按检查时间降序',
-          nameColumn: 'checkItemsName'
+          sortedColumn: '按检查时间倒序',
+          nameColumn: 'c.report_time'
         },
         {
-          id: '3',
+          id: '1',
           collation: 'asc',
-          sortedColumn: '按预约时间升序',
-          nameColumn: 'appointTime'
+          sortedColumn: '按检查时间正序',
+          nameColumn: 'c.report_time'
         },
         {
           id: '4',
           collation: 'desc',
-          sortedColumn: '按预约时间降序',
-          nameColumn: 'appointTime'
+          sortedColumn: '按预约时间倒序',
+          nameColumn: 'c.appoint_time'
+        },
+        {
+          id: '3',
+          collation: 'asc',
+          sortedColumn: '按预约时间正序',
+          nameColumn: 'c.appoint_time'
         }
       ],
       total: 0,
@@ -385,11 +385,9 @@ export default {
     },
     // 去详情页
     detailsUse(row) {
+      localStorage.setItem('useId', row.id)
       this.$router.push({
-        name: 'UseDetails',
-        params: {
-          id: row.id
-        }
+        name: 'UseDetails'
       })
     },
     // 设备状态 value 和label 的转换