Merge branch 'dev' into 'test'

Dev

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

src/views/business/coupon/add.vue

@@ -177,6 +177,7 @@ export default {
                 message: this.addData.couponId ? '修改成功!' : '添加成功!',
                 type: 'success'
               })
+              this.$store.dispatch('tagsView/delView', this.$route.path)
               this.$router.go(-1)
             }
           }).catch(() => {

src/views/business/coupon/index.vue

@@ -10,14 +10,14 @@
         />
       </el-form-item>
       <el-form-item label="使用场景">
-        <el-select v-model="queryParams.type" placeholder="请选择券状态" clearable>
+        <el-select v-model="queryParams.type" placeholder="请选择券状态" clearable @change="queryParams.pageNum = 1;getList()">
           <el-option label="全部" value="" />
           <el-option label="盲票购买" :value="1" />
           <el-option label="门店消费" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态">
-        <el-select v-model="queryParams.status" placeholder="请选择券状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择券状态" clearable @change="queryParams.pageNum = 1;getList()">
           <el-option label="全部" value="" />
           <el-option label="待上架" value="init" />
           <el-option label="已上架" value="on" />

src/views/business/goods/add.vue

@@ -203,6 +203,7 @@ export default {
                 message: this.addData.goodsId ? '修改成功!' : '添加成功!',
                 type: 'success'
               })
+              this.$store.dispatch('tagsView/delView', this.$route.path)
               this.$router.go(-1)
             }
           })

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

@@ -78,12 +78,12 @@
           </td>
           <td>
             <el-form-item :prop="`skuList.${index}.quantity`" :rules="{ required: true, message: '请输入库存', trigger: 'blur' }">
-              <el-input-number v-model="sku.quantity" :min="0" />
+              <el-input-number v-model="sku.quantity" :min="0" @change="$event === 0 ? sku.status = false : sku.status = true" />
             </el-form-item>
           </td>
           <td style="padding: 0px 10px">
             <el-form-item :prop="`skuList.${index}.status`">
-              <el-switch v-model="sku.status" active-color="#13ce66" inactive-color="#ff4949" />
+              <el-switch v-model="sku.status" active-color="#13ce66" inactive-color="#ff4949" @change="!$event ? sku.quantity = 0 : sku.quantity = 1" />
             </el-form-item>
           </td>
         </tr>
@@ -149,6 +149,7 @@ export default {
         this.$set(item, 'valueY', accDiv(item.value, 100))
         this.$set(item, 'costY', accDiv(item.cost, 100))
         this.$set(item, 'picUrlArr', item.picUrl.split(',').map(item => { return { fileName: item }}))
+        this.$set(item, 'status', !!item.quantity)
         return item
       })
     },

src/views/business/goods/index.vue

@@ -18,23 +18,23 @@
         />
       </el-form-item>
       <el-form-item label="上架状态">
-        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable @change="queryParams.pageNum = 1;getList()">
           <el-option label="待上架" value="init" />
           <el-option label="已上架" value="on" />
           <el-option label="已下架" value="off" />
         </el-select>
       </el-form-item>
       <el-form-item label="成本">
-        <el-input v-model="queryParams.minCost" placeholder="最低成本" clearable />
+        <el-input v-model="queryParams.minCost" placeholder="最低成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item label="-">
-        <el-input v-model="queryParams.maxCost" placeholder="最高成本" clearable />
+        <el-input v-model="queryParams.maxCost" placeholder="最高成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item label="价格">
-        <el-input v-model="queryParams.minValue" placeholder="最低价格" clearable />
+        <el-input v-model="queryParams.minValue" placeholder="最低价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item label="-">
-        <el-input v-model="queryParams.maxValue" placeholder="最高价格" clearable />
+        <el-input v-model="queryParams.maxValue" placeholder="最高价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="queryParams.pageNum = 1;getList()">搜索</el-button>

src/views/business/ticket/index.vue

@@ -366,6 +366,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const boxIds = this.ids || [];
+      
       if (boxIds.length == 0) {
         this.$alert("请选择你要导出的盲票组！", "提示", { type: "warning" });
       } else {
@@ -375,14 +376,20 @@ export default {
           type: "warning",
         })
           .then(() => {
-            this.exportLoading = true;
+            this.vloading = this.$loading({
+              lock: true,
+              text: "正在导出.....",
+              background: "rgba(0, 0, 0, 0.7)",
+            });
             return exportTicket({ ids: boxIds });
           })
           .then((response) => {
+            this.vloading.close();
             this.download(response.msg);
             this.exportLoading = false;
           })
           .catch(() => {
+            this.vloading.close();
             this.exportLoading = false;
           });
       }