Browse Source

app端三会一课

pengjing 9 months ago
parent
commit
ada374b98e

+ 25 - 0
parth5/parth5/src/app/api/partylife/shyk/index.ts

@@ -15,6 +15,22 @@ export interface reqParams {
   endDate: string;
 }
 
+export interface signInData {
+  meetingId: string,
+  userCode: string,
+  isSignin: any,
+  userId: string,
+  userName: string,
+  userRemark: string
+}
+
+export interface checkInData {
+  meetingId: string,
+  userCode: string,
+  userId: string,
+  userName: string
+}
+
 
 @Injectable({providedIn: 'root'})
 export class SHYKApi {
@@ -75,5 +91,14 @@ export class SHYKApi {
     });
   }
 
+  signinMeeting(data: signInData) {
+    return this.configService.HttpPostRomote('/appApi/shyk/signinMeeting', data);
+  }
+
+  checkinMeeting(data: checkInData) {
+    return this.configService.HttpPostRomote('/appApi/shyk/checkinMeeting', data)
+  }
+
+
 }
 

+ 46 - 47
parth5/parth5/src/app/views/pages/partylife/shyk/detail/detail.component.html

@@ -9,12 +9,11 @@
 <ion-content>
   <!--会议信息-->
   <form class="form-table">
-    <ion-item>
-      【{{shykTypeName}}】{{dataModel.partyname}}
-    </ion-item>
     <ion-item>
       <ion-label>会议类别</ion-label>
-      <ion-text>{{shykTypeName}}</ion-text>
+      <ion-text>
+        <span *ngFor="let it of meetingTypeList;let last = last">{{it.shykTypeName}}{{last?'':'、'}}</span>
+      </ion-text>
     </ion-item>
     <ion-item>
       <ion-label>会议时间</ion-label>
@@ -26,22 +25,13 @@
       <ion-label>所属组织</ion-label>
       <ion-text>{{dataModel.partyname}}</ion-text>
     </ion-item>
-    <ion-item style="--inner-border-width: 0px 0px 0px 0px;">
-      <ion-label *ngIf="dataModel.shyktype !=4">会议议题
-      </ion-label>
-      <ion-label *ngIf="dataModel.shyktype ==4">会议主题
-      </ion-label>
+    <ion-item>
+      <ion-label>议题</ion-label>
+      <ion-text>{{dataModel.topiccontent}}</ion-text>
     </ion-item>
-    <ion-item class="meeting-yiti">
-      <ion-text>
-        <div *ngFor="let it of topicList;let first=first;let index=index;"
-             ngClass="{{first?'':'meeting-yiti-item'}}" (click)="showTopic(it.MODELID)">
-          <span>{{index + 1}}、{{it.TOPICNAME}}</span>
-          <!--<img *ngIf="it.MODELID!=null && it.MODELID!=''" class="meeting-yiti-showimg"-->
-          <!--src="assets/icon/showlist.svg"/>-->
-          <br>
-        </div>
-      </ion-text>
+    <ion-item>
+      <ion-label>是否第一议题</ion-label>
+      <ion-text>{{dataModel.isfirsttopic ? '是' : '否'}}</ion-text>
     </ion-item>
     <ion-item>
       <ion-label>会议地点</ion-label>
@@ -53,11 +43,11 @@
       <ion-label class="meeting-recorduser">记录人</ion-label>
       <ion-text>{{dataModel.recorduser}}</ion-text>
     </ion-item>
-    <!--<ion-item style="--inner-border-width: 0px 0px 0px 0px;">
+    <ion-item style="--inner-border-width: 0px 0px 0px 0px;">
       <ion-label>会场照片</ion-label>
     </ion-item>
     <app-imglist [(imgOption)]="imgOption1"></app-imglist>
-    <ion-item style="--min-height: 1px;"></ion-item>-->
+    <ion-item style="--min-height: 1px;"></ion-item>
     <ion-item style="--inner-border-width: 0px 0px 0px 0px;">
       <ion-label>相关记录</ion-label>
     </ion-item>
@@ -66,17 +56,6 @@
     <ion-item style="--inner-border-width: 0px 0px 0px 0px;">
       <ion-label>参与人</ion-label>
     </ion-item>
