update: update

src/views/ecm/form.js

@@ -83,6 +83,7 @@ export default {
         // store_mode: 0,
         consumerStoreType: 0, // 0 固定门店 1 门店条件
         order_store: '',
+        order_store_new: '',
         storedLowest: 0,
         storedMax: 0
       },
@@ -462,7 +463,8 @@ export default {
           // 触发门店初始化
           this.consumeChecked.store = Boolean(consumTrigger.store_mode) || false; /** 门店类型: 0: 所有门店, 1: 部分(包含部分门店, 部分分组等) **/
           this.form.consumerStoreType = result.consumerStoreType || 0; /** 消费门店类型 **/
-          this.form.order_store = consumTrigger.order_store || ''; /** 消费门店key值 **/
+          this.form.order_store = this.form.consumerStoreType === 0 ? consumTrigger.order_store : ''; /** 消费门店key值 **/
+          this.form.order_store_new = this.form.consumerStoreType === 1 ? consumTrigger.order_store : ''; /** 消费门店key值 **/
           if (this.form.effectAction === 'consume' && consumTrigger.store_mode && result.consumerStoreType === 0) {
             this.$nextTick(_ => {
               this.$refs.storeCard.init();
@@ -876,7 +878,7 @@ export default {
               let consumeObj = {
                 store_mode: this.consumeChecked.store ? 1 : 0,
                 consumerStoreType: this.form.consumerStoreType,
-                order_store: this.consumeChecked.store ? this.form.order_store : ''
+                order_store: this.consumeChecked.store ? (this.form.consumerStoreType === 0 ? this.form.order_store : this.form.order_store_new) : ''
               };
               // 勾选消费金额  --不填代表没有上下限，不传该字段
               if (this.consumeChecked.cost) {

src/views/ecm/form.vue

@@ -116,8 +116,8 @@
                   <el-radio :label="0">固定门店</el-radio>
                   <el-radio :label="1">按门店条件</el-radio>
                 </el-radio-group>
-                <dm-store-selector style="margin:20px 0 0 35px" v-if="form.consumerStoreType === 1" ref="newStoreCard" :uuid.sync="form.order_store"></dm-store-selector>
                 <vue-gic-store-card style="margin:20px 0 0 35px" v-if="form.consumerStoreType === 0" v-bind="storeParams" :readonly="!isAdd" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
+                <dm-store-selector style="margin:20px 0 0 35px" v-if="form.consumerStoreType === 1" ref="newStoreCard" :uuid.sync="form.order_store_new"></dm-store-selector>
               </template>
               <!--  <vue-gic-store-card v-else-if="consumeChecked.store" v-bind="storeParams" :readonly="!isAdd" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card> -->
             </div>