fix: 调整

index.html

@@ -28,6 +28,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.24.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js"></script><!-- 门店选择器 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script><!-- 新版门店选择器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/people.2.0.42.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js"></script><!-- 数据导出 -->

src/views/activity/form.vue

@@ -16,9 +16,14 @@
           <span class="tooltip-icon">会员分组</span>
         </el-tooltip>
         <div style="width:600px">
-          <vue-gic-member-group :readonly="disabled" onlyFixedType v-if="initMemberGroup" :defaltSelected="defaltSelected" :height="500" projectName="marketing" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
+          <vue-gic-member-group onlyFixedType v-if="initMemberGroup" :defaltSelected="defaltSelected" :height="500" projectName="marketing" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
         </div>
       </el-form-item>
+      <el-form-item label="门店范围">
+        {{ ruleForm.storeGroup }}
+        <vue-gic-store-new :options="options" :isAdd="isAdd" :creatorId="creatorId" :free-uuid="true" :scenesVal="scenes" scenes="auth" :uuid.sync="ruleForm.storeGroup" ref="storeNew" @store-change="storeChange"></vue-gic-store-new>
+        <div v-if="disabled && info.storeGroup != ruleForm.storeGroup" class="gray fz12"><i class="el-icon-warning mr5 red fz12"></i>数据对话已生效，门店修改无效</div>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submit">确认{{ isAdd ? '新建' : '保存' }}</el-button>
       </el-form-item>
@@ -61,7 +66,8 @@ export default {
         name: '',
         beginDate: '',
         endDate: '',
-        memberGroup: ''
+        memberGroup: '',
+        storeGroup: ''
       },
       rules: {
         name: [{ required: true, message: '请输入活动名称', trigger: 'change' }],
@@ -72,6 +78,14 @@ export default {
           return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
         }
       },
+      // 门店选择器
+      // 参数
+      uuid: '',
+      options: [0, 1, 2, 3, 4, 5],
+      data: '',
+      scenes: 'marketing',
+      creatorId: '',
+      info: {},
       // 会员分组
       defaltSelected: [],
       initMemberGroup: false,
@@ -79,6 +93,13 @@ export default {
       isEdit: this.$route.meta.type === 'edit'
     };
   },
+  // watch: {
+  //   'ruleForm.storeGroup'(newV, oldV) {
+  //     if (this.disabled && oldV) {
+  //       this.$tips({ type: 'warning', message: '数据对话已生效，门店修改无效' });
+  //     }
+  //   }
+  // },
   computed: {
     disabled() {
       return this.isEdit && new Date() > new Date(this.ruleForm.beginDate);
@@ -99,6 +120,9 @@ export default {
           delete params.beginDate;
           delete params.endDate;
         }
+        if (this.isEdit && this.disabled) {
+          params.storeGroup = this.info.storeGroup; // 编辑且生效时，门店id只保存历史info的id
+        }
         this.loading = true;
         saveActivity(params)
           .then(res => {
@@ -117,13 +141,15 @@ export default {
         .then(res => {
           const result = res.result || {};
           const { activityInfo, tagGroupList } = result;
-          const { name, beginDate, endDate, memberGroup } = activityInfo;
+          const { name, beginDate, endDate, memberGroup, storeGroup } = activityInfo;
+          this.info = activityInfo; // 备份详情
           this.ruleForm.name = name;
           this.ruleForm.beginDate = formatDateTimeByType(beginDate, 'yyyy-MM-dd-HH-mm-ss');
           this.ruleForm.endDate = formatDateTimeByType(endDate, 'yyyy-MM-dd-HH-mm-ss');
           this.ruleForm.memberGroup = memberGroup;
           this.defaltSelected = tagGroupList;
           this.ruleForm.name = name;
+          this.ruleForm.storeGroup = storeGroup;
           this.loading = false;
           this.$nextTick(() => {
             this.initMemberGroup = true;
@@ -133,6 +159,12 @@ export default {
           this.loading = false;
         });
     },
+    // *********门店选择器********
+    storeChange() {
+      return;
+      // if (this.disabled) {
+      // }
+    },
     // *********会员分组**********
     handleDataTransferred(data) {
       // 会员分组 情况下 memberSearchDTO 传数组字符串