问需调查

src/pages/serve-pages/requirement/requirement-apply/requirement-apply.html

@@ -28,7 +28,7 @@
         <div class="item-box">
             <div class="left">办公用品申领名称及数量:</div>
             <div class="right">
-                <ion-textarea [disabled]="isRequired != 0" [(ngModel)]="obj.officeSupply"></ion-textarea>
+                <ion-textarea [disabled]="isRequired != 0" [(ngModel)]="obj.officeSuppy"></ion-textarea>
             </div>
         </div>
         <div class="item-box">

src/pages/serve-pages/requirement/requirement-apply/requirement-apply.ts

@@ -13,7 +13,7 @@ export class RequirementApplyPage {
     obj = {
         assertReplacement: "",
         replacementReason: "",
-        officeSupply: "",
+        officeSuppy: "",
         officeReason: "",
         teaAmount: "",
         teaReason: "",
@@ -21,19 +21,17 @@ export class RequirementApplyPage {
     };
     role = [];
     isRequired; //是否填写过处室问需（1是，0否，null管理员用户查询）
-    mineInfo;
     orgList;
+    item;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private actionSheetCtrl: ActionSheetController,
                 private commonSer: CommonService,
                 private appMainSer: AppMainService, private serveSer: ServeService) {
-        this.appMainSer.mineInfo.subscribe(value => {
-            this.mineInfo = value;
-            console.log(this.mineInfo);
-        });
+        this.item = this.navParams.get("item");
         this.obj.requireContentId = this.navParams.get("item").id;
         this.isRequired = this.navParams.get("item").isRequired;
+        console.log(this.item);
     }
 
     ionViewDidLoad() {
@@ -43,12 +41,11 @@ export class RequirementApplyPage {
             }
         );
         if (this.isRequired == 1) {  //已填写
-            this.getDetail(this.mineInfo.orgId);
+            this.getDetail(this.item.orgId);
         } else if (this.isRequired == 0) {  //未填写
 
-        } else {
-            this.getOrg();
         }
+        this.getOrg();
     }
 
     //查询详情

src/pages/serve-pages/requirement/requirement.module.ts

@@ -2,17 +2,20 @@ import {NgModule} from '@angular/core';
 import {IonicPageModule} from 'ionic-angular';
 import {RequirementPage} from './requirement';
 import {RequirementApplyPage} from "./requirement-apply/requirement-apply";
+import {RequirementDetailPage} from "./requirement-detail/requirement-detail";
 
 @NgModule({
     declarations: [
         RequirementPage,
-        RequirementApplyPage
+        RequirementApplyPage,
+        RequirementDetailPage,
     ],
     imports: [
         IonicPageModule.forChild(RequirementPage),
     ],
     entryComponents: [
-        RequirementApplyPage
+        RequirementApplyPage,
+        RequirementDetailPage
     ]
 })
 export class RequirementPageModule {

src/pages/serve-pages/requirement/requirement.ts

@@ -2,6 +2,8 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {RequirementApplyPage} from "./requirement-apply/requirement-apply";
 import {ServeService} from "../serve.service";
+import {AppMainService} from "../../../app/app.service";
+import {RequirementDetailPage} from "./requirement-detail/requirement-detail";
 
 @IonicPage()
 @Component({
@@ -11,9 +13,21 @@ import {ServeService} from "../serve.service";
 export class RequirementPage {
 
     list = [];
+    role = [];
+    mineInfo;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
+                private appMainSer: AppMainService,
                 private serverSer: ServeService) {
+        this.appMainSer.mineInfo.subscribe(value => {
+            this.mineInfo = value;
+            console.log(this.mineInfo);
+        });
+        //获取权限
+        this.appMainSer.role.subscribe(value => {
+                this.role = value;
+            }
+        );
     }
 
     ionViewDidEnter() {
@@ -30,7 +44,12 @@ export class RequirementPage {
 
     //申领
     goToApply(item) {
-        this.navCtrl.push(RequirementApplyPage,{item:item})
+        item.orgId = this.mineInfo.orgId;
+        if (this.role.includes(3)) {
+            this.navCtrl.push(RequirementDetailPage, {item: item})
+        } else {
+            this.navCtrl.push(RequirementApplyPage, {item: item})
+        }
     }
 
 }

src/service/http.service.ts

@@ -28,8 +28,8 @@ export class AppGlobal {
     static pictureNotice = AppGlobal.domain;
 
     //默认版本
-    static defaultVersion = "4.6.0";  //dev
-    // static defaultVersion;  //prod
+    // static defaultVersion = "4.6.0";  //dev
+    static defaultVersion;  //prod
 
     //接口地址
     static API: any = {