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

src/views/card/form.js

@@ -536,9 +536,9 @@ export default {
       formData.append('requestProject', 'marketing');
       importCostStore(formData)
         .then(res => {
-          const { importId, importCount, importSuccessCount, costStoreList } = res.result;
+          const { importId, importCount, importSuccessCount, importDuplicateCount, costStoreList } = res.result;
           this.importCost.costStoreList = costStoreList;
-          this.$message.success(`上传${importCount}条数据，${importSuccessCount}条数据上传成功`);
+          this.$message.success(`上传${importCount}条数据，${importDuplicateCount > 0 ? `${importDuplicateCount}条数据重复，` : ''}${importSuccessCount}条数据上传成功`);
           if (importCount - importSuccessCount > 0) {
             this.importCost.options.downloadTemplate.splice(1, 1, {
               url: `/api-marketing/download-cost-store-error?requestProject=marketing&importId=${importId}`,