lex-xin преди 4 години
родител
ревизия
ca34c4e3bb

+ 8 - 0
src/views/teamBuild/api.js

@@ -54,3 +54,11 @@ export const queryPreApplyList = data => request2({
   method: 'get',
   requestType: 'json'
 })
+
+// 发送家长会通知
+export const sendParentMeetingNotice = data => request2({
+  url: '/api-web/musicGroup/sendParentMeetingNotice',
+  data,
+  method: 'post',
+  requestType: 'form'
+})

+ 1 - 1
src/views/teamBuild/components/forecast-list.vue

@@ -86,7 +86,7 @@
                     <el-table-column
                         align="center"
                         prop="subjectFirstName"
-                        label="选报声部1"
+                        label="选报声部"
                     >
                         <template slot-scope="scope">
                             {{ scope.row.subjectFirstName }},{{ scope.row.subjectSecondName }}

+ 1 - 1
src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -459,7 +459,7 @@ export default {
             //  zheli
 
             // 把第3步单独拆出来做成独立的模块
-            this.$confirm('乐团是否提交审核?', '提示', {
+            this.$confirm('乐团创建成功,是否提交审核?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'

+ 42 - 27
src/views/teamBuild/forecastName.vue

@@ -9,14 +9,14 @@
         </p> -->
 
         <div class="btnList">
-            <auth :auths="['/main']">
+            <auth :auths="['forecastName/forecastLink']">
               <el-button type="primary" @click="codeStatus = true">预报名链接</el-button>
             </auth>
             <!-- <auth>
               <el-button type="primary" @click="extendPaymentStatus = true">预报名时间延长</el-button>
             </auth> -->
-            <auth>
-              <el-button type="primary">家长会通知</el-button>
+            <auth :auths="['musicGroup/sendParentMeetingNotice']">
+              <el-button type="primary" @click="extendPaymentStatus = true">家长会通知</el-button>
             </auth>
             <auth :auths="['musicGroup/finishPreApply']">
               <el-button type="primary" @click="onPaymentGroup">乐团缴费</el-button>
@@ -165,24 +165,28 @@
 
         <!-- 预报名连接 -->
         <qr-code v-model="codeStatus" title="预报名二维码" :codeUrl="codeUrl" />
-        <!-- 预报名时间延长 -->
-        <!-- <el-dialog
-            title="预报名时间延长"
+        <!-- 发送家长会通知 -->
+        <el-dialog
+            title="发送家长会通知"
             :visible.sync="extendPaymentStatus"
-            destroy-on-close
+            @close="onClose('extendForm')"
             width="400px"
         >
-            <el-form label-width="120px" :model="extendForm" ref="extendForm" :rules="extendRule">
-                <el-form-item label="延长预报名时间" prop="expireDate">
+            <el-form label-width="110px" :model="extendForm" ref="extendForm" :rules="extendRule">
+                <el-form-item label="家长会时间" prop="meetingDate">
                     <el-date-picker
-                        v-model.trim="extendForm.expireDate"
-                        value-format="yyyy-MM-dd"
-                        type="date"
+                        style="width: 100% !important;"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        v-model.trim="extendForm.meetingDate"
+                        type="datetime"
                         :picker-options="applyDates"
-                        placeholder="选择日期"
+                        placeholder="请选择家长会时间"
                     >
                     </el-date-picker>
                 </el-form-item>
+                <el-form-item label="家长会地址" prop="address">
+                    <el-input v-model="extendForm.address" placeholder="请输入家长会地址"></el-input>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="extendPaymentStatus = false">取 消</el-button>
@@ -191,7 +195,7 @@
                     @click="onExtendPayment('extendForm')"
                 >确 定</el-button>
             </div>
-        </el-dialog> -->
+        </el-dialog>
         <!-- 回访记录 -->
         <el-dialog
             title="新增回访"
@@ -211,7 +215,7 @@ import qrCode from '@/components/QrCode/index';
 import { permission } from "@/utils/directivePage";
 import { vaildStudentUrl } from '@/utils/validate'
 import visitModel from './modals/visit'
-import { queryPreApplyList, finishPreApply } from './api'
+import { queryPreApplyList, finishPreApply, sendParentMeetingNotice } from './api'
 export default {
     name: 'forecastName',
     components: { pagination, qrCode, visitModel },
@@ -239,12 +243,14 @@ export default {
             visitDetail: null,
             extendPaymentStatus: false,
             extendForm: {
-                expireDate: null,
+                meetingDate: null,
+                address: null,
             },
             extendRule: {
-                expireDate: [
-                    { required: true, message: "请选择延长时间", trigger: "change" },
+                meetingDate: [
+                    { required: true, message: "请选择家长会时间", trigger: "change" },
                 ],
+                address: [{ required: true, message: "请输入家长会地址", trigger: 'blur' }]
             },
         }
     },
@@ -309,25 +315,34 @@ export default {
             }
             // this.visitDetail = rows
         },
+        onClose(formName) {
+            this.$refs[formName].resetFields()
+        },
         onExtendPayment(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate(async (valid) => {
                 if(valid) {
-
+                    try {
+                        await this.$confirm('您是否确定发送家长会通知?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        })
+                        await sendParentMeetingNotice({ ...this.extendForm, musicGroupId: this.musicGroupId })
+                        this.$message.success('家长会通知已发送')
+                        this.extendPaymentStatus = false
+                    } catch(error) {}
                 }
             })
         },
         applyDates() {
-            let self = this;
             return {
                 firstDayOfWeek: 1,
                 disabledDate(time) {
-                if (self.paymentExpireDate) {
-                    return (
-                    time.getTime() >
-                    new Date(self.paymentExpireDate.replace(/-/g, "/")).getTime()
-                    );
+                if (end) {
+                    return new Date(end).getTime() - 86400000 >= time.getTime();
                 } else {
-                    return false;
+                    return time.getTime() + 86400000 < Date.now();
+                    //开始时间不选时,结束时间最大值小于等于当天
                 }
                 },
             };