Merge branch 'feature/8月-奥莱定制' into dev

src/views/card/form.js

@@ -471,8 +471,15 @@ export default {
               const { storeId, storeCode, storeName } = el;
               return { storeId, storeCode, storeName, costValueProportion: undefined, costValue: 0 };
             });
+            if (this.isEdit) {
+              // 编辑卡券通过门店选择器添加门店时，需要先过滤掉已经选中的门店，再与form.costStoreList合并
+              this.selectedStoreList = this.selectedStoreList.filter(el => this.form.costStoreList.every(item => item.storeId != el.storeId));
+              this.originStoreList = [...this.selectedStoreList, ...this.form.costStoreList];
+            } else if (this.isAdd || this.isCopy) {
+              // 新建卡券时直接覆盖
+              this.originStoreList = this.selectedStoreList;
+            }
           }
-          this.originStoreList = this.selectedStoreList;
         });
       } else {
         getStoreWidgetStore({ key: id, pageSize: 99999, currentPage: 1 }).then(res => {