fix bug
This commit is contained in:
		| @ -22,8 +22,8 @@ | |||||||
|         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> |         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||||
|       </div> |       </div> | ||||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right"> |       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right"> | ||||||
|         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> |         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" >查询</button> | ||||||
|         <button nz-button [disabled]="false" nzType="primary">导出</button> |         <button nz-button [disabled]="false" nzType="primary" acl [acl-ability]="['SYSTEM-CLOSE-ACCOUNT-export']">导出</button> | ||||||
|         <button nz-button [disabled]="false" (click)="resetSF()">重置</button> |         <button nz-button [disabled]="false" (click)="resetSF()">重置</button> | ||||||
|         <button nz-button nzType="link" (click)="expandToggle()"> |         <button nz-button nzType="link" (click)="expandToggle()"> | ||||||
|           {{ !_$expand ? '展开' : '收起' }} |           {{ !_$expand ? '展开' : '收起' }} | ||||||
| @ -38,7 +38,7 @@ | |||||||
|  |  | ||||||
|   <div class="d-flex justify-content-end mb-sm mt-sm"> |   <div class="d-flex justify-content-end mb-sm mt-sm"> | ||||||
|     <div> |     <div> | ||||||
|       <button nz-button nzType="primary" (click)="roleAction('',1)">新增结算客户</button> |       <button nz-button nzType="primary" (click)="roleAction('',1)" acl [acl-ability]="['SYSTEM-CLOSE-ACCOUNT-add']">新增结算客户</button> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }" [page]="{}" |   <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }" [page]="{}" | ||||||
|  | |||||||
| @ -40,11 +40,13 @@ export class CloseAccountComponent implements OnInit { | |||||||
|       buttons: [ |       buttons: [ | ||||||
|         { |         { | ||||||
|           text: '编辑', |           text: '编辑', | ||||||
|           click: item => this.roleAction(item, 2) |           click: item => this.roleAction(item, 2), | ||||||
|  |           acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-edit'] }, | ||||||
|         }, |         }, | ||||||
|         { |         { | ||||||
|           text: '删除', |           text: '删除', | ||||||
|           click: item => this.deleteAction(item) |           click: item => this.deleteAction(item), | ||||||
|  |           acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-delete'] }, | ||||||
|         }, |         }, | ||||||
|       ] |       ] | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| /* | /* | ||||||
|  * @Author: your name |  * @Author: your name | ||||||
|  * @Date: 2021-12-03 15:23:05 |  * @Date: 2021-12-03 15:23:05 | ||||||
|  * @LastEditTime : 2022-02-23 17:17:53 |  * @LastEditTime : 2022-04-28 21:40:03 | ||||||
|  * @LastEditors  : Shiming |  * @LastEditors  : Shiming | ||||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts | ||||||
| @ -34,7 +34,7 @@ const routes: Routes = [ | |||||||
|   { path: 'role-management/freight/:type', component: RoleManagementComponent }, |   { path: 'role-management/freight/:type', component: RoleManagementComponent }, | ||||||
|   { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } }, |   { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } }, | ||||||
|   { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } }, |   { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } }, | ||||||
|   { path: 'note-management', component: NoTeManagementComponent }, |   { path: 'note-management', component: NoTeManagementComponent, data: { guard: { ability: ['NOTE-MANAGEMENT-search'] } }  }, | ||||||
|   { path: 'basic-config', component: BasicConfigComponent }, |   { path: 'basic-config', component: BasicConfigComponent }, | ||||||
|   { path: 'audit-reason-config', component: AuditReasonConfigComponent }, |   { path: 'audit-reason-config', component: AuditReasonConfigComponent }, | ||||||
|   { |   { | ||||||
| @ -52,7 +52,7 @@ const routes: Routes = [ | |||||||
|   { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } }, |   { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } }, | ||||||
|   { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } }, |   { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } }, | ||||||
|   { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, |   { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, | ||||||
|   { path: 'close-account', component: CloseAccountComponent }, |   { path: 'close-account', component: CloseAccountComponent, data: { guard: { ability: ['SYSTEM-CLOSE-ACCOUNT-list'] } } }, | ||||||
|   // { path: 'btn-management', component: BtnManagementComponent }, |   // { path: 'btn-management', component: BtnManagementComponent }, | ||||||
|   { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, |   { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, | ||||||
|   { path: 'insurance-set', component: InsuranceSetComponent }, |   { path: 'insurance-set', component: InsuranceSetComponent }, | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ | |||||||
|       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> |       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||||
|     </div> |     </div> | ||||||
|     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> |     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> | ||||||
|       <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" >查询</button> |       <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button> | ||||||
|       <button nz-button (click)="resetSF()">重置</button> |       <button nz-button (click)="resetSF()">重置</button> | ||||||
|       <button nz-button (click)="export()" acl [acl-ability]="['TAX_INVOICE_REPORT-export']">导出</button> |       <button nz-button (click)="export()" acl [acl-ability]="['TAX_INVOICE_REPORT-export']">导出</button> | ||||||
|       <button nz-button nzType="link" (click)="expandToggle()"> |       <button nz-button nzType="link" (click)="expandToggle()"> | ||||||
| @ -18,32 +18,37 @@ | |||||||
|   </div> |   </div> | ||||||
| </nz-card> | </nz-card> | ||||||
| <nz-card> | <nz-card> | ||||||
|   <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0"> |   <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0"> | ||||||
|     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> |     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab> | ||||||
|     </nz-tab> |  | ||||||
|   </nz-tabset> |   </nz-tabset> | ||||||
|   <!-- 数据列表 --> |   <!-- 数据列表 --> | ||||||
|   <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_page" [columns]="columns" |   <st | ||||||
|  |     #st | ||||||
|  |     [scroll]="{ x: '1200px' }" | ||||||
|  |     [data]="service.$api_getInvoiceReport_page" | ||||||
|  |     [columns]="columns" | ||||||
|     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" |     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||||
|     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" |     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||||
|     [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> |     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" | ||||||
|  |     [loading]="service.http.loading" | ||||||
|  |   > | ||||||
|     <ng-template st-row="uploadSts" let-item let-index="index"> |     <ng-template st-row="uploadSts" let-item let-index="index"> | ||||||
|       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> --> |       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> --> | ||||||
|       <span *ngIf="item?.uploadSts == '1'">待上传</span> |       <span *ngIf="item?.uploadSts == '1'">待上传</span> | ||||||
|       <span *ngIf="item?.uploadSts == '3'">已上传</span> |       <span *ngIf="item?.uploadSts == '3'">已上传</span> | ||||||
|       <span *ngIf="item?.uploadSts == '2'">上传中</span> |       <span *ngIf="item?.uploadSts == '2'">上传中</span> | ||||||
|       <span *ngIf="item?.uploadSts == '4'" style="color: red;">上传异常</span> |       <span *ngIf="item?.uploadSts == '4'" style="color: red">上传异常</span> | ||||||
|       <!-- <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span> --> |       <!-- <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span> --> | ||||||
|     </ng-template> |     </ng-template> | ||||||
|     <ng-template st-row="invoiceType" let-item let-index="index"> |     <ng-template st-row="invoiceType" let-item let-index="index"> | ||||||
|       <span>增值税专用发票</span> |       <span>增值税专用发票</span> | ||||||
|     </ng-template> |     </ng-template> | ||||||
|     <ng-template st-row="sts" let-item let-index="index"> |     <ng-template st-row="sts" let-item let-index="index"> | ||||||
|       <span *ngIf="item.sts==='1'">有效</span> |       <span *ngIf="item.sts === '1'">有效</span> | ||||||
|       <span *ngIf="item.sts==='2'">作废</span> |       <span *ngIf="item.sts === '2'">作废</span> | ||||||
|     </ng-template> |     </ng-template> | ||||||
|     <ng-template st-row="orderAmount" let-item let-index="index"> |     <ng-template st-row="orderAmount" let-item let-index="index"> | ||||||
|       <div class="text-right">{{item?.orderAmount | currency }}</div> |       <div class="text-right">{{ item?.orderAmount | currency }}</div> | ||||||
|     </ng-template> |     </ng-template> | ||||||
|   </st> |   </st> | ||||||
| </nz-card> | </nz-card> | ||||||
| @ -53,7 +58,17 @@ | |||||||
|       已选择 |       已选择 | ||||||
|       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据 |       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据 | ||||||
|     </div> |     </div> | ||||||
|     <button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()"   acl [acl-ability]="['TAX_INVOICE_REPORT-upload']">上传</button> |     <button | ||||||
|     <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']">撤回</button> |       *ngIf="selectedIndex === '1' || selectedIndex === '4'" | ||||||
|  |       nz-button | ||||||
|  |       nzType="primary" | ||||||
|  |       (click)="upload()" | ||||||
|  |       acl | ||||||
|  |       [acl-ability]="['TAX_INVOICE_REPORT-upload']" | ||||||
|  |       >上传</button | ||||||
|  |     > | ||||||
|  |     <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']" | ||||||
|  |       >撤回</button | ||||||
|  |     > | ||||||
|   </div> |   </div> | ||||||
| </ng-template> | </ng-template> | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user