Merge remote-tracking branch 'origin/master'

src/views/sing_active/activerecord.vue

@@ -170,10 +170,35 @@ export default {
                 trigger: "blur"
               }]
             },
-
-
             {
-              label: "开始时间",
+              label: "上传作品开始时间",
+              prop: "uploadProductStartTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              search: true,
+              searchRange: true,
+              rules: [{
+                required: true,
+                message: "请输入开始时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "上传作品结束时间",
+              prop: "uploadProductEndTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              searchRange: true,
+              rules: [{
+                required: true,
+                message: "请输入开始时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "投票开始时间",
               prop: "startTime",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
@@ -187,7 +212,7 @@ export default {
               }]
             },
             {
-              label: "结束时间",
+              label: "投票结束时间",
               prop: "endTime",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",