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

src/views/card/form.js

@@ -537,7 +537,11 @@ export default {
         .then(res => {
           const { importId, importCount, importSuccessCount, importDuplicateCount, costStoreList } = res.result;
           this.importCost.costStoreList = costStoreList;
-          this.$message.success(`上传${importCount}条数据，${importDuplicateCount > 0 ? `${importDuplicateCount}条数据重复，` : ''}${importSuccessCount}条数据上传成功`);
+          if (importCount == importSuccessCount) {
+            this.$message.success(`${importSuccessCount}条数据上传成功`);
+          } else {
+            this.$message.success(`${importSuccessCount}条数据上传成功，${importCount - importSuccessCount}条数据上传失败`);
+          }
           if (importCount - importSuccessCount - importDuplicateCount > 0) {
             this.importCost.options.downloadTemplate.splice(1, 1, {
               url: `/api-marketing/download-cost-store-error?requestProject=marketing&importId=${importId}`,
@@ -865,9 +869,9 @@ export default {
             this.form.costValueProportionFlag = card.costValueProportionFlag || 0; // 卡券成本比例 1：开 0：关
             this.form.costValueType = card.costValueType || 0; //成本费用0固定成本1门店成本
             this.form.costValueProportion = card.costValueProportion; //成本比例
-            this.form.costStoreList = (this.isEdit || this.isInfo || this.isCopy) && Array.isArray(card.costStoreList) ? card.costStoreList : [];
+            this.form.costStoreList = (this.isEdit || this.isInfo || this.isCopy) && card.storeWidgetKey && Array.isArray(card.costStoreList) ? card.costStoreList : [];
             this.originStoreList = this.form.costStoreList;
-            if (this.isCopy) {
+            if (this.isCopy && card.storeWidgetKey) {
               this.onStoreChange(card.storeWidgetKey);
             }
           }
@@ -1080,7 +1084,7 @@ export default {
 
       if (this.form.cardType == 3) {
         if (this.form.costValueProportionFlag == 1) {
-          if (!this.storeUuid || (!(this.isEdit && this.storeMode == 0) && (!Array.isArray(this.originStoreList) || this.originStoreList.length == 0))) {
+          if (!(this.isEdit && this.storeMode == 0) && (!Array.isArray(this.originStoreList) || this.originStoreList.length == 0)) {
             this.$tips({ type: 'warning', message: '请选择卡券适用门店' });
             const body = document.getElementsByClassName('dm-layout-page')[0];
             toTop(body, this.$refs.useStore.$el.offsetTop - body.offsetTop);