瀏覽代碼

文案和样式修改

1
mo 3 年之前
父節點
當前提交
12fc5f5bd0
共有 2 個文件被更改,包括 39 次插入35 次删除
  1. 38 34
      src/views/teamBuild/forecastName.vue
  2. 1 1
      src/views/teamBuild/initiationList.vue

+ 38 - 34
src/views/teamBuild/forecastName.vue

@@ -9,21 +9,27 @@
         </p> -->
 
     <div class="btnList">
+      <auth :auths="['musicGroup/sendParentMeetingNotice']" v-if="isedit">
+        <el-button type="primary" @click="extendPaymentStatus = true"
+          >预报名家长会通知</el-button
+        >
+      </auth>
       <auth :auths="['forecastName/forecastLink']" v-if="isedit">
         <el-button type="primary" @click="codeStatus = true"
-          >预报名链接</el-button
+          >预报名问卷</el-button
         >
       </auth>
-
-      <el-button type="primary" @click="codedetailStatus = true" v-if="isedit"
-        >预报名详情</el-button
-      >
-
-      <auth :auths="['musicGroup/sendParentMeetingNotice']" v-if="isedit">
-        <el-button type="primary" @click="extendPaymentStatus = true"
-          >家长会通知</el-button
+      <auth :auths="['studentRegistration/preRegisterExport']">
+        <el-button type="primary" @click="downloadFile"
+          >预报名信息导出</el-button
+        >
+      </auth>
+      <auth :auths="['studentRegistration/queryPreApplySubjectList']">
+        <el-button type="primary" @click="subjectVisible = true"
+          >意向统计</el-button
         >
       </auth>
+
       <auth :auths="['musicGroup/finishPreApply']">
         <el-button type="primary" @click="onPaymentGroup" v-if="isedit"
           >乐团缴费</el-button
@@ -34,14 +40,9 @@
           >特色乐团缴费</el-button
         >
       </auth>
-      <auth :auths="['studentRegistration/preRegisterExport']">
-        <el-button type="primary" @click="downloadFile">导出</el-button>
-      </auth>
-      <auth :auths="['studentRegistration/queryPreApplySubjectList']">
-        <el-button type="primary" @click="subjectVisible = true"
-          >意向统计</el-button
-        >
-      </auth>
+      <el-button type="primary" @click="codedetailStatus = true" v-if="isedit"
+        >预报名H5统计</el-button
+      >
     </div>
 
     <div class="m-core">
@@ -50,7 +51,7 @@
         @reset="onReSet"
         @submit="search"
         :model="searchForm"
-        save-key='/forecastName'
+        save-key="/forecastName"
         ref="searchForm"
       >
         <el-form-item prop="name">
@@ -188,7 +189,7 @@
                   : null
               }}
               {{
-                scope.row.teacherRecommandSubjectId==-1 &&
+                scope.row.teacherRecommandSubjectId == -1 &&
                 !scope.row.teacherRecommandSubjectName
                   ? "无"
                   : null
@@ -298,7 +299,7 @@
           </el-table-column>
         </el-table>
         <pagination
-          save-key='/forecastName'
+          save-key="/forecastName"
           sync
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
@@ -356,7 +357,7 @@
         <el-form-item label="短信内容">
           <p class="msgP" v-html="sysMsgStr"></p>
         </el-form-item>
-        <p style="color: red">确认后该短信将发送给预报名的学员</p>
+        <p style="color: red">确认后该短信将发送给已填写预报名问卷的学员</p>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="extendPaymentStatus = false">取 消</el-button>
@@ -421,7 +422,7 @@ import {
   queryPreApplyList,
   finishPreApply,
   sendParentMeetingNotice,
-  getSysMessageConfig
+  getSysMessageConfig,
 } from "./api";
 export default {
   name: "forecastName",
@@ -474,21 +475,20 @@ export default {
         ],
       },
       preLookVisible: false,
-      sysMsg:'',
-      subjectList:[]
+      sysMsg: "",
+      subjectList: [],
     };
   },
-async mounted() {
-   await this.$store.dispatch("setSubjects");
-         // 获取短信推送模板
-         this.subjectList = [...this.selects.subjects]
-this.subjectList.push({id:-1,name:'无'})
-      const rus = await getSysMessageConfig({
-        type: "STUDENT_SMS_IM_MUSIC_GROUP_PARENT_MEETING_NOTICE",
-      });
-      this.sysMsg = rus.data.content;
+  async mounted() {
+    await this.$store.dispatch("setSubjects");
+    // 获取短信推送模板
+    this.subjectList = [...this.selects.subjects];
+    this.subjectList.push({ id: -1, name: "无" });
+    const rus = await getSysMessageConfig({
+      type: "STUDENT_SMS_IM_MUSIC_GROUP_PARENT_MEETING_NOTICE",
+    });
+    this.sysMsg = rus.data.content;
     this.getList();
-
   },
   methods: {
     permission,
@@ -623,4 +623,8 @@ this.subjectList.push({id:-1,name:'无'})
 </script>
 
 <style lang="less" scoped>
+.msgP {
+  line-height: 24px;
+  margin-top: 10px;
+}
 </style>

+ 1 - 1
src/views/teamBuild/initiationList.vue

@@ -248,7 +248,7 @@
         </el-form-item>
         <el-form-item label="短信内容" >
           <p class="msgP" v-html="sysMsgStr"></p> </el-form-item>
-        <p style="color:red">确认后该短信将发送给已填写启蒙课问卷学员</p>
+        <p style="color:red">确认后该短信将发送给已填写启蒙课问卷且【报名参加管乐团家长会了解相关情况】选择【是】的学员</p>
       </el-form>
 
       <div slot="footer" class="dialog-footer">