Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!280

src/views/business/goods/components/spec.vue

@@ -43,7 +43,7 @@
           <th rowspan="2" class="required"><span>＊</span>回收折扣(%)</th>
           <th rowspan="2">盲豆划线价</th>
           <th rowspan="2">商品成本(元)</th>
-          <th rowspan="2">SKU编码</th
+          <th rowspan="2">SKU编码</th>
           <th rowspan="2" class="required"><span>＊</span>库存</th>
           <th rowspan="2">启用</th>
         </tr>

src/views/business/goods/index.vue

@@ -248,7 +248,7 @@ export default {
 
     // 重置
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = { pageNum: 1, pageSize: 20, orderByColumn: '', isAsc: '',}
       this.getList();
     },
 

src/views/business/ticket/components/GoodsAdd.vue

@@ -46,6 +46,7 @@
         >查询
         </el-button
         >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()">重置</el-button>
       </div>
       <el-table
         v-loading="loading"
@@ -179,6 +180,13 @@ export default {
         this.loading = false;
       });
     },
+    //重置
+    resetQuery(){
+      this.goodsTitle = ''
+      this.queryParams = {}
+      this.pageParams.pageNum = 1
+      this.getGoodsList();
+    },
 
     // 选中商品
     handleSelectionGoods(e) {