Skip to content

L
luqiao-app
Commit 9a546064 by niuxiaolin
Options

mrege

parents a5b655ff b6e79db9
Showing with 69 additions and 56 deletions
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://localhost:8081",
"target": "http://192.168.19.171:8082",
"secure": false,
"logLevel": "debug",
"changeOrigin": true
......
src/app/layout/default/assets/assets.component.ts
......@@ -173,12 +173,12 @@ export class AssetsComponent implements OnInit {
icon: "<i class='iconfont icon-discardedDisposal'></i>",
text: "资产处置",
link: "/admin/assets-used/discardedDisposal"
},
{
icon: "<i class='iconfont icon-assetsUseRecord'></i>",
text: "资产使用记录",
link: "/admin/assets-used/assetsUseRecord"
}
// {
// icon: "<i class='iconfont icon-assetsUseRecord'></i>",
// text: "资产使用记录",
// link: "/admin/assets-used/assetsUseRecord"
// }
]
},
{
......
src/app/layout/default/check/check.component.html
......@@ -9,6 +9,6 @@
<div (click)="onExpend(item)">{{item.expend?'更多':'收起'}}</div>
</Flex>
</div>
<Grid class="primary" [activeStyle]="true" [hasLine]="false" [data]="item.children" (onClick)="click($event)"></Grid>
<Grid [activeStyle]="true" [hasLine]="false" [data]="item.children" (onClick)="click($event)"></Grid>
</ng-container>
</div>
\ No newline at end of file
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>
</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/layout/passport/passport.component.html
......@@ -3,7 +3,7 @@
<div class="top">
<div class="head">
<p>
<img src="./assets/logo.jpg" alt="">
<img src="./assets/logo.png" alt="">
</p>
<span class="title">路桥资产管理系统</span>
</div>
......
src/app/layout/passport/passport.component.less
......@@ -2,7 +2,5 @@
text-align: center;
font-size: 20px;
padding: 50px 0;
img{
width:263px;
}
}
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-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,9 +20,15 @@
<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"
</InputItem>
<InputItem [placeholder]="'请输入事项名称'" [error]="isError" [focus]="onFocus" [value]="name" [clear]="true"
formControlName="name">
<font color="red">*</font>
事项名称
......@@ -41,7 +47,7 @@
</app-form-date>
<app-form-select [options]="checkStaType" formControlName="checkSta">
<font color="red">*</font>盘点状态
</app-form-select> -->
</app-form-select>
......@@ -85,10 +91,22 @@
</div>
</ListItem>
</List>
</form>
<div class="error" [innerHTML]="msg">
</div>
</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-plan.component.html
......@@ -20,10 +20,10 @@
</ListItem>
<ListItem>
<a Button [routerLink]="['../checkPlanAdd','fb80bc516677459ab2b43d709e335cb7']" [type]="'primary'" style="margin-right: 2.5px;" [size]="'small'"
<!-- <a Button [routerLink]="['../checkPlanAdd',222]" [type]="'primary'" style="margin-right: 2.5px;" [size]="'small'"
[inline]="true">
添加
</a>
</a> -->
<a Button [type]="'primary'" [size]="'small'" [inline]="true" (onClick)="doSearch(search)">
提交
</a>
......@@ -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
......@@ -62,6 +62,8 @@ const CheckTask = "asset/a/asset/checkPlan/view/checkPlanList/";
const CheckDetail = "asset/a/asset/checkPlan/view/checkInfo/";
const CheckSave = "asset/a/asset/checkPlan/save/result";
const Upload = "asset/a/sys/file/webupload/upload";
const assetsUrl = "asset/a/asset/checkPlan/infoData";
@Injectable({
providedIn: "root"
})
......@@ -265,4 +267,7 @@ export class APIService {
getConsumableReceiveList(param): Observable<any> {
return this.basePost(ConsumableReceive, param);
}
getAssets(param, id) {
return this.basePost(assetsUrl + "/?id=" + id, param);
}
}
src/global.scss
......@@ -36,18 +36,13 @@
font-size: 20px;
display: block;
height: 40px;
background: #616d75;
background: #108ee9;
display: flex;
align-items: center;
justify-content: center;
border-radius: 100%;
color: #fff;
}
.primary{
.am-grid .am-grid-item-content .iconfont::before{
background: #108ee9;
}
}
.am-list-content {
>div {
......
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