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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-03-09 11:12:33 +08:00
parent d97800841d
commit 26ae59d300
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/ticket-management/components/express-info/express-info.component.html
View File

@ -19,11 +19,6 @@
<div class="mt-md mb-sm"> <div class="mt-md mb-sm">
<button nz-button nzType="primary" (click)="printOrder()">打印面单</button> <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
</div> </div>
<<<<<<< HEAD
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}"
(change)="stChange($event)" [scroll]="{ x: '1200px' }" ></st>
=======
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{x:'1200px'}" <st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{x:'1200px'}"
(change)="stChange($event)"></st> (change)="stChange($event)"></st>
>>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9
</nz-card> </nz-card>

2
src/app/routes/ticket-management/components/express-info/express-info.component.ts
View File

@ -40,7 +40,7 @@ export class ExpressInfoComponent implements OnInit {
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox', width: 50 }, { title: '', index: 'key', type: 'checkbox', width: 50 },
{ title: '快递单号', index: 'expressCode', width: 150 }, { title: '快递单号', index: 'expressCode', width: 170 },
{ title: '快递公司', index: 'expresscompany', width: 120 }, { title: '快递公司', index: 'expresscompany', width: 120 },
{ title: '快递费用', index: 'description', width: 120 }, { title: '快递费用', index: 'description', width: 120 },
{ {