重构资产列表

config.xml

@@ -3,7 +3,7 @@
     <name>MyApp</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content original-src="index.html" src="http://192.168.19.225:8100" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />

proxy.config.json

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

src/app/layout/default/user/user.component.html

@@ -30,7 +30,7 @@
   </List>
   <WhiteSpace size='md'></WhiteSpace>
   <WingBlank [size]="'lg'">
-    <div Button [type]="'primary'">退出</div>
+    <div Button [type]="'primary'" (click)="logout()">退出</div>
 
   </WingBlank>
 </div>
\ No newline at end of file

src/app/layout/default/user/user.component.ts

@@ -15,4 +15,7 @@ export class UserComponent implements OnInit {
   jumpPassword() {
     this.router.navigateByUrl("/admin/user/password");
   }
+  logout() {
+    this.router.navigateByUrl("/passport/login");
+  }
 }

src/app/routes/assets/assets-used/checkPlan/assets-list/assets-list.component.html

@@ -146,30 +146,18 @@
 
 <ListItem *ngFor="let row of table.rows" multipleLine>
   <div [ngClass]="{'list-content':!row.showAll}">
-    <p>附件名称:{{row.accessoryName}}</p>
-    <p>帐面数量:{{row.count}}</p>
-    <p>净值:{{row.assetNetValue}}</p>
-    <p>计量单位:{{row.unit}}</p>
-    <p>管理单位:{{row.company? row.company.id:""}}</p>
-    <p>规格型号:{{row.modelNum}}</p>
-    <p>生产厂家:{{row.madeFirms}}</p>
-    <p>资产状态:{{row.assetState}}</p>
-    <p>产权单位:{{row.belongUnit? row.belongUnit.id:""}}</p>
-    <p>生产能力单位:{{row.productivityUnit}}</p>
-    <p>使用单位:{{row.useUnit? row.useUnit.id:""}}</p>
     <p>资产名称:{{row.name}}</p>
-    <p>生产能力:{{row.productivity}}</p>
-    <p>保管人:{{row.preserver? row.preserver.id:""}}</p>
-    <p>折旧年限:{{row.depreciableLife}}</p>
-    <p>存放地:{{row.storage}}</p>
-    <p>资产编号:{{row.num}}</p>
-    <p>车架号:{{row.vin}}</p>
-    <p>不含税_单价:{{row.noTaxPrice}}</p>
-    <p>设备技术状况:{{row.technologySta}}</p>
-    <p>购入日期:{{row.buyDate}}</p>
-    <p>实盘数量:{{row.actualCount}}</p>
+    <p>资产编号:{{row.asset.num}}</p>
+    <p>规格型号:{{row.modelNum}}</p>
+    <p>资产分类:{{row.assetClass}}</p>
+    <p>原值:{{row.noTaxPrice}}</p>
+    <p>净值:{{row.assetNetValue}}</p>
+    <p>产权单位:{{row.belongUnit}}</p>
+    <p>管理单位:{{row.company}}</p>
+    <p>使用单位:{{row.useUnit}}</p>
   </div>
-  <div Button [type]="'primary'" (click)="goDetail(row.id)" [inline]="true" class="list-detail" [size]="'small'">下一步
+  <div Button [type]="'primary'" (click)="goDetail(row.asset.id)" [inline]="true" class="list-detail" [size]="'small'">
+    下一步
   </div>
   <div (click)="row.showAll=!row.showAll" class="list-more am-list-arrow"
     [ngClass]="row.showAll?'am-list-arrow-vertical-up':'am-list-arrow-vertical'"></div>

src/app/routes/assets/assets-used/checkPlan/assets-list/assets-list.component.ts

@@ -45,8 +45,10 @@ export class AssetsListComponent implements OnInit {
     private router: Router,
     private activatedRoute: ActivatedRoute,
     private api: APIService
-  ) {}
-
+  ) {
+    this.id = activatedRoute.snapshot.queryParams["id"];
+  }
+  id;
   renderFooter: Function;
   renderHeader: Function;
   search: any = {};
@@ -122,7 +124,7 @@ export class AssetsListComponent implements OnInit {
     this.state.show = false;
   }
   loadData(search) {
-    this.api.getFixedAssetsList(search).subscribe(data => {
+    this.api.getAssets(search, this.id).subscribe(data => {
       this.table = data;
     });
   }

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

@@ -47,7 +47,7 @@
     <p>开始时间:{{row.beginDate}}</p>
     <p>事项名称:{{row.name}}</p>
   </div>
-  <div Button [type]="'primary'" (click)="goAssetsList()" [inline]="true" class="list-detail" [size]="'small'">下一步
+  <div Button [type]="'primary'" (click)="goAssetsList(row.id)" [inline]="true" class="list-detail" [size]="'small'">下一步
   </div>
   <div (click)="row.showAll=!row.showAll" class="list-more am-list-arrow"
     [ngClass]="row.showAll?'am-list-arrow-vertical-up':'am-list-arrow-vertical'"></div>

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

@@ -99,9 +99,10 @@ export class CheckPlanComponent implements OnInit {
   onReset() {
     this.search = {};
   }
-  goAssetsList() {
+  goAssetsList(id) {
     this.router.navigate(["../assetsList"], {
-      relativeTo: this.activatedRoute
+      relativeTo: this.activatedRoute,
+      queryParams: { id: id }
     });
   }
   showDate(key: string) {

src/app/service/layout/service/api.service.ts

@@ -61,6 +61,7 @@ const QrCode = "asset/a/asset/qrCode/data";
 const CheckTask = "asset/a/asset/assets/view/qrCode/";
 const CheckSave = "asset/a/asset/checkPlan/save";
 const Upload = "asset/a/sys/file/webupload/upload?uploadPath=/asset/checkPlan";
+const assetsUrl = "asset/a/asset/checkPlan/infoData";
 @Injectable({
   providedIn: "root"
 })
@@ -264,4 +265,7 @@ export class APIService {
   getConsumableReceiveList(param): Observable<any> {
     return this.basePost(ConsumableReceive, param);
   }
+  getAssets(param, id) {
+    return this.basePost(assetsUrl + "/?id=" + id, param);
+  }
 }