Merge remote-tracking branch 'origin/master'

src/views/sing_active/activeproductrecord.vue

@@ -70,7 +70,8 @@
           <el-button type="primary" :size="size" icon="el-icon-search" slot="append"
                      @click="searchStateChange"></el-button>
         </el-input>
-        <el-button type="primary" :size="size" icon="el-icon-top" @click="generateListAndDownload">生成列表</el-button>
+<!--        <el-button type="primary" :size="size" icon="el-icon-top" @click="generateListAndDownload">生成列表[后端]</el-button>-->
+        <el-button type="primary" :size="size" icon="el-icon-top" @click="generateListAndDownloadOfWeb">生成列表</el-button>
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
       <template slot="menuLeft">
@@ -176,6 +177,7 @@ export default {
             label: "活动",
             prop: "activeId",
             search: true,
+            hide: true,
             searchslot: true,
             control:(val,form)=>{
               return this.controlActiveField(val,form);
@@ -197,6 +199,11 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "活动名称",
+            prop: "activeName",
+            display: true,
+          },
           {
             label: "类型",
             prop: "type",
@@ -643,6 +650,16 @@ export default {
         this.loading = false;
       });
     },
+    generateListAndDownloadOfWeb() {
+      const filterArray = ["关键字","类型","作品内容"];
+      this.$Export.excel({
+        title: `活动作品数据导出-${moment().format("yyyy-MM-DD HH:mm:ss")}`,
+        columns: this.option.column.filter(ele=>{
+          return filterArray.indexOf(ele.label)===-1;
+        }),
+        data: this.selectionList.length!==0?this.selectionList:this.data
+      });
+    }
   }
 };
 </script>

src/views/sing_point/cmccpointrecord.vue

@@ -90,6 +90,24 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "活动名称",
+              prop: "activeName",
+              rules: [{
+                required: true,
+                message: "请输入活动名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "作品名称",
+              prop: "activeProductName",
+              rules: [{
+                required: true,
+                message: "请输入作品名称",
+                trigger: "blur"
+              }]
+            },
             {
               label: "手机号码",
               search: true,