完成修改盘点执行

proxy.config.json

 {
   "/asset/*": {
-    "target": "http://192.168.19.171:8082",
+    "target": "http://localhost:8081",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": true

src/app/routes/assets/assets-used/assets-used-routing.module.ts

@@ -203,7 +203,7 @@ const routes: Routes = [
     }
   },
   {
-    path: "checkPlanAdd/:id",
+    path: "checkPlanAdd/:id/:planId",
     component: CheckAddComponent,
     data: {
       title: "执行盘点"

src/app/routes/assets/assets-used/checkPlan/check-add/check-add.component.html

 <form [formGroup]="registerForm" (ngSubmit)="onSubmit()">
 
-<<<<<<< HEAD
   <input type="hidden" formControlName="id" [ngModel]="detail.id">
   <List [renderHeader]=(renderHeader)>
       <ListItem [extra]="detail.modelNum">盘点单号</ListItem>
@@ -20,12 +19,6 @@
           <font color="red">*</font>盘点状态
         </app-form-select>
     <!-- <InputItem [placeholder]="'盘点单号'" [value]="detail.modelNum"  [disabled]="disabled" [(ngModel)]="detail.modelNum">
-=======
-  <List [renderHeader]=(renderHeader)>
-    <InputItem [placeholder]="'盘点单号'" [error]="isError" [focus]="onFocus" [value]="invoicesNum" [clear]="true"
-      formControlName="invoicesNum">
-      <font color="red">*</font>
->>>>>>> b6e79db9bbb73e21767c2641d100bf0d05551ef2
       盘点单号
     </InputItem>
     <InputItem [placeholder]="'请输入事项名称'" [error]="isError" [focus]="onFocus" [value]="name" [clear]="true"
@@ -62,7 +55,7 @@
     <div class="am-list" style="margin:0;">
       <div class="am-list-header">上传资源</div>
       <div class="am-list-body">
-        <ImagePicker [files]="files" [selectable]="files.length < 5" [multiple]="multipleTab === 1"
+        <ImagePicker [files]="files"  [multiple]="true"
           (onChange)="fileChange($event)" (onImageClick)="imageClick($event)"></ImagePicker>
 
       </div>
@@ -96,17 +89,3 @@
 </form>
 
 
-
-<List [renderHeader]=(renderHeader2)>
-  <ListItem [extra]="detail.asset.num">资产编号</ListItem>
-  <ListItem [extra]="detail.asset.name">资产名称</ListItem>
-  <ListItem [extra]="detail.modelNum">规格型号</ListItem>
-  <ListItem [extra]="detail.madeFirms">生产厂家</ListItem>
-  <ListItem [extra]="detail.taxPrice">账面原值</ListItem>
-  <ListItem [extra]="detail.addDepreciation">累计折旧</ListItem>
-  <ListItem [extra]="detail.qualitySta">品质状况</ListItem>
-  <ListItem [extra]="detail.checkResult">盘点结果</ListItem>
-  <ListItem [extra]="detail.belongUnit.id"> 归属单位</ListItem>
-  <ListItem [extra]="detail.projectTeam.id"> 项目组</ListItem>
-  <ListItem [extra]="detail.assetClass.id">资产分类</ListItem>
-</List>
\ No newline at end of file

src/app/routes/assets/assets-used/checkPlan/check-add/check-add.component.ts

 import { Component, OnInit } from "@angular/core";
 
 import { Router, ActivatedRoute } from "@angular/router";
-import { switchMap } from "rxjs/operators";
+import { switchMap, merge, tap } from "rxjs/operators";
 import { Modal, Picker, Toast, PickerService, ToastService, ModalService } from "ng-zorro-antd-mobile";
 
 import {
@@ -16,6 +16,8 @@ import {
   PositionOptions
 } from "@ionic-native/gao-de-location/ngx";
 import { b64toBlob } from 'src/app/layout/service/util.service';
+import { isFulfilled } from 'q';
+import { defer, Observable, of } from 'rxjs';
 const data = [];
 
 @Component({
@@ -50,7 +52,7 @@ export class CheckAddComponent implements OnInit {
   inventoryType = ["资产明细盘点", "资产范围盘点"];
   checkStaType = ["未开始", "待审核", "清查中", "已完成","其他"];
   fileStrs:[]=[];
-  detail: any = { asset: {}, belongUnit: {}, projectTeam: {}, assetClass: {} };
+  detail: any = { asset: {}, belongUnit: {}, projectTeam: {},  };
   msg: any = "";
   formErrors: any = {
     invoicesNum: "",
@@ -64,27 +66,37 @@ export class CheckAddComponent implements OnInit {
     },
     name: {}
   };
-  id = null;
+  param = null;
   ngOnInit() {
+    const accessPlan = (param)=>{
+      this.api
+      .getCheckTaskText(param.id, param.planId)
+      .subscribe(data => (this.detail = data.body.checkPlanAsset))
+    }
+    const planDialog= (data)=>{
+      if (data.success) {
+        Modal.operation(
+          [{text:"请选择盘点计划："}].concat(
+          data.body.checkList.map(c => ({
+            text: c.name,
+            onPress: () =>
+            accessPlan({...this.param,planId:c.id})
+          }))
+          )
+        );
+      }
+    }
     this.buildForm();
     this.router.params
       .pipe(
-        switchMap(param => {
-          this.id = param.id;
-          return this.api.getCheckTask(this.id);
-        })
+       tap(param=>{this.param=param;console.log(param)}),
+       switchMap(param=>param.planId?of(param):this.api.getCheckTask(param.id))
       )
       .subscribe(data => {
-        if (data.success) {
-          Modal.operation(
-            data.body.checkList.map(c => ({
-              text: c.name,
-              onPress: () =>
-                this.api
-                  .getCheckTaskText(this.id, c.id)
-                  .subscribe(data => (this.detail = data.body.checkPlanAsset))
-            }))
-          );
+        if(data.planId){
+          accessPlan(data);
+        }else{
+          planDialog(data);
         }
       });
   }

src/app/routes/assets/assets-used/checkPlan/check-plan.component.html

@@ -20,10 +20,14 @@
     </ListItem>
 
     <ListItem>
-      <!-- <a Button [routerLink]="['../checkPlanAdd',222]" [type]="'primary'" style="margin-right: 2.5px;" [size]="'small'"
+       <a Button [routerLink]="['../checkPlanAdd','fb80bc516677459ab2b43d709e335cb7','']" [type]="'primary'" style="margin-right: 2.5px;" [size]="'small'"
         [inline]="true">
         添加
-      </a> -->
+      </a> 
+      <a Button [routerLink]="['../checkPlanAdd','fb80bc516677459ab2b43d709e335cb7','8aa21def41aa4b1ba9101fe8e2f78f13']" [type]="'primary'" style="margin-right: 2.5px;" [size]="'small'"
+        [inline]="true">
+        测试手动盘点
+      </a> 
       <a Button [type]="'primary'" [size]="'small'" [inline]="true" (onClick)="doSearch(search)">
         提交
       </a>