Commit 27f879d5 authored by wangqinghua's avatar wangqinghua

update

parent e7697623
...@@ -64,6 +64,11 @@ export class MyApp { ...@@ -64,6 +64,11 @@ export class MyApp {
this.rootPage = LoginPage; this.rootPage = LoginPage;
} }
} }
);
this.storage.get('area').then(
(value) => {
this.globle.area = value;
}
) )
} }
); );
......
import * as Mock from 'mockjs'; export const SERVER_API_URL = '/shfrdj'; Mock.setup( { timeout:50, }); import * as Mock from 'mockjs'; export const SERVER_API_URL = '/shfrdj'; Mock.setup( { timeout:50, }); export const institutionalNature = [ {label:'挂牌机构',value:'8'}, {label:'内设机构',value:'7'}, {label:'派驻机关',value:'6'}, {label:'派出机构',value:'5'}, {label:'分支机构',value:'4'}, {label:'临时机构',value:'3'}, {label:'议事协调机构',value:'2'}, {label:'挂靠机构',value:'1'},]
\ No newline at end of file \ No newline at end of file
......
...@@ -67,3 +67,29 @@ html, body, p { ...@@ -67,3 +67,29 @@ html, body, p {
.has-icon .tab-badge { .has-icon .tab-badge {
right: calc(50% - 25px); right: calc(50% - 25px);
} }
.action-sheet-wrapper {
.action-sheet-container {
padding: 0;
.action-sheet-group {
border-radius: 0px;
.action-sheet-button {
color: #444444;
min-height: 50px;
padding: 10px;
font-size: 1.8rem;
}
}
.action-sheet-group.action-sheet-group-cancel {
margin-bottom: 0;
.action-sheet-button {
color: #333333;
font-weight: 500;
}
}
}
}
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div> <!-- 事业单位 -->
<div *ngIf="itemInfo?.type == '1'">
<ion-item> <ion-item>
<ion-label class="item-left">法定代表人:</ion-label> <ion-label class="item-left">法定代表人:</ion-label>
<ion-label class="choose"> <ion-label class="choose">
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
<ion-item> <ion-item>
<ion-label class="item-left">开办资金:</ion-label> <ion-label class="item-left">开办资金:</ion-label>
<ion-label class="choose"> <ion-label class="choose">
{{detailObj.companyVO?.startFunds || "-"}} {{detailObj.companyVO?.startFunds}}(万元)
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
...@@ -49,28 +50,94 @@ ...@@ -49,28 +50,94 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
</div> </div>
<div class="space"></div> <!-- 机关团体 -->
<div class="flowDetail"> <div *ngIf="itemInfo?.type == '2'">
<ion-item *ngIf="itemInfo.flow == '1'"> <ion-item>
<ion-label class="item-left">事业单位法人设立登记(备案)申请书</ion-label> <ion-label class="item-left">负责人:</ion-label>
<ion-label (click)="openDetail1()" class="choose">详情</ion-label> <ion-label class="choose">
</ion-item> {{detailObj.unitVO?.leadingCadre || "-"}}
<ion-item *ngIf="itemInfo.flow == '1'"> </ion-label>
<ion-label class="item-left">事业单位法定代表人(负责人)履历表</ion-label>
<ion-label (click)="openDetail2()" class="choose">详情</ion-label>
</ion-item>
<ion-item *ngIf="itemInfo.flow == '2'">
<ion-label class="item-left">变更登记</ion-label>
<ion-label (click)="openDetail3()" class="choose">详情</ion-label>
</ion-item> </ion-item>
<ion-item *ngIf="itemInfo.flow == '3'"> <ion-item>
<ion-label class="item-left">事业单位法人注销登记(备案)申请书</ion-label> <ion-label class="item-left">组织结构代码:</ion-label>
<ion-label (click)="openDetail4()" class="choose">详情</ion-label> <ion-label class="choose">
{{detailObj.unitVO?.organizationNumber || "-"}}
</ion-label>
</ion-item> </ion-item>
<ion-item *ngIf="itemInfo.flow == '4'"> <ion-item>
<ion-label class="item-left">事业单位法人证书补领申请书</ion-label> <ion-label class="item-left">住所:</ion-label>
<ion-label (click)="openDetail5()" class="choose">详情</ion-label> <ion-label class="choose">
{{detailObj.unitVO?.residence || "-"}}
</ion-label>
</ion-item> </ion-item>
</div>
<div class="space"></div>
<div class="flowDetail">
<!-- 事业单位-->
<ng-container *ngIf="itemInfo?.type == '1'">
<ion-item *ngIf="itemInfo.flow == '1'">
<ion-label class="item-left">事业单位法人设立登记(备案)申请书</ion-label>
<ion-label (click)="openDetail1()" class="choose">详情</ion-label>
</ion-item>
<ion-item *ngIf="itemInfo.flow == '1'">
<ion-label class="item-left">事业单位法定代表人(负责人)履历表</ion-label>
<ion-label (click)="openDetail2()" class="choose">详情</ion-label>
</ion-item>
<ion-item *ngIf="itemInfo.flow == '2'">
<ion-label class="item-left">
变更登记
</ion-label>
<ion-label (click)="openDetail3()" class="choose">详情</ion-label>
</ion-item>
<ion-item *ngIf="itemInfo.flow == '3'">
<ion-label class="item-left">
事业单位法人注销登记(备案)申请书
</ion-label>
<ion-label (click)="openDetail4()" class="choose">详情</ion-label>
</ion-item>
<ion-item *ngIf="itemInfo.flow == '4'">
<ion-label class="item-left">
事业单位法人证书补领申请书
</ion-label>
<ion-label (click)="openDetail5()" class="choose">详情</ion-label>
</ion-item>
</ng-container>
<!-- 机关群团-->
<ng-container *ngIf="itemInfo.type == '2'">
<ng-container *ngIf="itemInfo?.flow == '1'">
<ion-item>
<ion-label class="item-left">
初领(无组织机构代码)
</ion-label>
<ion-label (click)="openDetail6(' 初领(无组织机构代码)')" class="choose">详情</ion-label>
</ion-item>
</ng-container>
<ng-container *ngIf="itemInfo?.flow == '2'">
<ion-item>
<ion-label class="item-left">
变更业务
</ion-label>
<ion-label (click)="openDetail3()" class="choose">详情</ion-label>
</ion-item>
</ng-container>
<ng-container *ngIf="itemInfo?.flow == '3'">
<ion-item>
<ion-label class="item-left">
撤销
</ion-label>
<ion-label (click)="openDetail6('撤销')" class="choose">详情</ion-label>
</ion-item>
</ng-container>
<ng-container *ngIf="itemInfo?.flow == '4'">
<ion-item>
<ion-label class="item-left">
换领
</ion-label>
<ion-label (click)="openDetail6('换领')" class="choose">详情</ion-label>
</ion-item>
</ng-container>
</ng-container>
<ion-item> <ion-item>
<ion-label class="item-left">附件材料</ion-label> <ion-label class="item-left">附件材料</ion-label>
<ion-label (click)="viewFile()" class="choose">详情</ion-label> <ion-label (click)="viewFile()" class="choose">详情</ion-label>
...@@ -81,49 +148,62 @@ ...@@ -81,49 +148,62 @@
</ion-item> </ion-item>
</div> </div>
<div class="space"></div> <div class="space"></div>
<div class="handle" *ngIf="type != 'db'"> <div class="handle">
<ion-item> <ion-item *ngIf="itemInfo?.type == '1'">
<ion-label class="item-left">选择当前业务办理对应批文</ion-label> <ion-label class="item-left">选择当前业务办理对应批文</ion-label>
<ion-label (click)="openApproval()" class="choose">选择</ion-label> <ion-label (click)="openApproval()" class="choose">选择</ion-label>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label class="item-left"> <ion-label class="item-left">
<span class="color-red">*</span> <span class="color-red">*</span>
受理意见</ion-label> 受理意见
</ion-label>
<ion-select [(ngModel)]="submitObj.flag" interface="action-sheet" placeholder="选择受理意见" okText="确定" <ion-select [(ngModel)]="submitObj.flag" interface="action-sheet" placeholder="选择受理意见" okText="确定"
cancelText="取消"> cancelText="取消">
<ion-option value="1">符合条件</ion-option> <ion-option value="1">符合条件</ion-option>
<ion-option value="0">不符合条件</ion-option> <ion-option value="0">不符合条件</ion-option>
</ion-select> </ion-select>
</ion-item> </ion-item>
<ng-container *ngIf="itemInfo?.type == 2 && area?.name =='市属' "> <ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属' && itemInfo?.flow == '1'">
<ion-item>
<ion-label class="item-left">机构性质</ion-label>
<ion-select [(ngModel)]="submitObj.jglb" interface="action-sheet" placeholder="选择机构性质" okText="确定"
cancelText="取消">
<ion-option *ngFor="let item of institutionalNatureList"
[value]="item.value">{{item.label}}</ion-option>
</ion-select>
</ion-item>
</ng-container>
<ng-container *ngIf="itemInfo?.type == '2' && area?.name =='市属'&& itemInfo?.status == '3'">
<div class="item-box"> <div class="item-box">
<div class="left">是否委托登记:</div> <div class="left">是否委托登记:</div>
<div class="right"> <div class="right radio">
<input [(ngModel)]="submitObj.flag" value="1" type="radio" name="register"/> <input [(ngModel)]="submitObj.djflag" value="1" type="radio" name="flag"/>
<input [(ngModel)]="submitObj.flag" value="0" type="radio" name="register"/> <input [(ngModel)]="submitObj.djflag" value="0" type="radio" name="flag"/>
</div> </div>
</div> </div>
<ion-item> <ion-item>
<ion-label class="item-left">委托登记类型</ion-label> <ion-label class="item-left">委托登记类型</ion-label>
<ion-select interface="action-sheet" placeholder="选择委托登记类型" okText="确定" cancelText="取消"> <ion-select [(ngModel)]="submitObj.djtype" interface="action-sheet" placeholder="选择委托登记类型" okText="确定"
cancelText="取消">
<ion-option value="11">银行</ion-option> <ion-option value="11">银行</ion-option>
<ion-option value="12">国家税务局</ion-option> <ion-option value="12">国家税务局</ion-option>
<ion-option value="13">海关</ion-option> <ion-option value="13">海关</ion-option>
</ion-select> </ion-select>
</ion-item> </ion-item>
</ng-container> </ng-container>
<div class="item-box"> <div class="item-box" *ngIf="itemInfo?.type == '1' && itemInfo?.status == '1'">
<div class="left">是否发送短信:</div> <div class="left">是否发送短信:</div>
<div class="right radio"> <div class="right radio">
<input [(ngModel)]="submitObj.smgflag" value="1" type="radio" name="register"/> <input [(ngModel)]="submitObj.smgflag" value="1" type="radio" name="smgflag"/>
<input [(ngModel)]="submitObj.smgflag" value="0" type="radio" name="register"/> <input [(ngModel)]="submitObj.smgflag" value="0" type="radio" name="smgflag"/>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left"> <div class="left">
<span class="color-red">*</span> <span class="color-red">*</span>
回复:</div> 回复:
</div>
<div class="right"> <div class="right">
<ion-textarea [(ngModel)]="submitObj.opinion"></ion-textarea> <ion-textarea [(ngModel)]="submitObj.opinion"></ion-textarea>
</div> </div>
......
...@@ -51,6 +51,7 @@ page-deal-detail { ...@@ -51,6 +51,7 @@ page-deal-detail {
input { input {
margin-left: 20px; margin-left: 20px;
margin-right: 3px;
} }
} }
......
...@@ -12,6 +12,9 @@ import {FileListPage} from "../file-list/file-list"; ...@@ -12,6 +12,9 @@ import {FileListPage} from "../file-list/file-list";
import {SearchPersonComponent} from "../../../components/search-person/search-person"; import {SearchPersonComponent} from "../../../components/search-person/search-person";
import {GlobalData} from "../../../core/GlobleData"; import {GlobalData} from "../../../core/GlobleData";
import {CommonService} from "../../../core/common.service"; import {CommonService} from "../../../core/common.service";
import {AppService} from "../../../app/app.service";
import {institutionalNature} from "../../../app/app.constants";
import {Detail6Page} from "../detail6/detail6";
@Component({ @Component({
selector: 'page-deal-detail', selector: 'page-deal-detail',
...@@ -19,6 +22,7 @@ import {CommonService} from "../../../core/common.service"; ...@@ -19,6 +22,7 @@ import {CommonService} from "../../../core/common.service";
}) })
export class DealDetailPage { export class DealDetailPage {
institutionalNatureList = institutionalNature; //机构性质
/** /**
* type: String (1-事业单位,2-机关群团,3-其他) * type: String (1-事业单位,2-机关群团,3-其他)
* flow : String (1-设立,2-变更 ,3-注销,4-补领,0-全部) * flow : String (1-设立,2-变更 ,3-注销,4-补领,0-全部)
...@@ -31,11 +35,12 @@ export class DealDetailPage { ...@@ -31,11 +35,12 @@ export class DealDetailPage {
submitObj = { submitObj = {
flag: null, //是否符合条件 flag: null, //是否符合条件
djflag: 0, //是否委托登记 djflag: "0", //是否委托登记
djtype: null, //委托登记类型。是否委托登记选是则出现这个选项 djtype: null, //委托登记类型。是否委托登记选是则出现这个选项
opinion: null, //回复 opinion: null, //回复
smgflag: "0" //是否发送短信 smgflag: "0", //是否发送短信
} jglb: null
};
detailObj = { detailObj = {
renewalVO: null, //补领 renewalVO: null, //补领
...@@ -43,7 +48,7 @@ export class DealDetailPage { ...@@ -43,7 +48,7 @@ export class DealDetailPage {
changeMatters: null, //变更登记 changeMatters: null, //变更登记
changeRecordVO: null, //变更记录 changeRecordVO: null, //变更记录
listApprovalsVO: null, //当前业务办理对应批文列表 listApprovalsVO: null, //当前业务办理对应批文列表
changeBusiness: null, //变更业务 changeBusiness: null, //机关群体业务
acceptanceVO: null, //受理信息 acceptanceVO: null, //受理信息
changeBusinessVO: null, //变更业务信息 changeBusinessVO: null, //变更业务信息
accessoryMaterials: null, //附件材料 accessoryMaterials: null, //附件材料
...@@ -62,11 +67,13 @@ export class DealDetailPage { ...@@ -62,11 +67,13 @@ export class DealDetailPage {
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private globle: GlobalData, private globle: GlobalData,
private appSer: AppService,
private commonSer: CommonService, private commonSer: CommonService,
private dealSer: DealService, private modalCtrl: ModalController) { private dealSer: DealService, private modalCtrl: ModalController) {
this.itemInfo = this.navParams.get("item"); this.itemInfo = this.navParams.get("item");
this.area = this.globle.area; this.area = this.globle.area;
console.log(this.itemInfo); console.log(this.itemInfo);
console.log(this.area);
} }
//查询详情 //查询详情
...@@ -77,7 +84,7 @@ export class DealDetailPage { ...@@ -77,7 +84,7 @@ export class DealDetailPage {
}; };
this.dealSer.scheduleDetail(data).subscribe( this.dealSer.scheduleDetail(data).subscribe(
(res) => { (res) => {
if (res.code == "0") { if (res.code == "0" && res.data) {
this.detailObj = res.data; this.detailObj = res.data;
if (this.itemInfo.status == "1") { if (this.itemInfo.status == "1") {
this.submitObj.opinion = res.data.rqeplyAccepted; this.submitObj.opinion = res.data.rqeplyAccepted;
...@@ -128,7 +135,11 @@ export class DealDetailPage { ...@@ -128,7 +135,11 @@ export class DealDetailPage {
//变更登记 //变更登记
openDetail3() { openDetail3() {
let modalCtrl = this.modalCtrl.create(Detail3Page, { let modalCtrl = this.modalCtrl.create(Detail3Page, {
"changeMatters": this.detailObj.changeMatters "changeMatters": this.detailObj.changeMatters,
"changeRecordVO": this.detailObj.changeRecordVO,
"changeBusiness": this.detailObj.changeBusiness,
"changeBusinessVO": this.detailObj.changeBusinessVO,
"type": this.itemInfo.type,
}, { }, {
enterAnimation: 'modal-from-right-enter', enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave' leaveAnimation: 'modal-from-right-leave'
...@@ -139,7 +150,9 @@ export class DealDetailPage { ...@@ -139,7 +150,9 @@ export class DealDetailPage {
//事业单位法人注销登记(备案)申请书 //事业单位法人注销登记(备案)申请书
openDetail4() { openDetail4() {
let modalCtrl = this.modalCtrl.create(Detail4Page, { let modalCtrl = this.modalCtrl.create(Detail4Page, {
"cancellationRegisterVO": this.detailObj.cancellationRegisterVO "cancellationRegisterVO": this.detailObj.cancellationRegisterVO,
"revokeVO": this.detailObj.revokeVO,
"type": this.itemInfo.type,
}, { }, {
enterAnimation: 'modal-from-right-enter', enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave' leaveAnimation: 'modal-from-right-leave'
...@@ -158,6 +171,28 @@ export class DealDetailPage { ...@@ -158,6 +171,28 @@ export class DealDetailPage {
modalCtrl.present(); modalCtrl.present();
} }
//机关群团 补领 设立
openDetail6(title) {
let vo;
if (this.itemInfo.flow == '1') {
vo = this.detailObj.replacementVO
}
if (this.itemInfo.flow == '3') {
vo = this.detailObj.revokeVO
}
if (this.itemInfo.flow == '4') {
vo = this.detailObj.revokeVO
}
let modalCtrl = this.modalCtrl.create(Detail6Page, {
"revokeVO": vo,
"title": title
}, {
enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave'
});
modalCtrl.present();
}
//选择批文 //选择批文
openApproval() { openApproval() {
let modal = this.modalCtrl.create(ApprovalsPage, { let modal = this.modalCtrl.create(ApprovalsPage, {
...@@ -176,7 +211,8 @@ export class DealDetailPage { ...@@ -176,7 +211,8 @@ export class DealDetailPage {
//查看附件 //查看附件
viewFile() { viewFile() {
let modalCtrl = this.modalCtrl.create(FileListPage, { let modalCtrl = this.modalCtrl.create(FileListPage, {
"accessoryMaterials": this.detailObj.accessoryMaterials "accessoryMaterials": this.detailObj.accessoryMaterials,
"obj": this.itemInfo
}, { }, {
enterAnimation: 'modal-from-right-enter', enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave' leaveAnimation: 'modal-from-right-leave'
...@@ -185,8 +221,9 @@ export class DealDetailPage { ...@@ -185,8 +221,9 @@ export class DealDetailPage {
} }
sureSubmit() { sureSubmit() {
if (this.submitObj.opinion || !this.submitObj.flag) { if (!this.submitObj.opinion || !this.submitObj.flag) {
this.commonSer.toast('请输入必填项'); this.commonSer.toast('请输入必填项');
return
} }
const data = { const data = {
id: this.itemInfo.id, id: this.itemInfo.id,
...@@ -195,12 +232,15 @@ export class DealDetailPage { ...@@ -195,12 +232,15 @@ export class DealDetailPage {
type: this.itemInfo.type, type: this.itemInfo.type,
djflag: this.submitObj.djflag, djflag: this.submitObj.djflag,
djtype: this.submitObj.djtype, djtype: this.submitObj.djtype,
smgflag: "0" smgflag: this.submitObj.smgflag,
jglb: this.submitObj.jglb
} }
this.dealSer.scheduleAcceptdo(data).subscribe( this.dealSer.scheduleAcceptdo(data).subscribe(
(res) => { (res) => {
if (res.code == "0") { if (res.code == "0") {
this.commonSer.toast('办理成功'); this.commonSer.toast('办理成功');
this.appSer.setNotice('1');
this.appSer.setDeal(this.itemInfo.type)
this.navCtrl.pop(); this.navCtrl.pop();
} }
} }
......
...@@ -10,6 +10,7 @@ import {Detail5Page} from "./detail5/detail5"; ...@@ -10,6 +10,7 @@ import {Detail5Page} from "./detail5/detail5";
import {HistoryPage} from "./history/history"; import {HistoryPage} from "./history/history";
import {ApprovalsPage} from "./approvals/approvals"; import {ApprovalsPage} from "./approvals/approvals";
import {FileListPage} from "./file-list/file-list"; import {FileListPage} from "./file-list/file-list";
import {Detail6Page} from "./detail6/detail6";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -20,6 +21,7 @@ import {FileListPage} from "./file-list/file-list"; ...@@ -20,6 +21,7 @@ import {FileListPage} from "./file-list/file-list";
Detail3Page, Detail3Page,
Detail4Page, Detail4Page,
Detail5Page, Detail5Page,
Detail6Page,
HistoryPage, HistoryPage,
ApprovalsPage, ApprovalsPage,
FileListPage, FileListPage,
...@@ -34,6 +36,7 @@ import {FileListPage} from "./file-list/file-list"; ...@@ -34,6 +36,7 @@ import {FileListPage} from "./file-list/file-list";
Detail3Page, Detail3Page,
Detail4Page, Detail4Page,
Detail5Page, Detail5Page,
Detail6Page,
HistoryPage, HistoryPage,
ApprovalsPage, ApprovalsPage,
FileListPage, FileListPage,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="item-box"> <div class="item-box">
<div class="left">单位名称:</div> <div class="left">单位名称:</div>
<div class="right"> <div class="right">
<span>{{foundRegisterVO?.unitName || "-"}</span> <span>{{foundRegisterVO?.unitName || "-"}}</span>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
......
...@@ -5,55 +5,425 @@ ...@@ -5,55 +5,425 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="table"> <!-- 事业单位-->
<table border="1"> <ng-container *ngIf="type == '1'">
<thead> <ng-container *ngFor="let item of changeMatters">
<tr> <!-- 名称变更 -->
<th colspan="3">举办单位变更</th> <ng-container *ngIf="item.afterUnitName">
</tr> <div class="table">
<tr> <table border="1">
<th></th> <thead>
<th>变更前</th> <tr>
<th>变更后</th> <th colspan="3">
</tr> 名称变更
</thead> </th>
<tbody> </tr>
<tr> <tr>
<td>举办单位</td> <th></th>
<td>上海市经济和信息化委员会(上海市国防科技办公室)</td> <th>变更前</th>
<td>上海市经济和信息化委员会</td> <th>变更后</th>
</tr> </tr>
<tr> </thead>
<td>批文号</td> <tbody>
<td colspan="3">沪发办发[2019] 31</td> <tr>
</tr> <td>名称</td>
</tbody> <td>{{item.preUnitName}}</td>
</table> <td>{{item.afterUnitName}}</td>
</div> </tr>
<div class="content"> <tr>
<div class="item-box"> <td>批文号</td>
<div class="left">变更原因:</div> <td colspan="3">{{item.approvalNumber}}</td>
<div class="right"> </tr>
<span>名称更改</span> </tbody>
</table>
</div>
</ng-container>
<!-- 法定代表人变更 -->
<ng-container *ngIf="item.afterName">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
法定代表人变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>名称</td>
<td>{{item.preName}}</td>
<td>{{item.afterName}}</td>
</tr>
<tr>
<td>批文号</td>
<td colspan="3">沪发办发[2019] 31</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 住所变更 -->
<ng-container *ngIf="item.afterNature">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
住所变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>名称</td>
<td>{{item.preResidence}}</td>
<td>{{item.afterResidence}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 开办资金变更 -->
<ng-container *ngIf="item.afterStartFunds">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
开办资金变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>开办资金</td>
<td>{{item.preStartFunds}}</td>
<td>{{item.afterStartFunds}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 宗旨和业务范围变更 -->
<ng-container *ngIf="item.afterRangeChange">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
宗旨和业务范围变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>举办单位</td>
<td>{{item.preRangeChange}}</td>
<td>{{item.afterRangeChange}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 举办单位变更 -->
<ng-container *ngIf="item.afterHostUnit">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
举办单位变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>举办单位</td>
<td>{{item.preHostUnit}}</td>
<td>{{item.afterHostUnit}}</td>
</tr>
<tr>
<td>批文号</td>
<td colspan="3">{{item.approvalNumber}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 经费来源变更 -->
<ng-container *ngIf="item.afterFundingSources">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
经费来源变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>经费来源</td>
<td>{{item.preFundingSources}}</td>
<td>{{item.afterFundingSources}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
<!-- 编制数变更 -->
<ng-container *ngIf="item.afterCompilationNumber">
<div class="table">
<table border="1">
<thead>
<tr>
<th colspan="3">
编制数变更
</th>
</tr>
<tr>
<th></th>
<th>变更前</th>
<th>变更后</th>
</tr>
</thead>
<tbody>
<tr>
<td>编制数</td>
<td>{{item.preCompilationNumber}}</td>
<td>{{item.afterCompilationNumber}}</td>
</tr>
<tr>
<td>批文号</td>
<td colspan="3">{{item.approvalNumber}}</td>
</tr>
</tbody>
</table>
</div>
</ng-container>
</ng-container>
<div class="content">
<div class="item-box">
<div class="left">变更原因:</div>
<div class="right">
<span>{{changeRecordVO?.changeReasons || '-'}}</span>
</div>
</div> </div>
</div> <div class="item-box">
<div class="item-box"> <div class="left">联系人:</div>
<div class="left">联系人:</div> <div class="right">
<div class="right"> <span>{{changeRecordVO?.contacts || '-'}}</span>
<span>王蕾</span> </div>
</div> </div>
</div> <div class="item-box">
<div class="item-box"> <div class="left">联系电话:</div>
<div class="left">联系电话:</div> <div class="right">
<div class="right"> <span>{{changeRecordVO?.contactNumber || '-'}}</span>
<span>64173196</span> </div>
</div>
<div class="item-box">
<div class="left">手机号码:</div>
<div class="right">
<span>{{changeRecordVO?.phoneNumber || '-'}}</span>
</div>
</div> </div>
</div> </div>
<div class="item-box"> </ng-container>
<div class="left">手机号码:</div>
<div class="right"> <ng-container *ngIf="type == '2'">
<span>18918883992</span> <ng-container *ngFor="let item of changeBusiness">
<div class="changeBusiness">
<!-- 机构名称 -->
<ng-container *ngIf="item.changeOrganizationName">
<p>机构名称</p>
<div class="item-box">
<div class="left">现机构名称:</div>
<div class="right">
<span>{{item?.nowOrganizationName || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更机构名称:</div>
<div class="right">
<span>{{item?.changeOrganizationName || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构名称变更批文:</div>
<div class="right">
<span>{{item?.organizationApprovals || '-'}}</span>
</div>
</div>
</ng-container>
<!-- 负责人 -->
<ng-container *ngIf="item.changeLeadingCadre">
<p>负责人</p>
<div class="item-box">
<div class="left">现负责人姓名:</div>
<div class="right">
<span>{{item?.nowLeadingCadre || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更负责人姓名:</div>
<div class="right">
<span>{{item?.changeLeadingCadre || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">现身份证号:</div>
<div class="right">
<span>{{item?.nowIdentityCard || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更身份证号:</div>
<div class="right">
<span>{{item?.changeIdentityCard || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人任职批文:</div>
<div class="right">
<span>{{item?.postApproval || '-'}}</span>
</div>
</div>
</ng-container>
<!-- 机构性质 -->
<ng-container *ngIf="item.changeNature && !item.changeAddress">
<p>机构性质</p>
<div class="item-box">
<div class="left">现机构性质:</div>
<div class="right">
<span>{{item?.nowNature || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更机构地址:</div>
<div class="right">
<span>{{item?.changeNature || '-'}}</span>
</div>
</div>
</ng-container>
<!-- 机构地址 -->
<ng-container *ngIf="item.changeAddress">
<p>机构地址</p>
<div class="item-box">
<div class="left">现机构地址:</div>
<div class="right">
<span>{{item?.nowAddress || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更机构地址:</div>
<div class="right">
<span>{{item?.changeAddress || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">现邮编:</div>
<div class="right">
<span>{{item?.nowPostalCode || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更邮编:</div>
<div class="right">
<span>{{item?.changePostalCode || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">现房屋建筑性质:</div>
<div class="right">
<span>{{item?.newNature || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">拟变更房屋建筑性质:</div>
<div class="right">
<span>{{item?.changeNature || '-'}}</span>
</div>
</div>
</ng-container>
</div>
</ng-container>
<!-- 机关群团 -->
<div class="content">
<div class="item-box">
<div class="left">批准机构:</div>
<div class="right">
<span>{{changeBusinessVO?.approvingBody || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{changeBusinessVO?.approvalNumber || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">备注(原组织机构代码号):</div>
<div class="right">
<span>{{changeBusinessVO?.organizationCode || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人:</div>
<div class="right">
<span>{{changeBusinessVO?.contacts || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人电话:</div>
<div class="right">
<span>{{changeBusinessVO?.contactNumber || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人手机号:</div>
<div class="right">
<span>{{changeBusinessVO?.contactMobile || '-'}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人身份证号:</div>
<div class="right">
<span>{{changeBusinessVO?.contactsIDCard || '-'}}</span>
</div>
</div> </div>
</div> </div>
</div> </ng-container>
</ion-content> </ion-content>
...@@ -6,10 +6,28 @@ page-detail3 { ...@@ -6,10 +6,28 @@ page-detail3 {
table { table {
width: 100%; width: 100%;
td, th { td, th {
text-align: center; text-align: center;
height: 30px; height: 30px;
padding: 2px; padding: 2px;
} }
} }
.changeBusiness{
p {
margin-top: 10px;
padding-left: 15px;
font-size: 16px;
color: #2679B5;
font-weight: bolder;
}
}
.changeBusiness + .changeBusiness {
border-top: 10px solid #F2F2F2;
}
.content{
border-top: 10px solid #F2F2F2;
}
} }
...@@ -7,10 +7,18 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular'; ...@@ -7,10 +7,18 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
}) })
export class Detail3Page { export class Detail3Page {
changeMatters; changeMatters; //事业单位变更
changeBusiness; //机关群团变更
type; //1事业单位 2机关群团
changeBusinessVO; //机关团体变更信息
changeRecordVO; //事业单位变更信息
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
this.changeMatters = this.navParams.get('changeMatters'); this.changeMatters = this.navParams.get('changeMatters');
this.changeBusiness = this.navParams.get('changeBusiness');
this.changeRecordVO = this.navParams.get('changeRecordVO');
this.changeBusinessVO = this.navParams.get('changeBusinessVO');
this.type = this.navParams.get('type');
} }
ionViewDidLoad() { ionViewDidLoad() {
......
...@@ -4,36 +4,168 @@ ...@@ -4,36 +4,168 @@
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="content"> <ng-container *ngIf="type == '1'">
<div class="item-box"> <div class="content">
<div class="left">注销单位:</div> <div class="item-box">
<div class="right"> <div class="left">注销单位:</div>
<span>{{cancellationRegisterVO?.cancellationUnit || "-"}}</span> <div class="right">
<span>{{cancellationRegisterVO?.cancellationUnit || "-"}}</span>
</div>
</div> </div>
</div> <div class="item-box">
<div class="item-box"> <div class="left">注销原因:</div>
<div class="left">注销原因:</div> <div class="right">
<div class="right"> <span>{{cancellationRegisterVO?.cancellationReasons || "-"}}</span>
<span>{{cancellationRegisterVO?.cancellationReasons || "-"}}</span> </div>
</div> </div>
</div> <div class="item-box">
<div class="item-box"> <div class="left">联系人:</div>
<div class="left">联系人:</div> <div class="right">
<div class="right"> <span>{{cancellationRegisterVO?.contacts || "-"}}</span>
<span>{{cancellationRegisterVO?.contacts || "-"}}</span> </div>
</div> </div>
</div> <div class="item-box">
<div class="item-box"> <div class="left">联系电话:</div>
<div class="left">联系电话:</div> <div class="right">
<div class="right"> <span>{{cancellationRegisterVO?.contactNumber || "-"}}</span>
<span>{{cancellationRegisterVO?.contactNumber || "-"}}</span> </div>
</div>
<div class="item-box">
<div class="left">手机:</div>
<div class="right">
<span>{{cancellationRegisterVO?.mobile || "-"}}</span>
</div>
</div> </div>
</div> </div>
<div class="item-box"> </ng-container>
<div class="left">手机:</div> <ng-container *ngIf="type == '2'">
<div class="right"> <div class="content">
<span>{{cancellationRegisterVO?.mobile || "-"}}</span> <div class="item-box">
<div class="left">组织机构代码:</div>
<div class="right">
<span>{{revokeVO?.organizationCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">统一社会信用代码:</div>
<div class="right">
<span>{{revokeVO?.creditCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">单位名称:</div>
<div class="right">
<span>{{revokeVO?.unitName || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构性质:</div>
<div class="right">
<span>{{revokeVO?.institutionalNature || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构地址:</div>
<div class="right">
<span>{{revokeVO?.institutionalAddress || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构地址:</div>
<div class="right">
<span>{{revokeVO?.postalCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">邮编:</div>
<div class="right">
<span>{{revokeVO?.postalCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">房屋建筑性质:</div>
<div class="right">
<span>{{revokeVO?.propertyOfBuilding || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人姓名:</div>
<div class="right">
<span>{{revokeVO?.leadingCadre || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人身份证号:</div>
<div class="right">
<span>{{revokeVO?.identityCard || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准机构:</div>
<div class="right">
<span>{{revokeVO?.approvingBody || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{revokeVO?.approvalNumber || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">隶属:</div>
<div class="right">
<span>{{revokeVO?.subjection || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">撤销文号:</div>
<div class="right">
<span>{{revokeVO?.revocationSymbol || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">业务范围:</div>
<div class="right">
<span>{{revokeVO?.businessScope || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人:</div>
<div class="right">
<span>{{revokeVO?.contacts || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人身份证号:</div>
<div class="right">
<span>{{revokeVO?.contactsIDCard || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人电话:</div>
<div class="right">
<span>{{revokeVO?.contactNumber || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">单位级别:</div>
<div class="right">
<span>{{revokeVO?.unitLevel || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">确定单位级别批文号:</div>
<div class="right">
<span>{{revokeVO?.gradeApprovalNo || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">备注(原组织机构代码号):</div>
<div class="right">
<span>{{revokeVO?.remarks || "-"}}</span>
</div>
</div> </div>
</div> </div>
</div> </ng-container>
</ion-content> </ion-content>
...@@ -7,10 +7,14 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular'; ...@@ -7,10 +7,14 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
}) })
export class Detail4Page { export class Detail4Page {
cancellationRegisterVO; cancellationRegisterVO; //事业单位
revokeVO; //机关群团
type;
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
this.cancellationRegisterVO = this.navParams.get('cancellationRegisterVO'); this.cancellationRegisterVO = this.navParams.get('cancellationRegisterVO');
this.revokeVO = this.navParams.get('revokeVO');
this.type = this.navParams.get('type');
} }
ionViewDidLoad() { ionViewDidLoad() {
......
<ion-header>
<ion-navbar>
<ion-title>{{title}}</ion-title>
</ion-navbar>
</ion-header>
<ion-content>
<div class="content">
<div class="item-box">
<div class="left">组织机构代码:</div>
<div class="right">
<span>{{revokeVO?.organizationCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">统一社会信用代码:</div>
<div class="right">
<span>{{revokeVO?.creditCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">单位名称:</div>
<div class="right">
<span>{{revokeVO?.unitName || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构性质:</div>
<div class="right">
<span>{{revokeVO?.institutionalNature || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构地址:</div>
<div class="right">
<span>{{revokeVO?.institutionalAddress || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构地址:</div>
<div class="right">
<span>{{revokeVO?.postalCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">邮编:</div>
<div class="right">
<span>{{revokeVO?.postalCode || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">房屋建筑性质:</div>
<div class="right">
<span>{{revokeVO?.propertyOfBuilding || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人姓名:</div>
<div class="right">
<span>{{revokeVO?.leadingCadre || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人身份证号:</div>
<div class="right">
<span>{{revokeVO?.identityCard || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准机构:</div>
<div class="right">
<span>{{revokeVO?.approvingBody || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{revokeVO?.approvalNumber || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">隶属:</div>
<div class="right">
<span>{{revokeVO?.subjection || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">撤销文号:</div>
<div class="right">
<span>{{revokeVO?.revocationSymbol || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">业务范围:</div>
<div class="right">
<span>{{revokeVO?.businessScope || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人:</div>
<div class="right">
<span>{{revokeVO?.contacts || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人身份证号:</div>
<div class="right">
<span>{{revokeVO?.contactsIDCard || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人电话:</div>
<div class="right">
<span>{{revokeVO?.contactNumber || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">单位级别:</div>
<div class="right">
<span>{{revokeVO?.unitLevel || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">确定单位级别批文号:</div>
<div class="right">
<span>{{revokeVO?.gradeApprovalNo || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">备注(原组织机构代码号):</div>
<div class="right">
<span>{{revokeVO?.remarks || "-"}}</span>
</div>
</div>
</div>
</ion-content>
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
@Component({
selector: 'page-detail6',
templateUrl: 'detail6.html',
})
export class Detail6Page {
revokeVO; //机关群团
title;
constructor(public navCtrl: NavController, public navParams: NavParams) {
this.revokeVO = this.navParams.get('revokeVO');
this.title = this.navParams.get('title');
}
ionViewDidLoad() {
console.log('ionViewDidLoad Detail4Page');
}
}
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<ion-content> <ion-content>
<div class="file-list"> <div class="file-list">
<div class="file-item" *ngFor="let item of accessoryMaterials"> <div class="file-item" *ngFor="let item of accessoryMaterials">
<div>申请文件1</div> <div>{{item.accessoryMateriaName}}</div>
<div>查看</div> <div></div>
</div> </div>
</div> </div>
</ion-content> </ion-content>
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular'; import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {HomeService} from "../../home/home.service";
@Component({ @Component({
selector: 'page-file-list', selector: 'page-file-list',
...@@ -8,13 +9,29 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular'; ...@@ -8,13 +9,29 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
export class FileListPage { export class FileListPage {
accessoryMaterials; accessoryMaterials;
obj;
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams,
private homeSer: HomeService) {
this.accessoryMaterials = this.navParams.get('accessoryMaterials'); this.accessoryMaterials = this.navParams.get('accessoryMaterials');
this.obj = this.navParams.get('obj');
} }
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad FileListPage'); console.log('ionViewDidLoad FileListPage');
} }
getFile(item) {
const data = {
id: item.accessoryMateriaId,
flow: this.obj.flow,
type: this.obj.type,
}
this.homeSer.fileAttach(data).subscribe(
(res) => {
}
)
}
} }
...@@ -92,7 +92,7 @@ export class LoginPage { ...@@ -92,7 +92,7 @@ export class LoginPage {
res.list.map(e => { res.list.map(e => {
if (e.code == userObj.area) { if (e.code == userObj.area) {
this.globle.area = e; this.globle.area = e;
console.log(this.globle.area); this.storage.set('area', e);
} }
}) })
} }
......
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