Merge branch 'feature/7月-会员积分' into dev

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -1061,7 +1061,7 @@ export default {
                   if(this.timeType==0 || this.timeType == null){
                     data.integralGetEffectiveDays = this.effectiveDays
                   }else {
-                    data.integralExpireRule = this.timeRuleType
+                    data.integralExpireRule = this.timeRuleType.toString()
                   }
                 }else if (data.userGeneralIntegralExpireRule == 0) {
                   if(data.integralExpireType == 0) {

src/view/companyGroup/membershipSystem/editIntegralSytem.vue

@@ -49,7 +49,6 @@
                   <div class="form-child margin-20" v-if="item.openStatus == 1" :key="index">
                     <el-form-item label="选择商户">
                       <el-select
-                      :disabled="opendisabled1"
                         v-model="item.enterpriseRelationIdArr"
                         placeholder="请选择"
                         multiple
@@ -166,7 +165,7 @@
                       </el-select>
                     </el-form-item>
                     <el-form-item label="选择店铺" class="margin-20">
-                      <el-select :disabled="opendisabled9" v-model="storeValue" v-if="!isJinHua" class="w240">
+                      <el-select v-model="storeValue" v-if="!isJinHua" class="w240">
                         <el-option label="所有门店" value=""></el-option>
                       </el-select>
                       <vue-gic-store-new :disabled="opendisabled9" v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -34,7 +34,7 @@
                         :uuid.sync="uuid"
                         :isClique="true"
                         ref="storeGroup"
-                        :disabled="opendisabled3"
+                        :readonly="opendisabled3"
                       ></dm-store-selector>
                     </el-form-item>
                     <el-form-item label="适用商品:" prop="name" class="margin-20">
@@ -298,7 +298,7 @@
                       <vue-gic-store-new :disabled="opendisabled9" v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>
                     </el-form-item>
                     <el-form-item label="微盟商品:" class="margin-20">
-                      <el-select v-model="item.channelRelationProType" placeholder="请选择" class="w215">
+                      <el-select :disabled="opendisabled9" v-model="item.channelRelationProType" placeholder="请选择" class="w215">
                         <el-option v-for="item in wMGoodOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                       </el-select>
                     </el-form-item>
@@ -1138,7 +1138,7 @@ export default {
                   if(this.timeType==0 || this.timeType == null){
                     data.integralGetEffectiveDays = this.effectiveDays
                   }else {
-                    data.integralExpireRule = this.timeRuleType
+                    data.integralExpireRule = this.timeRuleType.toString()
                   }
                 }else if (data.userGeneralIntegralExpireRule == 0) {
                   if(data.integralExpireType == 0) {