Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/views/home/data_tables.vue

@@ -57,7 +57,8 @@
         <!-- <el-table-column label="区域id" prop="areaId"></el-table-column> -->
         <el-table-column label="区域名称" prop="areaName"></el-table-column>
         <!-- <el-table-column label="门店id" prop="shopId"></el-table-column> -->
-        <el-table-column label="台桌号" prop="tableId"></el-table-column>
+        <!-- <el-table-column label="台桌Id" prop="tableId"></el-table-column> -->
+        <el-table-column label="台桌号" prop="tableName"></el-table-column>
         <el-table-column label="订单数量" prop="orderCount">
           <template v-slot="scope">
             <div class="cursor-pointer" @click="toTableOrderList(scope.row)">

src/views/invoicing/goods_stoks.vue

@@ -103,7 +103,7 @@
         <div class="head-container">
             <el-pagination @size-change="paginationSizeChange" :total="tableData.total"
                 :current-page="tableData.page + 1" :page-size="tableData.size" @current-change="paginationChange"
-                layout="total, sizes, prev, pager, next, jumper" ></el-pagination>
+                layout="total, sizes, prev, pager, next, jumper"></el-pagination>
         </div>
         <invoicingDetail ref="invoicingDetail" />
         <!-- 导入库存弹窗 -->
@@ -153,6 +153,7 @@ export default {
                 num: '',
                 categoryId: ''
             },
+            resetQuery: '',
             downloadLoading: false,
             uploadLoading: false,
             warnLine: null, // 警戒线
@@ -167,6 +168,7 @@ export default {
         }
     },
     mounted() {
+        this.resetQuery = { ...this.query }
         this.tbShopCategoryGet()
         this.getTableData()
     },
@@ -352,9 +354,7 @@ export default {
         },
         // 重置查询
         resetHandle() {
-            this.query.name = ''
+            this.query = { ...this.resetQuery }
-            this.query.num = ''
-            this.query.isStock = ''
             this.tableData.page = 0;
             this.tableData.list = []
             this.getTableData()

src/views/product/specification.vue

@@ -106,7 +106,8 @@ export default {
                     page: this.tableData.page,
                     size: this.tableData.size,
                     sort: 'id',
-                    shopId: localStorage.getItem('shopId')
+                    shopId: localStorage.getItem('shopId'),
+                    name: this.query.blurry
                 })
                 this.tableData.loading = false
                 this.tableData.list = res.content