Merge branch '03/03GRADE' into dev

src/views/reportForm/index.vue

@@ -770,10 +770,7 @@ export default {
       let endTime, startTime;
       if (this.AccountTimer && this.AccountTimer.length > 1) {
         startTime = this.AccountTimer[0];
-        let end = this.AccountTimer[1];
-        end = new Date(end);
-        end = new Date(end.getFullYear(), end.getMonth() + 1, 0);
-        endTime = dayjs(end).format("YYYY-MM-DD");
+        endTime = this.AccountTimer[1];
       }else{
         startTime=null;
         endTime=null;
@@ -793,10 +790,8 @@ export default {
       let endTime, startTime;
       if (this.AccountDetailTimer && this.AccountDetailTimer.length > 1) {
         startTime = this.AccountDetailTimer[0];
-        let end = this.AccountDetailTimer[1];
-        end = new Date(end);
-        end = new Date(end.getFullYear(), end.getMonth() + 1, 0);
-        endTime = dayjs(end).format("YYYY-MM-DD");
+        endTime = this.AccountDetailTimer[1];
+
       }else{
         startTime=null;
         endTime=null;

src/views/teamBuild/forecastName.vue

@@ -221,9 +221,9 @@
     </div>
 
     <!-- 预报名链接 -->
-    <qr-code v-model="codeStatus" title="预报名二维码" :codeUrl="codeUrl" />
+    <qr-code v-model="codeStatus" title="预报名链接" :codeUrl="codeUrl" />
     <!-- 预报名详情 -->
-     <qr-code v-model="codedetailStatus" title="预报名二维码" :codeUrl="detailUrl" />
+     <qr-code v-model="codedetailStatus" title="预报名详情" :codeUrl="detailUrl" />
     <!-- 发送家长会通知 -->
     <el-dialog
       title="发送家长会通知"