增加微盟渠道

index.html

@@ -23,5 +23,6 @@
     <script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.00.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script>
+    <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script>
   </body>
 </html>

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -90,9 +90,7 @@
                   </el-form-item>
                   <div class="form-child margin-20" v-if="item.openStatus == true" :key="index">
                     <el-form-item label="选择店铺">
-                      <el-select v-model="item.channelRelationStoreType" placeholder="请选择">
-                        <el-option v-for="item in wMShopOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-                      </el-select>
+                      <vue-gic-store-new :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>
                     </el-form-item>
                     <el-form-item label="微盟商品" class="padding-0">
                       <el-select v-model="item.channelRelationProType" placeholder="请选择">
@@ -353,6 +351,7 @@ export default {
         integralGetEffectiveDays: 1, // 获取积分有效天
         integralUseStatus: '0', // 积分抵现开启 1是0否
         integralUse: null, // 积分抵现 {fee:5,integral:5}
+        perpetualFlag: 1,
         channelList: [
           {
             integralStrategyChannelId: '', //id
@@ -448,6 +447,7 @@ export default {
       options: [0, 1, 2, 3, 4, 5], // 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
       isAdd: true,
       scencs: 'integral',
+      wmuuid: '', // 微盟
 
       /* 人群筛选器 */
       dialogVisiblePeople: false,
@@ -523,6 +523,19 @@ export default {
                 obj.text = '请选择门店';
               }
             }
+            if (data.channelList[i].channelType == 9) {
+              const storeGroupDom = this.$refs.wmstoreGroup;
+              let flag = null;
+              if (storeGroupDom instanceof Array) {
+                flag = await this.$refs.wmstoreGroup[0].isStoreSave();
+              } else {
+                flag = await this.$refs.wmstoreGroup.isStoreSave();
+              }
+              if (!flag) {
+                obj.flag = false;
+                obj.text = '请选择门店';
+              }
+            }
           }
         }
       }
@@ -595,6 +608,9 @@ export default {
                     ele.channelStoreType = '-1';
                     ele.storeControlId = that.uuid;
                   }
+                  if (ele.channelType == '9') {
+                    ele.storeControlId = that.wmuuid;
+                  }
                 });
                 data.integralGet.fee = parseInt(data.integralGet.fee * 10);
                 data.integralGet.integral = parseInt(data.integralGet.integral * 10);
@@ -1092,6 +1108,7 @@ export default {
   .form-child {
     padding: 15px 20px 10px 0px;
     background: #f5f6f9;
+    margin: 22px 0;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -146,9 +146,7 @@
                   </el-form-item>
                   <div class="form-child margin-20" v-if="item.openStatus == true" :key="index">
                     <el-form-item label="选择店铺">
-                      <el-select v-model="item.channelRelationStoreType" placeholder="请选择">
-                        <el-option v-for="item in wMShopOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-                      </el-select>
+                      <vue-gic-store-new :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>
                     </el-form-item>
                     <el-form-item label="微盟商品" class="padding-0">
                       <el-select v-model="item.channelRelationProType" placeholder="请选择">
@@ -407,6 +405,7 @@ export default {
         integralGetEffectiveDays: 1, // 获取积分有效天
         integralUseStatus: 0, // 积分抵现开启 1是0否
         integralUse: null, // 积分抵现 {fee:5,integral:5}
+        perpetualFlag: 1,
         channelList: []
       },
       cateOptions: [
@@ -437,6 +436,7 @@ export default {
       options: [0, 1, 2, 3, 4, 5], // 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
       isAdd: true,
       scencs: 'integral',
+      wmuuid: '', // 微盟
       // 太平鸟标识
       tpnEditBool: false,
       tpnEnterpriseId: 'ff808081671d3ceb01672adebf4e6149'
@@ -515,6 +515,19 @@ export default {
                 obj.text = '请选择门店';
               }
             }
+            if (data.channelList[i].channelType == 9) {
+              const storeGroupDom = this.$refs.wmstoreGroup;
+              let flag = null;
+              if (storeGroupDom instanceof Array) {
+                flag = await this.$refs.wmstoreGroup[0].isStoreSave();
+              } else {
+                flag = await this.$refs.wmstoreGroup.isStoreSave();
+              }
+              if (!flag) {
+                obj.flag = false;
+                obj.text = '请选择门店';
+              }
+            }
           }
         }
       }
@@ -585,6 +598,9 @@ export default {
                     ele.channelStoreType = '-1';
                     ele.storeControlId = that.uuid;
                   }
+                  if (ele.channelType == '9') {
+                    ele.storeControlId = that.wmuuid;
+                  }
                 });
                 data.integralGet.fee = parseInt(data.integralGet.fee * 10);
                 data.integralGet.integral = parseInt(data.integralGet.integral * 10);
@@ -929,6 +945,10 @@ export default {
             this.uuid = ele.storeControlId;
             this.isAdd = false;
           }
+          if (ele.channelType == 9) {
+            this.wmuuid = ele.storeControlId;
+            this.isAdd = false;
+          }
           // 判断是否有微盟
           channelType.push(ele.channelType);
         });
@@ -1229,6 +1249,7 @@ export default {
   .form-child {
     padding: 15px 20px 10px 0px;
     background: #f5f6f9;
+    margin: 22px 0;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;

src/view/companyGroup/membershipSystem/pointSystem.vue

@@ -101,14 +101,14 @@
                 <el-table-column prop="" label="适用商品">
                   <template slot-scope="scope">
                     <span v-for="(item, index) in scope.row.channelList" :key="index">
-                      {{ item.channelRelationProType == 1 && item.integralUseDiscountControl == 1 ? '所有商品' : '自定义配置' }}
+                      <span v-if="item.channelType == 1">{{item.channelRelationProType == 1&&item.integralUseDiscountControl==1? "所有商品" : "自定义配置" }}</span>
                     </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="" label="折扣控制">
                   <template slot-scope="scope">
                     <span v-for="(item, index) in scope.row.channelList" :key="index">
-                      {{ item.integralUseDiscountControl == 1 ? '不限制' : item.integralUseDiscountControlLower + ':' + item.integralUseDiscountControlUpper }}
+                      <span v-if="item.channelType == 1">{{item.integralUseDiscountControl==1? "不限制" : (item.integralUseDiscountControlLower+':'+item.integralUseDiscountControlUpper) }}</span>
                     </span>
                   </template>
                 </el-table-column>
@@ -121,7 +121,7 @@
                 </el-table-column>
                 <el-table-column prop="" label="比例限制">
                   <template slot-scope="scope">
-                    <span v-for="(item, index) in scope.row.channelList" :key="index"> {{ item.useProportionalRestriction }}% </span>
+                    <span v-for="(item, index) in scope.row.channelList" :key="index"><span v-if="item.channelType == 1">{{item.useProportionalRestriction}}%</span></span>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作">