-    <!--<ion-item class="meeting-user">
-      <ion-row class="meeting-user-row" style="margin-left: 10px;margin-bottom: 10px;">
-        <ion-col size="12">
-          <ion-row class="user-item" *ngFor="let us of userList;let last = last">
-            <ion-col size="8">{{us.USERNAME}}</ion-col>
-            <ion-col size="3" (click)="editUserSignin(us)"><span
-              [ngClass]="isEditUser?'user-edit':''">{{us.SIGNINSTATUS==2?"参加":"未参加"}}</span></ion-col>
-          </ion-row>
-        </ion-col>
-      </ion-row>
-    </ion-item>-->
     <ion-grid>
       <ion-row>
         <ion-col size="4">
@@ -85,9 +64,6 @@
         <ion-col size="4">
           状态
         </ion-col>
-        <!--<ion-col size="4" *ngIf="isEditUser">
-          操作
-        </ion-col>-->
       </ion-row>
       <ion-row *ngFor="let us of userList;let last = last">
         <ion-col size="4">
@@ -96,9 +72,6 @@
         <ion-col size="4">
           {{us.SIGNINSTATUS == 2 ? "参加" : "未参加"}}
         </ion-col>
-        <!--<ion-col size="4" class="grid-btn" *ngIf="isEditUser">
-          <span (click)="editUserSignin(us)">修改</span>
-        </ion-col>-->
       </ion-row>
     </ion-grid>
     <ion-item style="--inner-border-width: 0px 0px 0px 0px;margin: 10px 0px;">
@@ -107,14 +80,40 @@
         人,未参加:{{(userList | myfilter:'SIGNINSTATUS':'3').length }}人
       </ion-text>
     </ion-item>
+    <ion-item *ngIf="isEditDemocracyReview()" style="--min-height: 5px;--inner-border-width: 0px 0px 0px 0px;margin: 10px 0px;"></ion-item>
+    <ion-item *ngIf="isEditDemocracyReview()" mode="md">
+      <ion-label style="min-width: 200px !important;">民主评议党员名单({{democracyReviewList.length}}人)
+      </ion-label>
+    </ion-item>
+    <ion-grid *ngIf="isEditDemocracyReview()">
+      <ion-row>
+        <ion-col size="2">
+          姓名
+        </ion-col>
+        <ion-col size="3">
+          开展评议日期
+        </ion-col>
+        <ion-col size="3">
+          结束评议日期
+        </ion-col>
+        <ion-col size="3">
+          评议结果
+        </ion-col>
+      </ion-row>
+      <ion-row *ngFor="let us of democracyReviewList;let idx=index">
+        <ion-col size="2">
+          {{us.userName}}
+        </ion-col>
+        <ion-col size="3">
+          {{us.startdate | date:'yyyy-MM-dd'}}
+        </ion-col>
+        <ion-col size="3">
+          {{us.enddate | date:'yyyy-MM-dd'}}
+        </ion-col>
+        <ion-col size="3">
+          {{us.democracyReviewResultTypeName}}
+        </ion-col>
+      </ion-row>
+    </ion-grid>
   </form>
 </ion-content>
-<ion-footer>
-  <div *ngIf="isEdit" class="toolbar-center"
-       style="text-align: right;">
-    <!--<ion-button *ngIf="isEdit" slot="end" color="danger" mode="ios"
-                (click)="editMeeting()">
-      管理
-    </ion-button>-->
-  </div>
-</ion-footer>

+ 25 - 493
parth5/parth5/src/app/views/pages/partylife/shyk/detail/detail.component.ts

@@ -8,6 +8,9 @@ import {DatePipe} from "@angular/common";
 import {interval} from 'rxjs';
 import {BaseComponent} from "../../../../../comm/base.component";
 import {takeUntil} from "rxjs/operators";
