smart-admin/src/main/java/com/huijy/web/controller/management/ShopController.java

@@ -47,6 +47,19 @@ public class ShopController extends BaseController
     }
 
     /**
+     * 查询商铺管理列表
+     */
+    @GetMapping("/select")
+    public TableDataInfo select()
+    {
+        Shop shop = new Shop();
+        shop.setAuditFlag("1");
+        List<Shop> list = shopService.selectShopList(shop);
+        return getDataTable(list);
+    }
+
+
+    /**
      * 导出商铺管理列表
      */
     @PreAuthorize("@ss.hasPermi('management:shop:export')")

smart-system/src/main/java/com/huijy/management/domain/Shop.java

@@ -76,6 +76,7 @@ public class Shop extends BaseEntity
     private Long auditAt;
 
     /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
     /**
      * 老板会员id

smart-ui/src/api/management/shop.js

@@ -50,4 +50,13 @@ export function exportShop(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+
+// 导出商铺管理
+export function shopSelect() {
+    return request({
+      url: '/management/shop/select',
+      method: 'get'
+    })
+  }

smart-ui/src/views/management/camera/index.vue

@@ -44,11 +44,10 @@
         <el-button
           type="primary"
           icon="el-icon-search"
-          size="mini"
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh"  @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -81,16 +80,14 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:camera:remove']"
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -101,7 +98,7 @@
           v-hasPermi="['management:camera:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

smart-ui/src/views/management/content/index.vue

@@ -237,7 +237,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        title: [{ required: true, message: '标题不能为空' }, { min: 2, max: 30, message: '用户名称长度必须介于 2 和 30 之间' }],
+        title: [{ required: true, message: '标题不能为空' }, 
+        { min: 2, max: 30, message: '用户名称长度必须介于 2 和 30 之间' }],
         author: [{ required: true, message: '作者不能为空' }],
         browseNum: [{ required: true, message: '点击量不能为空' }],
         content: [{ required: true, message: '详情不能为空' }]

smart-ui/src/views/management/guestRecord/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="游客姓名" prop="guestName">
         <el-input
           v-model="queryParams.guestName"
@@ -29,8 +35,15 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh"  @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -38,36 +51,33 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['management:guestRecord:add']"
-        >新增</el-button>
+          >新增</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="['management:guestRecord:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:guestRecord:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -76,24 +86,41 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['management:guestRecord:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="guestRecordList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="guestRecordList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="shopName" />
       <el-table-column label="游客姓名" align="center" prop="guestName" />
       <el-table-column label="身份证号" align="center" prop="idCard" />
       <el-table-column label="手机号码" align="center" prop="phone" />
-      <el-table-column label="入住日期" align="center" prop="checkInTime" width="180">
+      <el-table-column
+        label="入住日期"
+        align="center"
+        prop="checkInTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkInTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.checkInTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="游客类型" align="center" prop="guestType" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -101,20 +128,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['management:guestRecord:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['management:guestRecord:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -124,8 +153,16 @@
     <!-- 添加或修改酒店客人数据记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="店铺id" prop="shopId">
-          <el-input v-model="form.shopId" placeholder="请输入店铺id" />
+        <el-form-item label="店铺" prop="shopId">
+          <!-- <el-input v-model="form.shopId" placeholder="请输入店铺id" /> -->
+          <el-select v-if="shopList" v-model="form.shopId">
+            <el-option
+              v-for="(item, index) in shopList"
+              :key="'shop' + index"
+              :label="item.name"
+              :value="item.shopId"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="游客姓名" prop="guestName">
           <el-input v-model="form.guestName" placeholder="请输入游客姓名" />
@@ -134,19 +171,30 @@
           <el-input v-model="form.idCard" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+          <el-input
+            type="number"
+            v-model="form.phone"
+            placeholder="请输入手机号码"
+          />
         </el-form-item>
         <el-form-item label="入住日期" prop="checkInTime">
-          <el-date-picker clearable size="small"
+          <el-date-picker
+            clearable
+            size="small"
             v-model="form.checkInTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择入住日期">
+            placeholder="选择入住日期"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="游客类型" prop="guestType">
-          <el-select v-model="form.guestType" placeholder="请选择游客类型">
+          <!-- <el-select v-model="form.guestType" placeholder="请选择游客类型">
             <el-option label="请选择字典生成" value="" />
+          </el-select> -->
+          <el-select v-model="form.guestType" placeholder="请选择游客类型">
+            <el-option label="散客" value="散客" />
+            <el-option label="团客" value="团客" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -160,10 +208,10 @@
 
 <script>
 import { listGuestRecord, getGuestRecord, delGuestRecord, addGuestRecord, updateGuestRecord, exportGuestRecord } from "@/api/management/guestRecord";
-
+import { shopSelect } from "@/api/management/shop";
 export default {
   name: "GuestRecord",
-  data() {
+  data () {
     return {
       // 遮罩层
       loading: true,
@@ -192,20 +240,53 @@ export default {
         guestName: null,
         idCard: null,
         phone: null,
+        orderByColumn: 'createTime', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+        shopId: [{ required: true, message: '店铺不能为空' }],
+        guestName: [{ required: true, message: '游客姓名不能为空' }],
+        idCard: [{
+          trigger: "blur", validator: (rule, value, callback) => {
+            const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+            if (value == '' || value == undefined || value == null) {
+              callback();
+            } else {
+              if ((!reg.test(value)) && value != '') {
+                callback(new Error('请输入正确的身份证号码'));
+              } else {
+                callback();
+              }
+            }
+          }
+        }],
+        phone: [{
+          trigger: "blur", validator: (rule, value, callback) => {
+            const reg = /^[1][3,4,5,7,8][0-9]{9}$/;
+            if (value == '' || value == undefined || value == null) {
+              callback();
+            } else {
+              if ((!reg.test(value)) && value != '') {
+                callback(new Error('请输入正确的电话号码'));
+              } else {
+                callback();
+              }
+            }
+          }
+        }],
+      },
+      shopList: []
     };
   },
-  created() {
+  created () {
     this.getList();
   },
   methods: {
     /** 查询酒店客人数据记录列表 */
