Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-01-12 10:48:59 +08:00
parent 75808bbaf5 bb5006f723
commit 35b68ef287
9 changed files with 279 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-05 15:37:53
* @LastEditTime: 2022-01-12 10:19:05
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@ -86,15 +86,14 @@
(<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
</div>
</ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>
<div>货源：{{item?.goodsInfos?.goodsResource}}</div>
</ng-template>
<ng-template st-row="useCarDemand" let-item let-index="index">
<div>车型: {{item.carModelLabel}}</div>
<div class="error">车长: {{item.expand}} 米</div>
</ng-template>
<ng-template st-row="goodsInfo" let-item let-index="index">
<div>{{item.owner}}</div>
<div>货源：{{item.progress}} 顿 / {{item.progress}} 方</div>
<div class="error">剩余: {{item.progress}} 顿 / {{item.progress}} 方</div>
</ng-template>
<ng-template st-row="demand" let-item let-index="index">
<div>车型: {{item.progress}}</div>
<div class="error">车长: {{item.progress}} 米</div>

3
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -547,9 +547,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
.subscribe(res => {
this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
console.log('12345645454545454=============');
console.log(this.enterpriseProjectIds);
console.log(res);
if (this.enterpriseProjectIds) {
this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
}