Merge branch 'bugfix/微盟卡券' into dev

src/views/card/form.js

@@ -182,6 +182,7 @@ export default {
       uuid: '',
       currentPage: 1,
       pageSize: 50,
+      search: '',
       wmPid: '',
       idx: '',
       totalPage: 0,
@@ -1538,15 +1539,22 @@ export default {
     handleShopChange(wmPid, idx) {
       this.weimobDemoCodeList[idx].cardList = [];
       this.weimobDemoCodeList[idx].card = '';
+      this.currentPage=1;
+      this.search='';
       this.wmPid=wmPid;
       this.idx=idx;
       this.weimobDemoCodeList[this.idx].loading = true;
       this.listEntepriseWeimobCoupon();
 
     },
-    listEntepriseWeimobCoupon(search){
-     
-      listEntepriseWeimobCoupon({ search,wmPid:this.wmPid,pageSize:this.pageSize, currentPage:this.currentPage})
+    listEntepriseWeimobCoupon(){
+     let params={
+      wmPid:this.wmPid,pageSize:this.pageSize, currentPage:this.currentPage
+     }
+     if(this.search!=''){
+      params.search=this.search;
+     }
+      listEntepriseWeimobCoupon(params)
       .then(res => {
         console.log(res.result)
         const {result,totalPage,currentPage} =  res.result;
@@ -1563,14 +1571,15 @@ export default {
       });
     },
     remoteMethod(val){
-      console.log(val);
+      this.search=val;
       this.currentPage=1;
       this.weimobDemoCodeList[this.idx].cardList =  [];
       this.weimobDemoCodeList[this.idx].loading = true;
-      this.listEntepriseWeimobCoupon(val);
+      this.listEntepriseWeimobCoupon();
     },
     handleClear(){
       this.currentPage=1;
+      this.search='';
       this.weimobDemoCodeList[this.idx].cardList =  [];
       this.weimobDemoCodeList[this.idx].loading = true;
       this.listEntepriseWeimobCoupon();
@@ -1581,6 +1590,9 @@ export default {
         this.listEntepriseWeimobCoupon();
       }
     },
+    handleBlur(){
+      this.search='';
+    },
     // ---------微盟店铺结束--------
     // ------微盟适用商品开始-------
     // 获取第一层数据

src/views/card/form.vue

@@ -56,7 +56,7 @@
             <el-select class="w200" :disabled="saveItem.save || isEdit || isInfo" v-model="saveItem.pid" filterable placeholder="请选择店铺" clearable @change="handleShopChange($event, idx)">
               <el-option :disabled="wmShopIds.includes(item.wmPid)" v-for="item in weimobShopList" :key="item.wmPid" :label="item.wmPidName" :value="item.wmPid"></el-option>
             </el-select>
-            <el-select v-loadmore="getMore" :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" remote filterable placeholder="请选择微盟卡券" :remote-method="remoteMethod" @clear="handleClear" clearable>
+            <el-select v-loadmore="getMore" @blur="handleBlur" :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" remote filterable placeholder="请选择微盟卡券" :remote-method="remoteMethod" @clear="handleClear" clearable>
               <el-option v-for="item in saveItem.cardList" :key="item.cardTemplateId" :label="item.name" :value="item.cardTemplateId"></el-option>
             </el-select>
             <template v-if="isAdd || isCopy">