bug修复

src/views/system/cleanConsumer/index.vue

@@ -44,17 +44,17 @@
           v-hasPermi="['system:cleanConsumer:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:cleanConsumer:edit']"
-        >修改</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:cleanConsumer:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -66,16 +66,16 @@
           v-hasPermi="['system:cleanConsumer:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:cleanConsumer:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:cleanConsumer:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -96,13 +96,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:cleanConsumer:edit']"
-          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:cleanConsumer:edit']"-->
+<!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"

src/views/system/cleanRecords/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="开始时间" prop="startDate">
+      <el-form-item label="创建时间" prop="startDate">
         <el-date-picker clearable
-          v-model="queryParams.startDate"
+          v-model="queryParams.createTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+          placeholder="请选择创建时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="保洁状态" prop="status">
@@ -83,7 +75,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="所属门店" align="center" prop="storeName" />
       <el-table-column label="房间名称" align="center" prop="roomName" />
-      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+      <el-table-column label="开始时间" align="center" prop="startDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
@@ -93,7 +85,7 @@
           <image-preview :src="scope.row.startImage" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+      <el-table-column label="结束时间" align="center" prop="endDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
@@ -108,9 +100,13 @@
           <dict-tag :options="dict.type.clean_records_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="保洁人员" align="center" prop="cleanUser" />
+      <el-table-column label="保洁人员" align="center" prop="cleanName" />
       <el-table-column label="联系方式" align="center" prop="phone" />
-      <el-table-column label="完成情况" align="center" prop="xx" />
+      <el-table-column label="创建时间" align="center" prop="createTime" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -223,9 +219,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         startDate: null,
-        startImage: null,
         endDate: null,
-        endImage: null,
+        createTime: null,
         status: null,
       },
       // 表单参数

src/views/system/store/index.vue

@@ -114,7 +114,8 @@
         </template>
       </el-table-column>
       <el-table-column label="联系人" align="center" prop="manager"/>
-      <el-table-column label="联系人电话" align="center" prop="phone"/>
+      <el-table-column label="联系电话" align="center" prop="phone"/>
+      <el-table-column label="设备分组" align="center" prop="deviceGroup"/>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.store_status" :value="scope.row.status"/>