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-04-28 17:45:19 +08:00
parent a65aa4e50a 286cac787e
commit 0ccd210146
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
View File

@ -1,4 +1,17 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
* @LastEditTime : 2022-04-28 17:40:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\assigned-car\\assigned-car.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-spin [nzSpinning]="service.http.loading">
<div>
<div nz-row>
<div nz-col nzSpan="18">
<sf #sf [schema]="schema" mode="search" [ui]="ui" [compact]="true" (formSubmit)="st.load(1)"
@ -41,9 +54,12 @@
</ng-template>
</st>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="verifyVechicleStatus(params)" [disabled]="!selectedRows"
[nzLoading]="service.http.loading">发布并指派给司机</button>
</div>
</div>
</nz-spin >
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="verifyVechicleStatus(params)" [disabled]="!selectedRows"
[nzLoading]="service.http.loading">发布并指派给司机</button>
</div>

8
src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
View File

@ -4,12 +4,13 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-02 14:27:20
* @LastEditTime : 2022-04-28 17:36:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- <button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>添加司机</button> -->
<!-- 搜索区 -->
<nz-spin [nzSpinning]="service.http.loading">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="18">
<sf #sf [ui]="ui" [schema]="schema" [button]="'none'"></sf>
@ -19,6 +20,7 @@
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="12">
<!-- 数据列表 -->
@ -55,7 +57,9 @@
</st>
</div>
</div>
</nz-spin>
<div *nzModalFooter>
<button nz-button nzType="default" (click)="cancel()">取消</button>
<button nz-button nzType="primary" (click)="ok()">发布并指派给司机</button>
</div>
</div>