-    getList() {
+    getList () {
       this.loading = true;
       listGuestRecord(this.queryParams).then(response => {
         this.guestRecordList = response.rows;
@@ -214,12 +295,12 @@ export default {
       });
     },
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
     // 表单重置
-    reset() {
+    reset () {
       this.form = {
         shopGuestRecord: null,
         shopId: null,
@@ -233,39 +314,41 @@ export default {
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange (selection) {
       this.ids = selection.map(item => item.shopGuestRecord)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd () {
       this.reset();
       this.open = true;
       this.title = "添加酒店客人数据记录";
+      this.getShopList();
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate (row) {
       this.reset();
       const shopGuestRecord = row.shopGuestRecord || this.ids
       getGuestRecord(shopGuestRecord).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改酒店客人数据记录";
+        this.getShopList();
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.shopGuestRecord != null) {
@@ -285,33 +368,38 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete (row) {
       const shopGuestRecords = row.shopGuestRecord || this.ids;
       this.$confirm('是否确认删除酒店客人数据记录编号为"' + shopGuestRecords + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delGuestRecord(shopGuestRecords);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delGuestRecord(shopGuestRecords);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有酒店客人数据记录数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportGuestRecord(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportGuestRecord(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
+    },
+    getShopList () {
+      shopSelect().then(res => {
+        this.shopList = res.rows;
+      })
     }
   }
 };

smart-ui/src/views/management/help/index.vue

@@ -1,29 +1,25 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['management:help:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="success"
-          plain
           icon="el-icon-edit"
-          size="mini"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['management:help:edit']"
@@ -32,15 +28,13 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:help:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -50,13 +44,13 @@
           @click="handleExport"
           v-hasPermi="['management:help:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="helpList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="求助记录Id" align="center" prop="memberHelpId" />
+      <!-- <el-table-column label="求助记录Id" align="center" prop="memberHelpId" /> -->
       <!-- <el-table-column label="会员id" align="center" prop="memberId" /> -->
        <el-table-column label="会员名称" align="center" prop="memberName" />
        <el-table-column label="会员昵称" align="center" prop="nickName" />
@@ -152,6 +146,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: 'createTime', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},

smart-ui/src/views/management/label/index.vue

@@ -201,6 +201,8 @@ export default {
         markerType: null,
         name: null,
         status: null,
+        orderByColumn: 'createTime', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},

smart-ui/src/views/management/location/index.vue

@@ -145,6 +145,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: 'createTime', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},

smart-ui/src/views/management/marker/index.vue

@@ -5,7 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="100px"
     >
       <el-form-item label="标记物类型" prop="markerType">
         <el-select
@@ -35,11 +35,10 @@
         <el-button
           type="primary"
           icon="el-icon-search"
-          size="mini"
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh"  @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -49,9 +48,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['management:marker:add']"
           >新增</el-button
@@ -60,9 +57,7 @@
       <el-col :span="1.5">
         <el-button
           type="success"
-          plain
           icon="el-icon-edit"
-          size="mini"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['management:marker:edit']"
@@ -72,16 +67,14 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:marker:remove']"
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -92,7 +85,7 @@
           v-hasPermi="['management:marker:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -110,6 +103,7 @@
         label="类型"
         align="center"
         prop="markerType"
+        width="55"
         :formatter="markerTypeFormat"
       />
       <el-table-column label="名称" align="center" prop="markerName" />

smart-ui/src/views/management/record/index.vue

@@ -1,46 +1,57 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['management:record:add']"
-        >新增</el-button>
+          >新增</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="['management:record:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:record:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -49,27 +60,64 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['management:record:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="recordList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="店铺销售记录id" align="center" prop="shopSalesRecordId" />
+      <!-- <el-table-column
+        label="店铺销售记录id"
+        align="center"
+        prop="shopSalesRecordId"
+      /> -->
       <!-- <el-table-column label="店铺id" align="center" prop="shopId" /> -->
       <el-table-column label="店铺名称" align="center" prop="shopName" />
-      <el-table-column label="销售时间" align="center" prop="salesTime" width="180">
+      <el-table-column
+        label="销售时间"
+        align="center"
+        prop="salesTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.salesTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.salesTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="散客预约人数" align="center" prop="scatteredAppointment" />
-      <el-table-column label="散客接待人数" align="center" prop="scatteredReception" />
-      <el-table-column label="团客预约人数" align="center" prop="groupAppointment" />
-      <el-table-column label="团客接待人数" align="center" prop="groupReception" />
+      <el-table-column
+        label="散客预约人数"
+        align="center"
+        prop="scatteredAppointment"
+      />
+      <el-table-column
+        label="散客接待人数"
+        align="center"
+        prop="scatteredReception"
+      />
+      <el-table-column
+        label="团客预约人数"
+        align="center"
+        prop="groupAppointment"
+      />
+      <el-table-column
+        label="团客接待人数"
+        align="center"
+        prop="groupReception"
+      />
       <el-table-column label="销售金额" align="center" prop="salesAmount" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -77,20 +125,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['management:record:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['management:record:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -98,33 +148,69 @@
     />
 
     <!-- 添加或修改店铺销售记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="店铺id" prop="shopId">
-          <el-input v-model="form.shopId" placeholder="请输入店铺id" />
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="店铺" prop="shopId">
+          <!-- <el-input v-model="form.shopId" placeholder="请输入店铺id" /> -->
+          <el-select v-if="shopList" v-model="form.shopId">
+            <el-option
+              v-for="(item, index) in shopList"
+              :key="'shop' + index"
+              :label="item.name"
+              :value="item.shopId"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="销售时间" prop="salesTime">
-          <el-date-picker clearable size="small"
+          <el-date-picker
+            clearable
+            size="small"
             v-model="form.salesTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择销售时间">
+            placeholder="选择销售时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="散客预约人数" prop="scatteredAppointment">
-          <el-input v-model="form.scatteredAppointment" placeholder="请输入散客预约人数" />
+          <el-input-number
+            v-model="form.scatteredAppointment"
+            :min="0"
+            :precision="0"
+            placeholder="请输入散客预约人数"
+          />
         </el-form-item>
         <el-form-item label="散客接待人数" prop="scatteredReception">
-          <el-input v-model="form.scatteredReception" placeholder="请输入散客接待人数" />
+          <el-input-number
+            v-model="form.scatteredReception"
+            :min="0"
+            :precision="0"
+            placeholder="请输入散客接待人数"
+          />
         </el-form-item>
         <el-form-item label="团客预约人数" prop="groupAppointment">
-          <el-input v-model="form.groupAppointment" placeholder="请输入团客预约人数" />
+          <el-input-number
+            v-model="form.groupAppointment"
+            :min="0"
+            :precision="0"
+            placeholder="请输入团客预约人数"
+          />
         </el-form-item>
         <el-form-item label="团客接待人数" prop="groupReception">
-          <el-input v-model="form.groupReception" placeholder="请输入团客接待人数" />
+          <el-input-number
+            v-model="form.groupReception"
+            :min="0"
+            :precision="0"
+            placeholder="请输入团客接待人数"
+          />
         </el-form-item>
         <el-form-item label="销售金额" prop="salesAmount">
-          <el-input v-model="form.salesAmount" placeholder="请输入销售金额" />
+          <el-input-number
+            v-model="form.salesAmount"
+            :min="0"
+            :precision="2"
+            placeholder="请输入销售金额"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -137,10 +223,10 @@
 
 <script>
 import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/management/record";
-
+import { shopSelect } from "@/api/management/shop";
 export default {
   name: "Record",
-  data() {
+  data () {
     return {
       // 遮罩层
       loading: true,
@@ -171,15 +257,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      shopList: []
     };
   },
-  created() {
+  created () {
     this.getList();
   },
   methods: {
     /** 查询店铺销售记录列表 */
-    getList() {
+    getList () {
       this.loading = true;
       listRecord(this.queryParams).then(response => {
         this.recordList = response.rows;
@@ -188,12 +275,12 @@ export default {
       });
     },
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
     // 表单重置
-    reset() {
+    reset () {
       this.form = {
         shopSalesRecordId: null,
         shopId: null,
@@ -208,30 +295,32 @@ export default {
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange (selection) {
       this.ids = selection.map(item => item.shopSalesRecordId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd () {
       this.reset();
       this.open = true;
       this.title = "添加店铺销售记录";
+      this.getShopList();
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate (row) {
       this.reset();
+      this.getShopList();
       const shopSalesRecordId = row.shopSalesRecordId || this.ids
       getRecord(shopSalesRecordId).then(response => {
         this.form = response.data;
@@ -240,7 +329,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.shopSalesRecordId != null) {
@@ -260,33 +349,38 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete (row) {
       const shopSalesRecordIds = row.shopSalesRecordId || this.ids;
       this.$confirm('是否确认删除店铺销售记录编号为"' + shopSalesRecordIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delRecord(shopSalesRecordIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delRecord(shopSalesRecordIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有店铺销售记录数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportRecord(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportRecord(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
+    },
+    getShopList () {
+      shopSelect().then(res => {
+        this.shopList = res.rows;
+      })
     }
   }
 };

smart-ui/src/views/management/shop/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="商铺名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -16,6 +22,7 @@
           placeholder="请输入老板名称"
           clearable
           size="small"
+          style="width: 150px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -25,11 +32,17 @@
           placeholder="请输入老板电话"
           clearable
           size="small"
+          style="width: 150px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="请选择状态" clearable size="small">
+      <!-- <el-form-item label="状态" prop="enableFlag">
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="请选择状态"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in enableFlagOptions"
             :key="dict.dictValue"
@@ -37,9 +50,15 @@
             :value="dict.dictValue"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="审核状态" prop="auditFlag">
-        <el-select v-model="queryParams.auditFlag" placeholder="请选择审核状态" clearable size="small">
+        <el-select
+          v-model="queryParams.auditFlag"
+          placeholder="请选择审核状态"
+          style="width: 100px"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in auditFlagOptions"
             :key="dict.dictValue"
@@ -49,8 +68,10 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -68,26 +89,24 @@
       <el-col :span="1.5">
         <el-button
           type="success"
-          plain
           icon="el-icon-edit"
-          size="mini"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['management:shop:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['management:shop:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -96,28 +115,51 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['management:shop:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="shopList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="商铺id" align="center" prop="shopId" /> -->
       <el-table-column label="商铺名称" align="center" prop="name" />
-      <el-table-column label="地址" align="center" prop="addres" />
+
       <!-- <el-table-column label="坐标lat" align="center" prop="lat" /> -->
       <!-- <el-table-column label="坐标lng" align="center" prop="lng" /> -->
       <el-table-column label="老板名称" align="center" prop="bossName" />
       <el-table-column label="老板电话" align="center" prop="bossPhone" />
       <el-table-column label="标签" align="center" prop="labelText" />
       <el-table-column label="营业时间" align="center" prop="businessHours" />
+      <el-table-column label="地址" align="center" prop="addres" />
       <!-- <el-table-column label="简介" align="center" prop="briefContent" /> -->
       <!-- <el-table-column label="详情" align="center" prop="content" /> -->
-      <el-table-column label="状态" align="center" prop="enableFlag" :formatter="enableFlagFormat" />
-      <el-table-column label="审核状态" align="center" prop="auditFlag" :formatter="auditFlagFormat" />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="enableFlag"
+        :formatter="enableFlagFormat"
+      />
+      <el-table-column
+        label="审核状态"
+        align="center"
+        prop="auditFlag"
+        :formatter="auditFlagFormat"
+      />
       <!-- <el-table-column label="审核人" align="center" prop="auditAt" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -125,20 +167,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['management:shop:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['management:shop:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -146,71 +190,118 @@
     />
 
     <!-- 添加或修改商铺管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商铺名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商铺名称" />
-        </el-form-item>
-        <el-form-item label="地址" prop="addres">
-          <el-input v-model="form.addres" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="坐标lat" prop="lat">
-          <el-input v-model="form.lat" placeholder="请输入坐标lat" />
-        </el-form-item>
-        <el-form-item label="坐标lng" prop="lng">
-          <el-input v-model="form.lng" placeholder="请输入坐标lng" />
-        </el-form-item>
-        <el-form-item label="老板名称" prop="bossName">
-          <el-input v-model="form.bossName" placeholder="请输入老板名称" />
-        </el-form-item>
-        <el-form-item label="老板电话" prop="bossPhone">
-          <el-input v-model="form.bossPhone" placeholder="请输入老板电话" />
-        </el-form-item>
-        <el-form-item label="展示图片">
-          <imageUpload v-model="form.showPictures"/>
-        </el-form-item>
-        <el-form-item label="标签" prop="labelText">
-          <el-input v-model="form.labelText" placeholder="请输入标签" />
-        </el-form-item>
-        <el-form-item label="营业时间" prop="businessHours">
-          <el-input v-model="form.businessHours" placeholder="请输入营业时间" />
-        </el-form-item>
-        <el-form-item label="简介">
-          <editor v-model="form.briefContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="详情">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.enableFlag">
-            <el-radio
-              v-for="dict in enableFlagOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="审核状态">
-          <el-radio-group v-model="form.auditFlag">
-            <el-radio
-              v-for="dict in auditFlagOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- <el-form-item label="审核人" prop="auditAt">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="基础信息" name="first">
+            <el-form-item label="商铺名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入商铺名称" />
+            </el-form-item>
+
+            <el-form-item label="坐标" prop="lat">
+              <el-input
+                v-model="form.lat"
+                style="width: 180px"
+                placeholder="请输入坐标lat"
+              />~
+              <el-input
+                v-model="form.lng"
+                style="width: 180px"
+                placeholder="请输入坐标lng"
+              />
+            </el-form-item>
+            <el-form-item label="老板名称" prop="bossName">
+              <el-input v-model="form.bossName" placeholder="请输入老板名称" />
+            </el-form-item>
+            <el-form-item label="老板电话" prop="bossPhone">
+              <el-input v-model="form.bossPhone" placeholder="请输入老板电话" />
+            </el-form-item>
+            <el-form-item label="展示图片">
+              <imageUpload v-model="form.showPictures" />
+            </el-form-item>
+            <!-- <el-form-item label="标签" prop="labelText">
+              <el-input v-model="form.labelText" placeholder="请输入标签" />
+            </el-form-item> -->
+            <el-form-item label="营业时间">
+              <!-- <el-input v-model="form.businessHours" placeholder="请输入营业时间" /> -->
+              <el-time-select
+                placeholder="起始时间"
+                v-model="startTime"
+                :picker-options="{
+                  start: '00:00',
+                  step: '00:15',
+                  end: '23:45',
+                }"
+                style="width: 180px"
+              >
+              </el-time-select>
+              ~
+              <el-time-select
+                placeholder="结束时间"
+                v-model="endTime"
+                :picker-options="{
+                  start: '00:00',
+                  step: '00:15',
+                  end: '23:45',
+                  minTime: startTime,
+                }"
+                style="width: 180px"
+              >
+              </el-time-select>
+            </el-form-item>
+            <el-form-item label="地址" prop="addres">
+              <el-input
+                v-model="form.addres"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio
+                  v-for="dict in enableFlagOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="审核状态">
+              <el-radio-group v-model="form.auditFlag">
+                <el-radio
+                  v-for="dict in auditFlagOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+            <!-- <el-form-item label="审核人" prop="auditAt">
           <el-input v-model="form.auditAt" placeholder="请输入审核人" />
         </el-form-item> -->
-        <el-form-item label="审核时间" prop="auditTime">
-            <el-input v-model="form.auditTime" disabled placeholder="请输入审核时间" />
-          <!-- <el-date-picker clearable size="small"
+            <el-form-item label="审核时间" prop="auditTime">
+              <el-input
+                v-model="form.auditTime"
+                disabled
+                placeholder="请输入审核时间"
+              />
+              <!-- <el-date-picker clearable size="small"
             v-model="form.auditTime"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择审核时间">
           </el-date-picker> -->
-        </el-form-item>
+            </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane label="简介详情" name="second">
+            <el-form-item label="简介">
+              <editor v-model="form.briefContent" :min-height="192" />
+            </el-form-item>
+            <el-form-item label="详情">
+              <editor v-model="form.content" :min-height="192" />
+            </el-form-item>
+          </el-tab-pane>
+        </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -225,7 +316,7 @@ import { listShop, getShop, delShop, addShop, updateShop, exportShop } from "@/a
 
 export default {
   name: "Shop",
-  data() {
+  data () {
     return {
       // 遮罩层
       loading: true,
@@ -265,10 +356,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+          businessHours:[{ required: true, message: '营业时间不能为空' }]
+      },
+      startTime: null,
+      endTime: null,
+      activeName: 'first'
     };
   },
-  created() {
+  created () {
     this.getList();
     this.getDicts("sys_job_status").then(response => {
       this.enableFlagOptions = response.data;
@@ -279,7 +374,7 @@ export default {
   },
   methods: {
     /** 查询商铺管理列表 */
-    getList() {
+    getList () {
       this.loading = true;
       listShop(this.queryParams).then(response => {
         this.shopList = response.rows;
@@ -288,20 +383,22 @@ export default {
       });
     },
     // 状态字典翻译
-    enableFlagFormat(row, column) {
+    enableFlagFormat (row, column) {
       return this.selectDictLabel(this.enableFlagOptions, row.enableFlag);
     },
     // 审核状态字典翻译
-    auditFlagFormat(row, column) {
+    auditFlagFormat (row, column) {
       return this.selectDictLabel(this.auditFlagOptions, row.auditFlag);
     },
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
     // 表单重置
-    reset() {
+    reset () {
+      this.startTime = ""
+      this.endTime = ""
       this.form = {
         shopId: null,
         name: null,
@@ -324,41 +421,56 @@ export default {
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange (selection) {
       this.ids = selection.map(item => item.shopId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd () {
+
       this.reset();
+      this.startTime = "08:00"
+      this.endTime = "23:00"
       this.open = true;
       this.title = "添加商铺管理";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate (row) {
       this.reset();
       const shopId = row.shopId || this.ids
       getShop(shopId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改商铺管理";
+        if (this.form.businessHours) {
+          var dhours = this.form.businessHours.split("~");
+          console.log(dhours)
+          if (dhours && dhours.length == 2) {
+            this.startTime = dhours[0]
+            this.endTime = dhours[1]
+          }
+        }
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm () {
       this.$refs["form"].validate(valid => {
+        if (this.startTime && this.endTime) {
+          this.form.businessHours = this.startTime + "~" + this.endTime
+        }
         if (valid) {
+
           if (this.form.shopId != null) {
             updateShop(this.form).then(response => {
               this.msgSuccess("修改成功");
@@ -376,33 +488,33 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete (row) {
       const shopIds = row.shopId || this.ids;
       this.$confirm('是否确认删除商铺管理编号为"' + shopIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delShop(shopIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delShop(shopIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有商铺管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportShop(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportShop(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
     }
   }
 };