commit

src/main/resources/views/mobile/meeting/notify.html

@@ -237,18 +237,18 @@ layout("/mobile/platform.html"){
                             </div>
                         </template>
                         <template #input>
-                            <van-checkbox v-model="item.canJoin" shape="square"></van-checkbox>
+                            <van-radio-group v-model="item.isJoinByMsg" direction="horizontal">
+                                <van-radio :name="true">参加</van-radio>
+                                <van-radio :name="false">不参加</van-radio>
+                            </van-radio-group>
                         </template>
                     </van-field>
                 </div>
             </div>
         </div>
         <div class="footer">
-            <van-button @click="canJoin(false)" block color="#1867b0" round type="primary">
-                不参加
-            </van-button>
-            <van-button @click="canJoin(true)" block color="#1867b0" round type="primary">
-                参加
+            <van-button @click="submit" block color="#1867b0" round type="primary">
+                提交
             </van-button>
         </div>
     </div>
@@ -303,7 +303,6 @@ layout("/mobile/platform.html"){
                 mtpId: '',
                 isIncorrect: true,
                 typeName: '',
-                isJoin: true,
             }
         },
         methods: {
@@ -323,14 +322,15 @@ layout("/mobile/platform.html"){
                 }
                 $('#app').css('opacity', '1')
             },
-            async canJoin(type) {
-                this.isJoin = type
-                if(!type) {
-                    const joinArray = this.meetingInfo.meetingTimePeriods.filter(o => o.canJoin === true)
-                    if(joinArray.length === 0) {
-                        this.$modal.alert('请选择不参加的时间段')
+            async submit() {
+                for (let item of this.meetingInfo.meetingTimePeriods) {
+                    if(item.isJoinByMsg === null || item.isJoinByMsg === undefined) {
+                        this.$modal.msg('请选择是否参加')
                         return
                     }
+                }
+                const join = this.meetingInfo.meetingTimePeriods.filter(o => o.isJoinByMsg === false)
+                if(join.length > 0) {
                     this.notJoinShow = true
                 } else {
                     const confirm = await vant.Dialog.confirm({
@@ -355,21 +355,21 @@ layout("/mobile/platform.html"){
                 }
             },
             async joinDo() {
-                const ids = this.meetingInfo.meetingTimePeriods.filter(o => o.canJoin === true).map(o => o.id)
                 const resp = await $.post('/mobile/meeting/notify/joinDo', {
-                    isJoin: this.isJoin,
                     notJoinReason: this.notJoinReason,
-                    ids: JSON.stringify(ids),
+                    data: JSON.stringify(this.meetingInfo.meetingTimePeriods),
                     meetingId: this.meetingInfo.id
                 })
-                this.$modal.msg(resp.msg)
+                this.isIncorrect = resp.code === 0
+                this.isCanAudit = false
+                this.incorrectMag = resp.msg
                 this.notJoinShow = false
             },
             async readDo() {
                 await $.post('/mobile/meeting/notify/readDo', {meetingId: this.meetingInfo.id})
             },
             back() {
-                const str = this.incorrectMag === '你不是当前会议人员' ? 'http://' + window.location.host : '/mobile/meeting/mine/go_sign?meetingId=' + this.meetingId + '&mtpId=' + this.mtpId
+                const str = this.incorrectMag === '你不是当前会议人员' ? 'http://' + window.location.host : '/mobile/meeting/notify?meetingId=' + this.meetingId + '&mtpId=' + this.mtpId
                 location.href = str
             },
         },

src/main/resources/views/platform/meeting/manage/add.html

@@ -201,7 +201,7 @@ layout("/layouts/platform.html"){
                     submitFormData.endTime = this.formData.meetingTime && this.formData.meetingTime.length > 1 ? this.formData.meetingTime[1] : ''
 
                     if (this.msgData.sendTypes.length > 0) {
-                        const confirm = await this.$confirm('下一步需要到消息管理系统中择机发送短信通知', '提示', {
+                        const confirm = await this.$confirm('下一步需要到会议管理菜单中择机发送短信通知', '提示', {
                             confirmButtonText: '确定',
                             showCancelButton: false,
                             type: 'warning'

src/main/resources/views/platform/meeting/statistics/msgManage.html

@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
                                  sortable show-overflow-tooltip>
                     <template scope="scope">
                         <span v-if="scope.row.isJoinByMsg === false || scope.row.isJoinByMsg === 0" style="color: red">不参加</span>
-                        <span v-else-if="!scope.row.isJoinByMsg">未选择</span>
+                        <span v-else-if="scope.row.isJoinByMsg === null || scope.row.isJoinByMsg === undefined">未选择</span>
                         <span v-else>参加</span>
                     </template>
                 </el-table-column>