Skip to content

P
party-build-cloud
Commit a1c1cecb authored by wangqinghua's avatar wangqinghua
Browse files
Options

若干字段

parent b7d4d575
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 54 deletions
src/pages/serve-pages/meet-room/meet-room.ts
View file @ a1c1cecb
......@@ -169,7 +169,7 @@ export class MeetRoomPage {
//编辑申请
goApplyEdit(room, apply) {
console.log(apply);
if (apply.orgId == this.mineInfo.orgId || this.role.includes(7)) {
if (apply.orgId == this.mineInfo.orgId) {
this.navCtrl.push(RoomApplyPage, {
id: apply.applyId,
});
......
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ a1c1cecb
......@@ -76,7 +76,9 @@
<ion-label class="item-left"><span class="color-red">*</span>参会人数:</ion-label>
<ion-input [(ngModel)]="obj.participantAmount" type="text" maxlength="20"
[placeholder]="roomMax"></ion-input>
<ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">参会人数不可大于会议室可容纳数({{roomMax}})</ion-label>
<ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">
参会人数不可大于会议室可容纳数({{roomMax}})
</ion-label>
</ion-item>
<div class="item-box">
<div class="left">参会人员:
......@@ -103,6 +105,18 @@
</div>
</div>
<div class="item-box">
<div class="left">涉及系统会议:</div>
<div class="right">
<ion-checkbox [(ngModel)]="obj.sjSysmeet" color="danger"></ion-checkbox>
</div>
</div>
<div class="item-box" *ngIf="obj.sjSysmeet">
<div class="left">是否报备:</div>
<div class="right">
<ion-checkbox [(ngModel)]="obj.isReport" color="danger"></ion-checkbox>
</div>
</div>
<div class="item-box">
<div class="left">备注:</div>
<div class="right">
<ion-textarea [(ngModel)]="obj.remark"></ion-textarea>
......
src/pages/serve-pages/meet-room/room-apply/room-apply.scss
View file @ a1c1cecb
......@@ -3,7 +3,7 @@ page-room-apply {
.item-left {
text-align: right;
width: 20%;
width: 25%;
font-weight: bold;
font-size: 1.4rem;
flex: none;
......@@ -14,12 +14,13 @@ page-room-apply {
}
ion-datetime, ion-select {
width: 80%;
max-width: 80%;
width: 75%;
max-width: 75%;
text-align: right;
font-size: 1.4rem;
}
ion-datetime{
ion-datetime {
padding-right: 18px !important;
}
......@@ -53,15 +54,16 @@ page-room-apply {
.left {
text-align: right;
width: 20%;
width: 25%;
font-weight: bold;
font-size: 1.4rem;
margin: 11px 8px 11px 0;
}
.right {
width: 80%;
width: 75%;
padding: 11px 8px 11px 16px;
text-align: right;
.div-tag {
padding: 10px 0;
......
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ a1c1cecb
......@@ -38,7 +38,8 @@ export class RoomApplyPage {
participant: '',
participantAmount: null,
equipmervice: [],
sjSysmeet: false,
isReport: false,
};
check = {
......@@ -90,7 +91,7 @@ export class RoomApplyPage {
constructor(public navCtrl: NavController, public navParams: NavParams, private actionSheetCtrl: ActionSheetController,
private serveSer: ServeService, public _modalCtrl: ModalController, private appMainSer: AppMainService,
public timeFormat: TimeFormatService,
private loading:LoadingController,
private loading: LoadingController,
private commonSer: CommonService, private datePipe: DatePipe, private until: UntilService) {
this.appMainSer.mineInfo.subscribe(value => {
this.mineInfo = value;
......@@ -165,10 +166,11 @@ export class RoomApplyPage {
this.obj.orgId = res.orgId;
this.obj.roomId = res.roomId;
this.obj.roomText = res.roomName;
this.obj.sjSysmeet = res.sjSysmeet == 1;
this.obj.isReport = res.isReport == 1;
this.getEquipmervice(res.equipmervice.split(','));
this.roomMax = `该会议室可容纳${res.accommodation}人`;
if (new Date(res.startTime).getTime() < new Date().getTime()) {
this.show.overTime = true;
} else {
......@@ -409,12 +411,14 @@ export class RoomApplyPage {
}).join(','),
participantAmount: this.obj.participantAmount,
equipmervice: this.obj.equipmervice.join(','),
sjSysmeet: this.obj.sjSysmeet ? 1 : 0,
isReport: this.obj.isReport ? 1 : 0,
};
if (this.applyId) data['id'] = this.applyId;
console.log(data);
this.commonSer.alert('确定提交申请？', () => {
let loading = this.loading.create({
content:'提交中...'
content: '提交中...'
});
loading.present();
this.serveSer.saveApply(data).subscribe(
......@@ -460,7 +464,7 @@ export class RoomApplyPage {
let msg = statusN == 2 ? '确定通过申请' : '确定退回申请';
this.commonSer.alert(msg, () => {
let loading = this.loading.create({
content:'提交中...'
content: '提交中...'
});
loading.present();
this.serveSer.saveApply(data).subscribe(
......
src/pages/serve-pages/vistor-register/vistor-register.html
View file @ a1c1cecb
......@@ -8,7 +8,7 @@
<ion-icon style="font-size: 2rem" class="top-right-icon icon-fabu iconfont"></ion-icon>
</button>
</ion-buttons>
<ion-buttons end *ngIf="role.includes(8)">
<ion-buttons end *ngIf="role.includes(12)">
<button ion-button icon-only tappable (click)="goDeal()" class="toolbar-icon">
<span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span>
</button>
......
src/pages/tabs/discover/discover.ts
View file @ a1c1cecb
......@@ -54,36 +54,7 @@ export class DiscoverPage {
//9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶,
tabsList = [
{
"name": "主题教育", "type": 1, "indexParent": 0, "children": [
{
"name": "中央精神",
"type": 1,
"indexChildren": '11'
},
{
"name": "本市部署",
"type": 2,
"indexChildren": '12'
},
{
"name": "机关动态",
"type": 3,
"indexChildren": '13'
},
{
"name": "学习心得",
"type": 5,
"indexChildren": '14'
},
{
"name": "学习资料",
"type": 4,
"indexChildren": '15'
}
]
},
{
"name": "机关党委", "type": 5, "indexParent": 1, "children": [
"name": "机关党委", "type": 5, "indexParent": 0, "children": [
{
"name": "通知公告",
"type": 5,
......@@ -107,7 +78,7 @@ export class DiscoverPage {
]
},
{
"name": "支部风采", "type": 13, "indexParent": 2, "children": [
"name": "支部风采", "type": 13, "indexParent": 1, "children": [
{
"name": "支部列表",
"type": null,
......@@ -136,7 +107,7 @@ export class DiscoverPage {
]
},
{
"name": "先进风采", "type": 25, "indexParent": 3, "children": [
"name": "先进风采", "type": 25, "indexParent": 2, "children": [
{
"name": "先进风采",
"type": 25,
......@@ -145,7 +116,7 @@ export class DiscoverPage {
]
},
{
"name": "党风廉政", "type": 9, "indexParent": 4, "children": [
"name": "党风廉政", "type": 9, "indexParent": 3, "children": [
{
"name": "廉政格言",
"type": 9,
......@@ -164,7 +135,7 @@ export class DiscoverPage {
]
},
{
"name": "互动交流", "type": 21, "indexParent": 5, "children": [
"name": "互动交流", "type": 21, "indexParent": 4, "children": [
{
"name": "学思践悟",
"type": 21,
......@@ -182,7 +153,7 @@ export class DiscoverPage {
}]
},
{
"name": "知识拓展", "type": 16, "indexParent": 6, "children": [
"name": "知识拓展", "type": 16, "indexParent": 5, "children": [
{
"name": "视频资料",
"type": 16,
......@@ -199,7 +170,36 @@ export class DiscoverPage {
"indexChildren": '74'
},
]
}
},
{
"name": "主题教育", "type": 1, "indexParent": 6, "children": [
{
"name": "中央精神",
"type": 1,
"indexChildren": '11'
},
{
"name": "本市部署",
"type": 2,
"indexChildren": '12'
},
{
"name": "机关动态",
"type": 3,
"indexChildren": '13'
},
{
"name": "学习心得",
"type": 5,
"indexChildren": '14'
},
{
"name": "学习资料",
"type": 4,
"indexChildren": '15'
}
]
},
];
childrenList = [];
isRecent = 1;
......@@ -456,6 +456,11 @@ export class DiscoverPage {
this.branchObj.show = false;
}
if (item.children[0].name == "廉政格言") {
this.indexChildren = 52;
this.obj.plateType = 10;
}
if (item.name != "支部风采") this.obj.branchId = null;
this.pageNum = 1;
const data = {
......
src/service/http.service.ts
View file @ a1c1cecb
......@@ -15,11 +15,11 @@ export class AppGlobal {
//接口基地址
// static domain = "http://192.168.2.106:8080"; //正式环境
// static domain = "https://bjgdjy.shjcdj.cn"; //政务云
static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.35.216:8080"; //阿里云测试地址
// static domain = "http://218.78.19.169:8081"; //天翼云地址
// static domain = "http://218.78.19.169:8082/"; //天翼测试云地址
// static domain = ""; //本地环境
static domain = ""; //本地环境
//图片地址
static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";
......@@ -28,8 +28,8 @@ export class AppGlobal {
static pictureNotice = AppGlobal.domain;
//默认版本
// static defaultVersion = "4.7.0"; //dev
static defaultVersion; //prod
static defaultVersion = "4.7.0"; //dev
// static defaultVersion; //prod
//接口地址
static API: any = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment