update

src/app/app.component.ts

@@ -64,6 +64,11 @@ export class MyApp {
                                 this.rootPage = LoginPage;
                             }
                         }
+                    );
+                    this.storage.get('area').then(
+                        (value) => {
+                            this.globle.area = value;
+                        }
                     )
                 }
             );

src/app/app.constants.ts

-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

src/app/app.scss

@@ -67,3 +67,29 @@ html, body, p {
 .has-icon .tab-badge {
   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;
+      }
+    }
+  }
+}

src/pages/deal/deal-detail/deal-detail.scss

@@ -51,6 +51,7 @@ page-deal-detail {
 
       input {
         margin-left: 20px;
+        margin-right: 3px;
       }
     }
 

src/pages/deal/deal-detail/deal-detail.ts

@@ -12,6 +12,9 @@ import {FileListPage} from "../file-list/file-list";
 import {SearchPersonComponent} from "../../../components/search-person/search-person";
 import {GlobalData} from "../../../core/GlobleData";
 import {CommonService} from "../../../core/common.service";
+import {AppService} from "../../../app/app.service";
+import {institutionalNature} from "../../../app/app.constants";
+import {Detail6Page} from "../detail6/detail6";
 
 @Component({
     selector: 'page-deal-detail',
@@ -19,6 +22,7 @@ import {CommonService} from "../../../core/common.service";
 })
 export class DealDetailPage {
 
+    institutionalNatureList = institutionalNature;  //机构性质
     /**
      * type: String (1-事业单位，2-机关群团，3-其他)
      * flow : String (1-设立，2-变更 ,3-注销，4-补领，0-全部)
@@ -31,11 +35,12 @@ export class DealDetailPage {
 
     submitObj = {
         flag: null,  //是否符合条件
-        djflag: 0, //是否委托登记
+        djflag: "0", //是否委托登记
         djtype: null, //委托登记类型。是否委托登记选是则出现这个选项
         opinion: null,  //回复
-        smgflag: "0"  //是否发送短信
-    }
+        smgflag: "0",  //是否发送短信
+        jglb: null
+    };
 
     detailObj = {
         renewalVO: null,   //补领
@@ -43,7 +48,7 @@ export class DealDetailPage {
         changeMatters: null,   //变更登记
         changeRecordVO: null,  //变更记录
         listApprovalsVO: null,   //当前业务办理对应批文列表
-        changeBusiness: null,  //变更业务
+        changeBusiness: null,  //机关群体业务
         acceptanceVO: null,   //受理信息
         changeBusinessVO: null,   //变更业务信息
         accessoryMaterials: null,   //附件材料
@@ -62,11 +67,13 @@ export class DealDetailPage {
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private globle: GlobalData,
+                private appSer: AppService,
                 private commonSer: CommonService,
                 private dealSer: DealService, private modalCtrl: ModalController) {
         this.itemInfo = this.navParams.get("item");
         this.area = this.globle.area;
         console.log(this.itemInfo);
+        console.log(this.area);
     }
 
     //查询详情
@@ -77,7 +84,7 @@ export class DealDetailPage {
         };
         this.dealSer.scheduleDetail(data).subscribe(
             (res) => {
-                if (res.code == "0") {
+                if (res.code == "0" && res.data) {
                     this.detailObj = res.data;
                     if (this.itemInfo.status == "1") {
                         this.submitObj.opinion = res.data.rqeplyAccepted;
@@ -128,7 +135,11 @@ export class DealDetailPage {
     //变更登记
     openDetail3() {
         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',
             leaveAnimation: 'modal-from-right-leave'
@@ -139,7 +150,9 @@ export class DealDetailPage {
     //事业单位法人注销登记(备案)申请书
     openDetail4() {
         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',
             leaveAnimation: 'modal-from-right-leave'
@@ -158,6 +171,28 @@ export class DealDetailPage {
         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() {
         let modal = this.modalCtrl.create(ApprovalsPage, {
@@ -176,7 +211,8 @@ export class DealDetailPage {
     //查看附件
     viewFile() {
         let modalCtrl = this.modalCtrl.create(FileListPage, {
-            "accessoryMaterials": this.detailObj.accessoryMaterials
+            "accessoryMaterials": this.detailObj.accessoryMaterials,
+            "obj": this.itemInfo
         }, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
@@ -185,8 +221,9 @@ export class DealDetailPage {
     }
 
     sureSubmit() {
-        if (this.submitObj.opinion || !this.submitObj.flag) {
+        if (!this.submitObj.opinion || !this.submitObj.flag) {
             this.commonSer.toast('请输入必填项');
+            return
         }
         const data = {
             id: this.itemInfo.id,
@@ -195,12 +232,15 @@ export class DealDetailPage {
             type: this.itemInfo.type,
             djflag: this.submitObj.djflag,
             djtype: this.submitObj.djtype,
-            smgflag: "0"
+            smgflag: this.submitObj.smgflag,
+            jglb: this.submitObj.jglb
         }
         this.dealSer.scheduleAcceptdo(data).subscribe(
             (res) => {
                 if (res.code == "0") {
                     this.commonSer.toast('办理成功');
+                    this.appSer.setNotice('1');
+                    this.appSer.setDeal(this.itemInfo.type)
                     this.navCtrl.pop();
                 }
             }

src/pages/deal/deal.module.ts

@@ -10,6 +10,7 @@ import {Detail5Page} from "./detail5/detail5";
 import {HistoryPage} from "./history/history";
 import {ApprovalsPage} from "./approvals/approvals";
 import {FileListPage} from "./file-list/file-list";
+import {Detail6Page} from "./detail6/detail6";
 
 @NgModule({
     declarations: [
@@ -20,6 +21,7 @@ import {FileListPage} from "./file-list/file-list";
         Detail3Page,
         Detail4Page,
         Detail5Page,
+        Detail6Page,
         HistoryPage,
         ApprovalsPage,
         FileListPage,
@@ -34,6 +36,7 @@ import {FileListPage} from "./file-list/file-list";
         Detail3Page,
         Detail4Page,
         Detail5Page,
+        Detail6Page,
         HistoryPage,
         ApprovalsPage,
         FileListPage,

src/pages/deal/detail1/detail1.html

@@ -9,7 +9,7 @@
         <div class="item-box">
             <div class="left">单位名称:</div>
             <div class="right">
-                <span>{{foundRegisterVO?.unitName || "-"}</span>
+                <span>{{foundRegisterVO?.unitName || "-"}}</span>
             </div>
         </div>
         <div class="item-box">

src/pages/deal/detail3/detail3.scss

@@ -6,10 +6,28 @@ page-detail3 {
 
   table {
     width: 100%;
+
     td, th {
       text-align: center;
       height: 30px;
       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;
+  }
 }

src/pages/deal/detail3/detail3.ts

@@ -7,10 +7,18 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 })
 export class Detail3Page {
 
-    changeMatters;
+    changeMatters;  //事业单位变更
+    changeBusiness;  //机关群团变更
+    type;  //1事业单位  2机关群团
+    changeBusinessVO;  //机关团体变更信息
+    changeRecordVO;  //事业单位变更信息
 
     constructor(public navCtrl: NavController, public navParams: NavParams) {
         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() {

src/pages/deal/detail4/detail4.html

@@ -4,36 +4,168 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <div class="content">
-        <div class="item-box">
-            <div class="left">注销单位:</div>
-            <div class="right">
-                <span>{{cancellationRegisterVO?.cancellationUnit || "-"}}</span>
+    <ng-container *ngIf="type == '1'">
+        <div class="content">
+            <div class="item-box">
+                <div class="left">注销单位:</div>
+                <div class="right">
+                    <span>{{cancellationRegisterVO?.cancellationUnit || "-"}}</span>
+                </div>
             </div>
-        </div>
-        <div class="item-box">
-            <div class="left">注销原因:</div>
-            <div class="right">
-                <span>{{cancellationRegisterVO?.cancellationReasons || "-"}}</span>
+            <div class="item-box">
+                <div class="left">注销原因:</div>
+                <div class="right">
+                    <span>{{cancellationRegisterVO?.cancellationReasons || "-"}}</span>
+                </div>
             </div>
-        </div>
-        <div class="item-box">
-            <div class="left">联系人:</div>
-            <div class="right">
-                <span>{{cancellationRegisterVO?.contacts || "-"}}</span>
+            <div class="item-box">
+                <div class="left">联系人:</div>
+                <div class="right">
+                    <span>{{cancellationRegisterVO?.contacts || "-"}}</span>
+                </div>
             </div>
-        </div>
-        <div class="item-box">
-            <div class="left">联系电话:</div>
-            <div class="right">
-                <span>{{cancellationRegisterVO?.contactNumber || "-"}}</span>
+            <div class="item-box">
+                <div class="left">联系电话:</div>
+                <div class="right">
+                    <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 class="item-box">
-            <div class="left">手机:</div>
-            <div class="right">
-                <span>{{cancellationRegisterVO?.mobile || "-"}}</span>
+    </ng-container>
+    <ng-container *ngIf="type == '2'">
+        <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>
-    </div>
+    </ng-container>
 </ion-content>

src/pages/deal/detail4/detail4.ts

@@ -7,10 +7,14 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 })
 export class Detail4Page {
 
-    cancellationRegisterVO;
+    cancellationRegisterVO;  //事业单位
+    revokeVO;  //机关群团
+    type;
 
     constructor(public navCtrl: NavController, public navParams: NavParams) {
         this.cancellationRegisterVO = this.navParams.get('cancellationRegisterVO');
+        this.revokeVO = this.navParams.get('revokeVO');
+        this.type = this.navParams.get('type');
     }
 
     ionViewDidLoad() {

src/pages/deal/detail6/detail6.html

+<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>

src/pages/deal/detail6/detail6.scss

+page-detail6 {
+
+}

src/pages/deal/detail6/detail6.ts

+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');
+  }
+
+}

src/pages/deal/file-list/file-list.html

@@ -7,8 +7,8 @@
 <ion-content>
     <div class="file-list">
         <div class="file-item" *ngFor="let item of accessoryMaterials">
-            <div>申请文件1</div>
-            <div>查看</div>
+            <div>{{item.accessoryMateriaName}}</div>
+            <div></div>
         </div>
     </div>
 </ion-content>

src/pages/deal/file-list/file-list.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
+import {HomeService} from "../../home/home.service";
 
 @Component({
     selector: 'page-file-list',
@@ -8,13 +9,29 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 export class FileListPage {
 
     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.obj = this.navParams.get('obj');
     }
 
     ionViewDidLoad() {
         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) => {
+
+            }
+        )
+    }
+
 }

src/pages/login/login.ts

@@ -92,7 +92,7 @@ export class LoginPage {
                     res.list.map(e => {
                         if (e.code == userObj.area) {
                             this.globle.area = e;
-                            console.log(this.globle.area);
+                            this.storage.set('area', e);
                         }
                     })
                 }