+import {SHYKApi} from "../../../../../api/partylife/shyk";
+import {DictionaryApi} from "../../../../../api/system/dictionary";
+import {AlertModal} from "../../../../../comm/modal/alert";
 
 @Component({
   selector: 'app-detail',
@@ -16,28 +19,10 @@ import {takeUntil} from "rxjs/operators";
 })
 export class DetailComponent extends BaseComponent {
 
-  secondsCounter = interval(10000);//定时器刷新成员签到状态(10秒)
-
-  loading: any = null;
+  democracyReviewType: number = 7;
   userInfo: any = {};//当前用户信息
-
-  webServerHost: string = '';
-
-  getDataUrl: string = '/appApi/shyk/getMeetingById';//获取会议信息url
-  getTopicUrl: string = '/appApi/shyk/getMeetingTopicList';//获取议题url
-  getUserUrl: string = '/appApi/shyk/getMeetingUserList';//获取参会成员url
-
-  saveSigninUrl: string = '/appApi/shyk/signinMeeting';//保存签收信息
-  saveCheckinUrl: string = '/appApi/shyk/checkinMeeting';//保存签到信息
-  saveStudyUrl: string = '/appApi/shyk/saveUserStudy';//保存补学信息
-  clearMessageUrl: string = '/appApi/message/clearMessageByBusinessId';
-  cancelMeetingUrl: string = '/appApi/shyk/cancelMeeting';
-  cancelUserSigninUrl: string = '/appApi/shyk/cancelUserSignin';//取消签收信息
-  cancelUserCheckinUrl: string = '/appApi/shyk/cancelUserCheckin';//取消签到信息
-
   meetingId: string = '';
   dataModel: any = {};//会议信息
-  topicList: any = [];//议题
   userList: any[] = [];//参会成员
   meetingUserModel: any = {};//当前登录人会议信息
   shykTypeName: string = '';//会议类型
@@ -45,15 +30,7 @@ export class DetailComponent extends BaseComponent {
   //页面按钮权限操作
   difftime: any = 0;//会议时间与当前时间差(分钟)
   isEdit: any = false;//是否可编辑(会议状态,已取消的会议不可编辑)
-  isSigin: any = false;//是否可签收
   isChecked: any = false;//是否可签到
-  isStudy: any = false;//是否需要补学
-  isEditStudy: any = false;//是否可填写补学情况
-  isShowimg: any = false;//是否可查看会议照片
-  isQrcode: any = false;//是否能查看会议二维码
-  isCancel: any = false;//是否可取消会议
-  isEditUser: any = false;//是否可操作成员签到
-  isEditRecord: any = false;//是否可录入会议记录
 
   endTime: any;
   beginTime: any;
@@ -73,17 +50,18 @@ export class DetailComponent extends BaseComponent {
     isMulti: true,
     readonly: true
   };
+  democracyReviewList: any = [];
+  meetingTypeList: any = [];
+  democracyReviewResultTypeList: any = [];
 
-  constructor(private router: Router, private routeInfo: ActivatedRoute, private configService: ConfigService, private userService: UserService, public alertController: AlertController,
-              public loadingController: LoadingController, private jsBridgeService: JsBridgeService, private datePipe: DatePipe) {
+  constructor(private router: Router, private routeInfo: ActivatedRoute, private userService: UserService, public alertController: AlertController,
+              public loadingController: LoadingController, private jsBridgeService: JsBridgeService, private datePipe: DatePipe
+    , private shykApi: SHYKApi, private dictionaryApi: DictionaryApi, private alertModal: AlertModal) {
     super();
   }
 
   ngOnInit(): void {
     this.userInfo = this.userService.GetUser();
-    this.configService.GetConfig().subscribe((config) => {
-      this.webServerHost = config.webServerHost;
-    });
     this.routeInfo.queryParams.subscribe(params => {
       this.meetingId = params['id'];
       this.imgOption1.fileRefid = this.meetingId;
@@ -91,498 +69,52 @@ export class DetailComponent extends BaseComponent {
       this.loadData();
     });
 
-    this.secondsCounter.pipe(takeUntil(this.$destory)).subscribe(data => {
-      this.loadUserList();
-    });
   }
 
   loadData() {
-    this.configService.HttpGetRomote(this.getDataUrl, {
-      id: this.meetingId,
-      userId: this.userInfo.userid,
-      userName: this.userInfo.username
-    }).subscribe((data: RequsetData) => {
+    this.shykApi.getData(this.meetingId).subscribe((data: RequsetData) => {
       if (data.success) {
         if (data.item != null) {
           this.dataModel = data.item;
-          if (data.extdata.meetingUser != null) {
-            this.meetingUserModel = data.extdata.meetingUser;
-            if (this.userInfo.userid == this.meetingUserModel.usercode) {
-              this.clearMessage(this.userInfo.userid, 1);
-            }
-          }
-          this.shykTypeName = data.extdata.shykTypeName;
           this.difftime = data.extdata.difftime;
-
-          this.endTime = new Date(this.datePipe.transform(this.dataModel.endtime, "yyyy/MM/dd HH:mm:ss"));
-          /*this.beginTime = new Date(this.datePipe.transform(this.dataModel.begintime, "yyyy/MM/dd HH:mm:ss"));*/
-
-          this.setPermiss();
-
           this.loadUserList();
-          this.loadTopicList();
+          this.getMeetingTypeList();
+          this.getMeetingDemocracyReviewList();
+
         }
       }
     });
   }
 
-  //操作权限设置
-  setPermiss() {
-    this.isEdit = this.dataModel.createuserid == this.userInfo.userid;
-    this.isCancel = this.dataModel.createuserid == this.userInfo.userid;
-    this.isEditUser = this.dataModel.createuserid == this.userInfo.userid;
-    /*this.isEdit = this.dataModel.createuserid == this.userInfo.userid && this.dataModel.shykstatus != 2;
-    //会议开始后可录入会议记录
-    this.isEditRecord = this.dataModel.createuserid == this.userInfo.userid && (this.dataModel.shykstatus == 1 || this.dataModel.shykstatus == 4 || this.dataModel.shykstatus == 5)
-                        && this.difftime <= 0 ;
-    //会议开始前可取消会议
-    this.isCancel = this.isEdit && this.difftime > 0;
-
-    //会议开始时间30分钟前,未签收或已签收参加的可请假(会议发起人不可请假)
-    this.isSigin = this.dataModel.shykstatus != 2 && this.difftime > 30 && (this.meetingUserModel.signinstatus == 1 || this.meetingUserModel.signinstatus == 2)
-      && this.dataModel.createuserid != this.userInfo.userid;
-
-    //会议开始时间前30分钟到会议结束前,未签到的可进行签到
-    this.isChecked = this.dataModel.shykstatus != 2 && this.difftime <= 30 && new Date() <= this.endTime && this.meetingUserModel.checkinstatus == 0;
-
-    //会议开始时间前30分钟到会议结束前,会议发起人或已签到人员可查看二维码
-    this.isQrcode = this.dataModel.shykstatus != 2 && this.difftime <= 30 && new Date() <= this.endTime
-      && (this.dataModel.createuserid == this.userInfo.userid || this.meetingUserModel.checkinstatus == 1);
-
-    //查看图片
-    this.isShowimg = this.dataModel.isuploadimg == 1;
-
-    //已录入会议记录,未参加会议的成员需录入补学情况
-    this.isStudy = this.dataModel.meetingrecordstate == 1 && (this.meetingUserModel.signinstatus == 1 || this.meetingUserModel.signinstatus == 3);
-    this.isEditStudy = (this.meetingUserModel.makeuupstudy == null || this.meetingUserModel.makeuupstudy == '');//未录入补学情况
-
-    //会议开始后可以在后台协助签到,录入会议记录后不允许签到
-    this.isEditUser = this.difftime <= 0
-      //&& this.dataModel.meetingrecordstate != 1
-      && this.dataModel.createuserid == this.userInfo.userid
-      && this.dataModel.shykstatus != 0 && this.dataModel.shykstatus != 2;*/
-
-  }
-
   loadUserList() {
-    this.configService.HttpGetRomote(this.getUserUrl, {
-      pageindex: 1,
-      pagesize: 10000,
-      meetingId: this.meetingId,
-    }).subscribe((data: RequsetData) => {
+    this.shykApi.getMeetingUserList(this.meetingId).subscribe((data: RequsetData) => {
       if (data.success) {
         if (data.item != null) {
           this.userList = data.item.list;
-          /*if (this.dataModel.createuserid != this.userInfo.userid && this.dataModel.partycode.length == this.userService.GetUser().dataDzzdm.length) {
-            this.userList = this.userList.filter(it => it.USERCODE == this.userInfo.userid);
-          }*/
         }
       }
     });
   }
 
-  loadTopicList() {
-    this.configService.HttpGetRomote(this.getTopicUrl, {
-      meetingId: this.meetingId,
-    }).subscribe((data: RequsetData) => {
+  getMeetingTypeList() {
+    this.shykApi.getMeetingTypeList(this.dataModel.meetingid).subscribe((data: RequsetData) => {
       if (data.success) {
-        if (data.item != null) {
-          this.topicList = data.item;
-        }
+        this.meetingTypeList = data.item;
       }
     });
   }
 
-  //签收
-  signin(isback, userId, isSignin, userremark) {
-    this.presentAlertConfirm(isSignin ? "确认参加?" : "确认请假?", () => {
-      this.presentLoading("提交中...").then(val => {
-        this.configService.HttpPostRomote(this.saveSigninUrl, {
-          meetingId: this.dataModel.meetingid,
-          userCode: userId,
-          isSignin: isSignin,
-          userId: this.userInfo.userid,
-          userName: this.userInfo.username,
-          userRemark: !isSignin ? userremark : ""
-        }).subscribe((fdata: RequsetData) => {
-          this.loading.dismiss();
-          if (fdata.success) {
-            if (isback) {
-              this.backPage();
-            } else {
-              this.loadUserList();
-            }
-          }
-          this.presentAlert(fdata.msg);
-        });
-      });
-    });
-  }
-
-  //签到
-  checkin(isback, userId: string) {
-    //验证成功进行签到
-    this.presentLoading("签到中...").then(val => {
-      this.configService.HttpPostRomote(this.saveCheckinUrl, {
-        meetingId: this.dataModel.meetingid,
-        userCode: userId,
-        userId: this.userInfo.userid,
-        userName: this.userInfo.username
-      }).subscribe((fdata: RequsetData) => {
-        this.loading.dismiss();
-        if (fdata.success) {
-          if (isback) {
-            this.backPage();
-          } else {
-            this.loadUserList();
-          }
-        }
-        this.presentAlert(fdata.msg);
-      });
-    });
-  }
-
-  //二维码签到
-  scanQRCode() {
-    this.jsBridgeService.ScanQRCode().subscribe(req => {
-      if (req.success == false) {
-        this.presentAlert(req.error);
-        return false;
-      }
-      if (req.data.qrcode != this.dataModel.meetingid) {
-        this.presentAlert("会议二维码不匹配!");
-        return false;
-      }
-      if (new Date() > this.endTime) {
-        this.presentAlert("请在会议结束前进行签到!");
-        return false;
+  getMeetingDemocracyReviewList() {
+    this.shykApi.getMeetingDemocracyReviewList(this.dataModel.meetingid).subscribe((data: RequsetData) => {
+      if (data.success) {
+        this.democracyReviewList = data.item;
       }
-
-      //验证成功进行签到
-      this.checkin(true, this.userInfo.userid);
-    });
-  }
-
-  //保存补学补课情况
-  saveStudy() {
-    this.presentLoading("提交中...").then(val => {
-      this.configService.HttpPostRomote(this.saveStudyUrl, {
-        meetingId: this.dataModel.meetingid,
-        userCode: this.userInfo.userid,
-        makeuupstudy: this.meetingUserModel.makeuupstudy,
-        userId: this.userInfo.userid,
-        userName: this.userInfo.username,
-      }).subscribe((fdata: RequsetData) => {
-        this.loading.dismiss();
-        if (fdata.success) {
-          this.clearMessage(this.userInfo.userid, 2);
-          this.backPage();
-        }
-        this.presentAlert(fdata.msg);
-      });
-    });
-  }
-
-  //查看二维码
-  showQrcode() {
-    this.configService.GetConfig().subscribe((config) => {
-      var url = config.webServerHost + "/appApi/home/ShowQRCode?code=" + encodeURI(this.dataModel.meetingid)
-      this.presentAlertQrcode(url);
-    });
-  }
-
-  //清除通知
-  clearMessage(userId: string, messageType) {
-    this.configService.HttpGetRomote(this.clearMessageUrl, {
-      businessId: this.dataModel.meetingid,
-      userId: userId,
-      messageType: messageType
-    }).subscribe((fdata: RequsetData) => {
-
-    });
-  }
-
-  //管理员操作人员签收
-  editUserSignin(user) {
-    /*if (user.SIGNINSTATUS == 1 && this.isEditUser) {
-      this.presentAlertUserSignin(user);//签收
-    }
-
-    if ((user.SIGNINSTATUS == 2 || user.SIGNINSTATUS == 3) && this.isEditUser) {
-      this.presentAlertUserSignin_Cancel(user);//取消签收
-    }*/
-    if (this.isEditUser) {
-      this.presentAlertUserSignin(user);//签收
-    }
-  }
-
-  //管理员操作人员签到
-  editUserCheckin(user) {
-    if (user.CHECKINSTATUS == 0 && this.isEditUser) {
-      this.presentAlertUserCheckin(user);//签到
-    }
-
-    if (user.CHECKINSTATUS == 1 && this.isEditUser) {
-      this.presentAlertUserCheckin_Cancel(user);//取消签到
-    }
-  }
-
-  //取消会议
-  cancel() {
-    this.presentAlertConfirm("确认取消会议?", () => {
-      this.presentLoading("取消中...").then(val => {
-        this.configService.HttpPostRomote(this.cancelMeetingUrl, {
-          meetingId: this.dataModel.meetingid,
-          userId: this.userInfo.userid,
-          userName: this.userInfo.username
-        }).subscribe((fdata: RequsetData) => {
-          this.loading.dismiss();
-          if (fdata.success) {
-            this.backPage();
-          }
-          this.presentAlert(fdata.msg);
-        });
-      });
-    });
-  }
-
-  showTopic(id) {
-    if (id != null && id != '') {
-      //this.router.navigate(['/main/tabs/tab1/shykshowtopic'], {queryParams: {id: id, random: Math.random()}});
-      this.router.navigate(['../shykshowtopic'], {
-        relativeTo: this.routeInfo,
-        queryParams: {id: id, random: Math.random()}
-      });
-    }
-  }
-
-  //请假
-  editUserLeave() {
-    this.presentAlertUserLeave();
-  }
-
-  editMeeting() {
-    this.router.navigate(['../shykEdit'], {
-      relativeTo: this.routeInfo,
-      queryParams: {id: this.dataModel.meetingid, random: Math.random()}
     });
   }
 
-  editRecord() {
-    this.router.navigate(['../shykrecord'], {
-      relativeTo: this.routeInfo,
-      queryParams: {id: this.dataModel.meetingid, random: Math.random()}
-    });
-  }
-
-  async presentLoading(msg: string) {
-    this.loading = await this.loadingController.create({
-      message: msg,
-      spinner: 'circles'
-    });
-    return this.loading.present();
-  }
-
-  async presentAlert(msg: string) {
-    const alert = await this.alertController.create({
-      header: '提示',
-      subHeader: '',
-      message: msg,
-      buttons: ['确定']
-    });
-
-    await alert.present();
-  }
-
-  async presentAlertConfirm(msg: string, handler) {
-    const alert = await this.alertController.create({
-      header: '提示',
-      message: '<strong>' + msg + '</strong>',
-      buttons: [
-        {
-          text: '关闭',
-          role: 'cancel',
-          cssClass: 'secondary',
-          handler: () => {
-
-          }
-        }, {
-          text: '确定',
-          handler: handler
-        }
-      ]
-    });
-
-    await alert.present();
-  }
-
-  async presentAlertQrcode(url) {
-    const alert = await this.alertController.create({
-      header: '会议二维码',
-      message: '<img src="' + url + '"/>',
-      buttons: ['关闭']
-    });
-
-    await alert.present();
-  }
-
-  async presentAlertUserSignin(user) {
-    const alert = await this.alertController.create({
-      header: user.USERNAME,
-      inputs: [
-        {
-          name: 'userremark',
-          type: 'text',
-          placeholder: '请输入未参加原因',
-          value: user.USERREMARK
-        }
-      ],
-      buttons: [{
-        text: '未参加',
-        handler: (result) => {
-          if (result.userremark == "" || result.userremark == null) {
-            this.presentAlert("请填写未参加原因");
-            return false;
-          }
-          this.signin(false, user.USERCODE, false, result.userremark);
-
-          this.clearMessage(user.USERCODE, 1);
-        }
-      }, {
-        text: '参加',
-        handler: (result) => {
-          this.signin(false, user.USERCODE, true, "");
-
-          this.clearMessage(user.USERCODE, 1);
-        }
-      }]
-    });
-
-    await alert.present();
-  }
-
-  async presentAlertUserCheckin(user) {
-    const alert = await this.alertController.create({
-      header: user.USERNAME,
-      buttons: [{
-        text: '关闭',
-        role: 'cancel',
-        cssClass: 'secondary',
-        handler: () => {
-
-        }
-      }, {
-        text: '签到',
-        handler: (result) => {
-          this.checkin(false, user.USERCODE);
-
-          this.clearMessage(user.USERCODE, 1);
-        }
-      }]
-    });
-
-    await alert.present();
-  }
-
-  //请假
-  async presentAlertUserLeave() {
-    const alert = await this.alertController.create({
-      header: '请假',
-      inputs: [
-        {
-          name: 'userremark',
-          type: 'text',
-          placeholder: '请输入未参加原因',
-          value: this.meetingUserModel.userremark
-        }
-      ],
-      buttons: [{
-        text: '请假',
-        handler: (result) => {
-          if (result.userremark == "" || result.userremark == null) {
-            this.presentAlert("请填写未参加原因");
-            return false;
-          }
-          this.signin(true, this.userInfo.userid, false, result.userremark);
-
-          this.clearMessage(this.userInfo.userid, 1);
-        }
-      }]
-    });
-
-    await alert.present();
-  }
-
-
-  async presentAlertUserSignin_Cancel(user) {
-    const alert = await this.alertController.create({
-      header: user.USERNAME,
-      message: "取消会议签收?",
-      buttons: [{
-        text: '关闭',
-        role: 'cancel',
-        cssClass: 'secondary',
-        handler: () => {
-
-        }
-      }, {
-        text: '确认',
-        handler: (result) => {
-          this.presentLoading("取消中...").then(val => {
-            this.configService.HttpPostRomote(this.cancelUserSigninUrl, {
-              meetingId: this.dataModel.meetingid,
-              userCode: user.USERCODE,
-              userId: this.userInfo.userid,
-              userName: this.userInfo.username
-            }).subscribe((fdata: RequsetData) => {
-              this.loading.dismiss();
-              if (fdata.success) {
-                this.loadUserList();
-              }
-              this.presentAlert(fdata.msg);
-            });
-          });
-        }
-      }]
-    });
-
-    await alert.present();
-  }
-
-  async presentAlertUserCheckin_Cancel(user) {
-    const alert = await this.alertController.create({
-      header: user.USERNAME,
-      message: "取消签到?",
-      buttons: [{
-        text: '关闭',
-        role: 'cancel',
-        cssClass: 'secondary',
-        handler: () => {
-
-        }
-      }, {
-        text: '确认',
-        handler: (result) => {
-          this.presentLoading("取消中...").then(val => {
-            this.configService.HttpPostRomote(this.cancelUserCheckinUrl, {
-              meetingId: this.dataModel.meetingid,
-              userCode: user.USERCODE,
-              userId: this.userInfo.userid,
-              userName: this.userInfo.username
-            }).subscribe((fdata: RequsetData) => {
-              this.loading.dismiss();
-              if (fdata.success) {
-                this.loadUserList();
-              }
-              this.presentAlert(fdata.msg);
-            });
-          });
-        }
-      }]
-    });
-
-    await alert.present();
-  }
+  isEditDemocracyReview = function () {
+    return this.meetingTypeList.filter(e => e.shyktype === this.democracyReviewType).length > 0;
+  };
 
   //跳转页面
   backPage() {