Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
		| @ -9,41 +9,18 @@ | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| <!-- 搜索表单 --> | ||||
| <page-header-wrapper [title]="''"> </page-header-wrapper> | ||||
| <!-- <page-header-wrapper [title]="''"> </page-header-wrapper> | ||||
| <nz-card> | ||||
|   <div nz-row nzGutter="8"> | ||||
|     <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> | ||||
|     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> | ||||
|       <sf | ||||
|         #sf | ||||
|         [schema]="schema" | ||||
|         [ui]="ui" | ||||
|         [mode]="'search'" | ||||
|         [disabled]="!sf?.valid" | ||||
|         [loading]="false" | ||||
|         (formSubmit)="st?.load(1)" | ||||
|         (formReset)="resetSF()" | ||||
|       ></sf> | ||||
|     </div> | ||||
|  | ||||
|     <!-- 查询字段大于3个时,根据展开状态调整布局 --> | ||||
|     <ng-container *ngIf="queryFieldCount > 4"> | ||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 18"> | ||||
|         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||
|       </div> | ||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> | ||||
|         <button | ||||
|           nz-button | ||||
|           nzType="primary" | ||||
|           [nzLoading]="service.http.loading" | ||||
|           (click)="search()" | ||||
|           acl | ||||
|           [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']" | ||||
|           >查询</button | ||||
|         > | ||||
|         <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()" | ||||
|           >导出</button | ||||
|         > | ||||
|         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl | ||||
|           [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button> | ||||
|         <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" | ||||
|           (click)="exprot()">导出</button> | ||||
|         <button nz-button [disabled]="false" (click)="resetSF()">重置</button> | ||||
|         <button nz-button nzType="link" (click)="expandToggle()"> | ||||
|           {{ !_$expand ? '展开' : '收起' }} | ||||
| @ -52,23 +29,25 @@ | ||||
|       </div> | ||||
|     </ng-container> | ||||
|   </div> | ||||
| </nz-card> | ||||
| </nz-card> --> | ||||
|  | ||||
| <nz-card> | ||||
|   <div style="margin-top: 15px"> | ||||
|     <st | ||||
|       #st | ||||
|       [bordered]="true" | ||||
|       [scroll]="{ x: '2000px' }" | ||||
|       [data]="service.$api_get_abnormalWarning" | ||||
| <nz-card class="table-box"> | ||||
|   <div class="header_box"> | ||||
|     <label class="page_title"> <label class="driver">|</label> 异常预警</label> | ||||
|     <div class="mr-sm"> | ||||
|       <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl | ||||
|         [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button> | ||||
|       <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button> | ||||
|     </div> | ||||
|   </div> | ||||
|   <div> | ||||
|     <st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning" | ||||
|       [columns]="columns" | ||||
|       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||
|       [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||
|       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" | ||||
|       [loading]="false" | ||||
|     > | ||||
|      | ||||
|     | ||||
|       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> | ||||
|  | ||||
|  | ||||
|       <ng-template st-row="driverName" let-item let-index="index"> | ||||
|         <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div> | ||||
|       </ng-template> | ||||
| @ -84,11 +63,14 @@ | ||||
|           <span>{{ item?.billStatusLabel }}</span> | ||||
|         </div> | ||||
|         <div> | ||||
|           <span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span> | ||||
|           <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? | ||||
|             '':item?.serviceTypeLabel}}</span> | ||||
|         </div> | ||||
|       </ng-template> | ||||
|     </st> | ||||
|   </div> | ||||
| </nz-card> | ||||
|  | ||||
| <ng-template #extraTemplate> | ||||
|  | ||||
| </ng-template> | ||||
| @ -1,29 +1,24 @@ | ||||
| import { Component, OnInit, ViewChild } from '@angular/core'; | ||||
| import { STColumn, STComponent } from '@delon/abc/st'; | ||||
| import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; | ||||
| import { ModalHelper, _HttpClient } from '@delon/theme'; | ||||
| import { NzModalService } from 'ng-zorro-antd/modal'; | ||||
| import { map } from 'rxjs/operators'; | ||||
| import { OrderManagementService } from '../../services/order-management.service'; | ||||
| import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; | ||||
| import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; | ||||
| import { of } from 'rxjs'; | ||||
| import { ShipperBaseService } from '@shared'; | ||||
| import { SearchDrawerService, ShipperBaseService } from '@shared'; | ||||
| import { Router } from '@angular/router'; | ||||
| import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; | ||||
| import { BasicTableComponent } from 'src/app/routes/commom'; | ||||
|  | ||||
| @Component({ | ||||
|   selector: 'app-order-management-abnormal-warning', | ||||
|   templateUrl: './abnormal-warning.component.html', | ||||
|   styleUrls: ['./abnormal-warning.component.less'] | ||||
|   styleUrls: ['../../../commom/less/commom-table.less', './abnormal-warning.component.less'] | ||||
| }) | ||||
| export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|   ui: SFUISchema = {}; | ||||
| export class OrderManagementAbnormalWarningComponent extends BasicTableComponent implements OnInit { | ||||
|   uiView: SFUISchema = {}; | ||||
|   schema: SFSchema = {}; | ||||
|   schemaView: SFSchema = {}; | ||||
|   changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录 | ||||
|   changeViewId: any;  // 查看运费变更记录id - 用于查看 | ||||
|   changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 | ||||
|   changeViewId: any; // 查看运费变更记录id - 用于查看 | ||||
|   auditId: any; | ||||
|   auditIdR: any; | ||||
|   auditMany = false; | ||||
| @ -31,22 +26,23 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|   isVisibleEvaluate = false; | ||||
|   isVisible = false; | ||||
|   isVisibleRE = false; | ||||
|   _$expand = false; | ||||
|   @ViewChild('st') private readonly st!: STComponent; | ||||
|   @ViewChild('sf', { static: false }) sf!: SFComponent; | ||||
|   @ViewChild('sfView', { static: false }) sfView!: SFComponent; | ||||
|   @ViewChild('stFloat') private readonly stFloat!: STComponent; | ||||
|   @ViewChild('stFloatView') private readonly stFloatView!: STComponent; | ||||
|   columns: STColumn[] = []; | ||||
|   columnsFloat: STColumn[] = []; | ||||
|   columnsFloatView: STColumn[] = []; | ||||
|   ViewCause: any;  // 变更运费查看数据 | ||||
|   ViewCause: any; // 变更运费查看数据 | ||||
|   constructor( | ||||
|     public service: OrderManagementService, | ||||
|     private modal: NzModalService, | ||||
|     public shipperservice: ShipperBaseService, | ||||
|     private router: Router | ||||
|   ) { } | ||||
|     private router: Router, | ||||
|     public searchDrawerService: SearchDrawerService | ||||
|   ) { | ||||
|     super(searchDrawerService); | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * 查询参数 | ||||
| @ -96,14 +92,12 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|         billCode: { | ||||
|           type: 'string', | ||||
|           title: '订单号', | ||||
|           ui: { | ||||
|           } | ||||
|           ui: {} | ||||
|         }, | ||||
|         wayBillCode: { | ||||
|           type: 'string', | ||||
|           title: '运单号', | ||||
|           ui: { | ||||
|           } | ||||
|           ui: {} | ||||
|         }, | ||||
|         serviceType: { | ||||
|           title: '服务类型', | ||||
| @ -112,7 +106,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'service:type' }, | ||||
|             containsAllLabel: true, | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         resourceType: { | ||||
| @ -120,12 +114,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|           type: 'string', | ||||
|           default: '', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             }, | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'goodresource:type' }, | ||||
|             containsAllLabel: true, | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         shipperId: { | ||||
| @ -137,11 +128,8 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|             searchDebounceTime: 300, | ||||
|             searchLoadingText: '搜索中...', | ||||
|             allowClear: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             }, | ||||
|             onSearch: (q: any) => { | ||||
|               let str =q.replace(/^\s+|\s+$/g,""); | ||||
|               let str = q.replace(/^\s+|\s+$/g, ''); | ||||
|               if (str) { | ||||
|                 return this.service | ||||
|                   .request(this.service.$api_enterpriceList, { enterpriseName: str }) | ||||
| @ -150,44 +138,24 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|               } else { | ||||
|                 return of([]); | ||||
|               } | ||||
|             }, | ||||
|             } | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         loadingPlace: { | ||||
|           type: 'string', | ||||
|           title: '装货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         dischargePlace: { | ||||
|           type: 'string', | ||||
|           title: '卸货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         driverName: { | ||||
|           title: '承运司机', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         carNo: { | ||||
|           title: '车牌号', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         warningTime: { | ||||
|           title: '预警时间', | ||||
| @ -197,15 +165,11 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|             mode: 'range', | ||||
|             format: 'yyyy-MM-dd', | ||||
|             allowClear: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } as SFDateWidgetSchema | ||||
|         }, | ||||
|         } | ||||
|       }, | ||||
|       type: 'object' | ||||
|     }; | ||||
|     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
| @ -227,13 +191,19 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|         className: 'text-left', | ||||
|         index: 'wayCode' | ||||
|       }, | ||||
|       { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => { | ||||
|         return item?.resourceTypeLabel + item?.serviceTypeLabel | ||||
|       } }, | ||||
|       { | ||||
|         title: '服务类型', | ||||
|         index: 'serviceTypeLabel', | ||||
|         width: '220px', | ||||
|         className: 'text-left', | ||||
|         format: item => { | ||||
|           return item?.resourceTypeLabel + item?.serviceTypeLabel; | ||||
|         } | ||||
|       }, | ||||
|       { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' }, | ||||
|       { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, | ||||
|       { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, | ||||
|       { title: '司机',  render: 'driverName', width: '180px', className: 'text-left' }, | ||||
|       { title: '司机', render: 'driverName', width: '180px', className: 'text-left' }, | ||||
|       { title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' }, | ||||
|       { title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' }, | ||||
|       { | ||||
| @ -252,39 +222,15 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { | ||||
|         title: '提醒内容', | ||||
|         className: 'text-left', | ||||
|         width: '250px', | ||||
|         index: 'warningContent', | ||||
|       }, | ||||
|      | ||||
|         index: 'warningContent' | ||||
|       } | ||||
|     ]; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * 查询字段个数 | ||||
|    */ | ||||
|   get queryFieldCount(): number { | ||||
|     return Object.keys(this.schema?.properties || {}).length; | ||||
|   } | ||||
|   tabChange(item: any) {} | ||||
|  | ||||
|   | ||||
|   /** | ||||
|    * 伸缩查询条件 | ||||
|    */ | ||||
|   expandToggle(): void { | ||||
|     this._$expand = !this._$expand; | ||||
|     this.sf?.setValue('/_$expand', this._$expand); | ||||
|   // 导出 | ||||
|   exprot() { | ||||
|     this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport); | ||||
|   } | ||||
|   tabChange(item: any) { } | ||||
|   /** | ||||
|    * 重置表单 | ||||
|    */ | ||||
|   resetSF(): void { | ||||
|     this.sf.reset(); | ||||
|     this._$expand = false; | ||||
|   } | ||||
|  | ||||
|  | ||||
|     // 导出 | ||||
|     exprot() { | ||||
|       this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport); | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -10,59 +10,67 @@ | ||||
| --> | ||||
|  | ||||
| <!-- 搜索表单 --> | ||||
| <page-header-wrapper title="" [tab]="tpTab"> | ||||
| <!-- <page-header-wrapper title="" [tab]="tpTab"> | ||||
|   <ng-template #tpTab> | ||||
|     <nz-tabset [nzSelectedIndex]="selectedIndex"> | ||||
|     <nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate"> | ||||
|       <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)"> | ||||
|       </nz-tab> | ||||
|     </nz-tabset> | ||||
|   </ng-template> | ||||
| </page-header-wrapper> | ||||
| <nz-card> | ||||
| </page-header-wrapper> --> | ||||
| <!-- <nz-card> | ||||
|   <div nz-row nzGutter="12"> | ||||
|     <!-- 查询字段大于3个时,根据展开状态调整布局 --> | ||||
|       <div nz-col [nzSpan]="24"> | ||||
|         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||
|       </div> | ||||
|       <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;"> | ||||
|         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" | ||||
|           (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button> | ||||
|         <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()" | ||||
|          >导出</button> | ||||
|         <button nz-button (click)="resetSF()">重置</button> | ||||
|       </div> | ||||
|     <div nz-col [nzSpan]="24"> | ||||
|       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||
|     </div> | ||||
|     <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;"> | ||||
|       <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" | ||||
|         (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button> | ||||
|       <button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button> | ||||
|       <button nz-button (click)="resetSF()">重置</button> | ||||
|     </div> | ||||
|   </div> | ||||
| </nz-card> | ||||
| </nz-card> --> | ||||
|  | ||||
| <nz-card> | ||||
|   <nz-tabset (nzSelectedIndexChange)="selectChange($event)" > | ||||
|     <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name" (nzClick)="tabChange(i)"> | ||||
| <nz-card class="table-box"> | ||||
|   <div class="tab_header"> | ||||
|     <label class="page_title"> <label class="driver">|</label> 投诉管理</label> | ||||
|     <nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate"> | ||||
|       <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)"> | ||||
|       </nz-tab> | ||||
|     </nz-tabset> | ||||
|   </div> | ||||
|   <nz-tabset (nzSelectedIndexChange)="selectChange($event)"> | ||||
|     <nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)"> | ||||
|     </nz-tab> | ||||
|   </nz-tabset> | ||||
|   <div style="margin-top: 15px;"> | ||||
|     <st | ||||
|     #st | ||||
|     [bordered]="true" | ||||
|     [scroll]="{ x: '2000px' }" | ||||
|     [data]="service.$api_get_operate_listPage" | ||||
|     [columns]="columns" | ||||
|     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||
|     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||
|     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" | ||||
|     [loading]="false" | ||||
|     > | ||||
|     <ng-template st-row="complaintCode" let-item let-index="index"> | ||||
|       <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a> | ||||
|     </ng-template> | ||||
|     <ng-template st-row="complaintCauseLabel" let-item let-index="index"> | ||||
|      <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div> | ||||
|      <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div> | ||||
|     </ng-template> | ||||
|   <div> | ||||
|     <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY  }" [data]="service.$api_get_operate_listPage" | ||||
|       [columns]="columns" | ||||
|       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||
|       [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||
|       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> | ||||
|       <ng-template st-row="complaintCode" let-item let-index="index"> | ||||
|         <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="complaintCauseLabel" let-item let-index="index"> | ||||
|         <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div> | ||||
|         <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div> | ||||
|       </ng-template> | ||||
|     </st> | ||||
|   </div> | ||||
| </nz-card> | ||||
|  | ||||
| <nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="Cancel()"> | ||||
| <ng-template #extraTemplate> | ||||
|   <div class="mr-sm"> | ||||
|     <button nz-button nzDanger [nzLoading]="isLoading && st.loading" (click)="openDrawer()" acl | ||||
|       [acl-ability]="['ORDER-COMPLAINT-search']">筛选</button> | ||||
|     <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button> | ||||
|   </div> | ||||
| </ng-template> | ||||
|  | ||||
| <nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理" | ||||
|   (nzOnCancel)="Cancel()"> | ||||
|   <ng-container *nzModalContent> | ||||
|     <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> | ||||
|     </sf> | ||||
| @ -72,6 +80,4 @@ | ||||
|     <button nz-button nzType="primary" (click)="handleOK()">通过</button> | ||||
|     <button nz-button nzType="primary" (click)="handleCancel2()">强制取消</button> | ||||
|   </ng-template> | ||||
| </nz-modal> | ||||
|  | ||||
|  | ||||
| </nz-modal> | ||||
| @ -6,20 +6,19 @@ import { ModalHelper, _HttpClient } from '@delon/theme'; | ||||
| import { NzModalService } from 'ng-zorro-antd/modal'; | ||||
| import { map } from 'rxjs/operators'; | ||||
| import { OrderManagementService } from '../../services/order-management.service'; | ||||
| import { SearchDrawerService } from '@shared'; | ||||
| import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; | ||||
|  | ||||
| @Component({ | ||||
|   selector: 'app-supply-management-complaint', | ||||
|   templateUrl: './complaint.component.html', | ||||
|   styleUrls: ['./complaint.component.less'] | ||||
|   styleUrls: ['../../../commom/less/commom-table.less', './complaint.component.less'] | ||||
| }) | ||||
| export class OrderManagementComplaintComponent implements OnInit { | ||||
|   ui: SFUISchema = {}; | ||||
| export class OrderManagementComplaintComponent extends BasicTableComponent implements OnInit { | ||||
|   uiView: SFUISchema = {}; | ||||
|   schema: SFSchema = {}; | ||||
|   schemaView: SFSchema = {}; | ||||
|   auditMany = false; | ||||
|   isVisibleRE = false; | ||||
|   _$expand = false; | ||||
|   channelId: any; | ||||
|   resourceStatus: any; | ||||
|   selectedMainTabStatus = '2'; | ||||
| @ -51,7 +50,13 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|       type: 3 | ||||
|     } | ||||
|   ]; | ||||
|   constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) { | ||||
|   constructor( | ||||
|     public service: OrderManagementService, | ||||
|     private modal: NzModalService, | ||||
|     private router: Router, | ||||
|     public searchDrawerService: SearchDrawerService | ||||
|   ) { | ||||
|     super(searchDrawerService); | ||||
|     //    console.log(this.selectedIndex); | ||||
|     //   if (this.selectedIndex === 0) { | ||||
|     //   this.selectedMainTabStatus = '2'; | ||||
| @ -101,8 +106,7 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|         wayBillCode: { | ||||
|           type: 'string', | ||||
|           title: '运单号', | ||||
|           ui: { | ||||
|           } | ||||
|           ui: {} | ||||
|         }, | ||||
|         drvComplaintCause: { | ||||
|           title: '投诉原因', | ||||
| @ -110,7 +114,7 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'drvcomplaint:cause' }, | ||||
|             hidden:  this.selectedMainTabStatus == '1', | ||||
|             hidden: this.selectedMainTabStatus == '1', | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
| @ -120,7 +124,7 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'drvcomplaint:cause' }, | ||||
|             hidden:  this.selectedMainTabStatus == '2', | ||||
|             hidden: this.selectedMainTabStatus == '2', | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
| @ -132,16 +136,10 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|             widget: 'sl-from-to', | ||||
|             type: 'date', | ||||
|             format: 'yyyy-MM-dd', | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             }, | ||||
|           } as SFDateWidgetSchema | ||||
|         } | ||||
|       } | ||||
|     }; | ||||
|     this.ui = { | ||||
|       '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } } | ||||
|     }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
| @ -270,21 +268,7 @@ export class OrderManagementComplaintComponent implements OnInit { | ||||
|   get queryFieldCount(): number { | ||||
|     return Object.keys(this.schema?.properties || {}).length; | ||||
|   } | ||||
|   /** | ||||
|    * 伸缩查询条件 | ||||
|    */ | ||||
|   expandToggle(): void { | ||||
|     this._$expand = !this._$expand; | ||||
|     this.sf?.setValue('/_$expand', this._$expand); | ||||
|   } | ||||
|   tabChange(item: any) {} | ||||
|   /** | ||||
|    * 重置表单 | ||||
|    */ | ||||
|   resetSF(): void { | ||||
|     this.sf.reset(); | ||||
|     this.isLoading = true; | ||||
|   } | ||||
|   selectChange(e: number) { | ||||
|     this.resourceStatus = e; | ||||
|     this.initST(); | ||||
|  | ||||
| @ -9,41 +9,18 @@ | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| <!-- 搜索表单 --> | ||||
| <page-header-wrapper [title]="''"> </page-header-wrapper> | ||||
| <!-- <page-header-wrapper [title]="''"> </page-header-wrapper> | ||||
| <nz-card> | ||||
|   <div nz-row nzGutter="8"> | ||||
|     <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> | ||||
|     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> | ||||
|       <sf | ||||
|         #sf | ||||
|         [schema]="schema" | ||||
|         [ui]="ui" | ||||
|         [mode]="'search'" | ||||
|         [disabled]="!sf?.valid" | ||||
|         [loading]="false" | ||||
|         (formSubmit)="st?.load(1)" | ||||
|         (formReset)="resetSF()" | ||||
|       ></sf> | ||||
|     </div> | ||||
|  | ||||
|     <!-- 查询字段大于3个时,根据展开状态调整布局 --> | ||||
|     <ng-container *ngIf="queryFieldCount > 4"> | ||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 18"> | ||||
|         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||
|       </div> | ||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> | ||||
|         <button | ||||
|           nz-button | ||||
|           nzType="primary" | ||||
|           [nzLoading]="service.http.loading" | ||||
|           (click)="search()" | ||||
|           acl | ||||
|           [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']" | ||||
|           >查询</button | ||||
|         > | ||||
|         <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()" | ||||
|           >导出</button | ||||
|         > | ||||
|         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl | ||||
|           [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button> | ||||
|         <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" | ||||
|           (click)="exprot()">导出</button> | ||||
|         <button nz-button [disabled]="false" (click)="resetSF()">重置</button> | ||||
|         <button nz-button nzType="link" (click)="expandToggle()"> | ||||
|           {{ !_$expand ? '展开' : '收起' }} | ||||
| @ -52,27 +29,24 @@ | ||||
|       </div> | ||||
|     </ng-container> | ||||
|   </div> | ||||
| </nz-card> | ||||
| </nz-card> --> | ||||
|  | ||||
| <nz-card> | ||||
|   <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate"> | ||||
|     <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab> | ||||
|     <nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab> | ||||
|     <nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab> | ||||
|     <nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab> | ||||
|   </nz-tabset> | ||||
|   <div style="margin-top: 15px"> | ||||
|     <st | ||||
|       #st | ||||
|       [bordered]="true" | ||||
|       [scroll]="{ x: '2000px' }" | ||||
|       [data]="service.$api_get_listCompliancePage" | ||||
| <nz-card class="table-box"> | ||||
|   <div class="tab_header"> | ||||
|     <label class="page_title"> <label class="driver">|</label> 合规抽查</label> | ||||
|     <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate"> | ||||
|       <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab> | ||||
|       <nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab> | ||||
|       <nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab> | ||||
|       <nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab> | ||||
|     </nz-tabset> | ||||
|   </div> | ||||
|   <div> | ||||
|     <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_listCompliancePage" | ||||
|       [columns]="columns" | ||||
|       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||
|       [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||
|       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" | ||||
|       [loading]="false" | ||||
|     > | ||||
|       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> | ||||
|       <ng-template st-row="freightPrice" let-item let-index="index"> | ||||
|         {{ item.freightPrice | currency }} | ||||
|       </ng-template> | ||||
| @ -81,20 +55,25 @@ | ||||
|         <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="driverName" let-item let-index="index"> | ||||
|         <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }} </div> | ||||
|         <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + | ||||
|           item?.carNo : '' }} </div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="payeeName" let-item let-index="index"> | ||||
|         <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }} </div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="billCode" let-item let-index="index"> | ||||
|         <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a> | ||||
|         <a *ngIf="item.billType == '2'"  [routerLink]="'/order-management/bulk/bulk-detail/' + item.id" [queryParams]="{ sts :1}">{{ item.billCode }}</a> | ||||
|         <a *ngIf="item.billType == '3'"  [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a> | ||||
|         <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ | ||||
|           item.billCode }}</a> | ||||
|         <a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id" | ||||
|           [queryParams]="{ sts :1}">{{ item.billCode }}</a> | ||||
|         <a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ | ||||
|           item.billCode }}</a> | ||||
|         <div> | ||||
|           <span>{{ item?.billStatusLabel }}</span> | ||||
|         </div> | ||||
|         <div> | ||||
|           <span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span> | ||||
|           <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? | ||||
|             '':item?.serviceTypeLabel}}</span> | ||||
|         </div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="goodsName" let-item let-index="index"> | ||||
| @ -119,18 +98,16 @@ | ||||
|  | ||||
| <ng-template #extraTemplate> | ||||
|   <div> | ||||
|     <button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button> | ||||
|     <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl | ||||
|       [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button> | ||||
|     <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button> | ||||
|     <button nz-button nzType="primary" (click)="audit()" acl | ||||
|       [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button> | ||||
|   </div> | ||||
| </ng-template> | ||||
|  | ||||
| <nz-modal | ||||
|   [(nzVisible)]="isVisibleRE" | ||||
|   [nzWidth]="600" | ||||
|   [nzFooter]="nzModalFooterview2" | ||||
|   (nzOnOk)="handleOK()" | ||||
|   nzTitle="抽查" | ||||
|   (nzOnCancel)="handleCancel('1')" | ||||
| > | ||||
| <nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="抽查" | ||||
|   (nzOnCancel)="handleCancel('1')"> | ||||
|   <ng-container *nzModalContent> | ||||
|     <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf> | ||||
|   </ng-container> | ||||
| @ -140,18 +117,13 @@ | ||||
|   </ng-template> | ||||
| </nz-modal> | ||||
|  | ||||
| <nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnCancel)="handleCancel('0')"> | ||||
| <nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" | ||||
|   (nzOnCancel)="handleCancel('0')"> | ||||
|   <ng-container *nzModalContent> | ||||
|     <st | ||||
|       #stFloat | ||||
|       multiSort | ||||
|       size="small" | ||||
|       [bordered]="true" | ||||
|       [data]="service.$api_get_listChangeApply" | ||||
|     <st #stFloat multiSort size="small" [bordered]="true" [data]="service.$api_get_listChangeApply" | ||||
|       [columns]="columnsFloat" | ||||
|       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }" | ||||
|       [res]="{ reName: { list: 'data', total: 'data.total' } }" | ||||
|     > | ||||
|       [res]="{ reName: { list: 'data', total: 'data.total' } }"> | ||||
|       <ng-template st-row="order" let-item let-index="index"> | ||||
|         {{ index + 1 }} | ||||
|       </ng-template> | ||||
| @ -163,35 +135,27 @@ | ||||
|   </ng-template> | ||||
| </nz-modal> | ||||
|  | ||||
| <nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('2')"> | ||||
| <nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" | ||||
|   (nzOnCancel)="handleCancel('2')"> | ||||
|   <ng-container *nzModalContent> | ||||
|     <st | ||||
|       #stFloatView | ||||
|       size="small" | ||||
|       [bordered]="true" | ||||
|       [data]="service.$api_getChangeRecordWholeDetail" | ||||
|       [columns]="columnsFloatView" | ||||
|       [req]="{ method: 'POST', allInBody: true, params: changeViewParams }" | ||||
|       [res]="{ reName: { list: 'data.list', total: 'data.total' } }" | ||||
|     > | ||||
|     <st #stFloatView size="small" [bordered]="true" [data]="service.$api_getChangeRecordWholeDetail" | ||||
|       [columns]="columnsFloatView" [req]="{ method: 'POST', allInBody: true, params: changeViewParams }" | ||||
|       [res]="{ reName: { list: 'data.list', total: 'data.total' } }"> | ||||
|       <ng-template st-row="amountBeforeChange" let-item let-index="index"> | ||||
|         {{ item.amountBeforeChange | currency }} | ||||
|       </ng-template> | ||||
|       <ng-template st-row="amountchangeValue" let-item let-index="index"> ¥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template> | ||||
|       <ng-template st-row="amountchangeValue" let-item let-index="index"> ¥{{ item.amountchangeValue | number: '0.2-2' | ||||
|         }} </ng-template> | ||||
|       <ng-template st-row="amountAfterChange" let-item let-index="index"> | ||||
|         {{ item.amountAfterChange | currency }} | ||||
|       </ng-template> | ||||
|     </st> | ||||
|     <div | ||||
|       ><span>变更原因:{{ ViewCause?.changeCause }}</span></div | ||||
|     > | ||||
|     <div | ||||
|       ><span>拒绝原因:{{ ViewCause?.refuseCause }}</span></div | ||||
|     > | ||||
|     <div><span>变更原因:{{ ViewCause?.changeCause }}</span></div> | ||||
|     <div><span>拒绝原因:{{ ViewCause?.refuseCause }}</span></div> | ||||
|     <div><span>注:附加费依据调整后的运输费用重新计算</span></div> | ||||
|   </ng-container> | ||||
|   <ng-template #nzModalFooterview> | ||||
|     <button nz-button nzType="default" (click)="handleCancel('2')">取消</button> | ||||
|     <button nz-button nzType="primary" (click)="handleCancel('2')">确定</button> | ||||
|   </ng-template> | ||||
| </nz-modal> | ||||
| </nz-modal> | ||||
| @ -8,22 +8,21 @@ import { OrderManagementService } from '../../services/order-management.service' | ||||
| import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; | ||||
| import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; | ||||
| import { of } from 'rxjs'; | ||||
| import { ShipperBaseService } from '@shared'; | ||||
| import { SearchDrawerService, ShipperBaseService } from '@shared'; | ||||
| import { Router } from '@angular/router'; | ||||
| import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; | ||||
| import { BasicTableComponent } from 'src/app/routes/commom'; | ||||
|  | ||||
| @Component({ | ||||
|   selector: 'app-order-management-compliance-audit', | ||||
|   templateUrl: './compliance-audit.component.html', | ||||
|   styleUrls: ['./compliance-audit.component.less'] | ||||
|   styleUrls: ['../../../commom/less/commom-table.less', './compliance-audit.component.less'] | ||||
| }) | ||||
| export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|   ui: SFUISchema = {}; | ||||
| export class OrderManagementComplianceAuditComponent extends BasicTableComponent implements OnInit { | ||||
|   uiView: SFUISchema = {}; | ||||
|   schema: SFSchema = {}; | ||||
|   schemaView: SFSchema = {}; | ||||
|   changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录 | ||||
|   changeViewId: any;  // 查看运费变更记录id - 用于查看 | ||||
|   changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 | ||||
|   changeViewId: any; // 查看运费变更记录id - 用于查看 | ||||
|   auditId: any; | ||||
|   auditIdR: any; | ||||
|   auditMany = false; | ||||
| @ -31,16 +30,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|   isVisibleEvaluate = false; | ||||
|   isVisible = false; | ||||
|   isVisibleRE = false; | ||||
|   _$expand = false; | ||||
|   @ViewChild('st') private readonly st!: STComponent; | ||||
|   @ViewChild('sf', { static: false }) sf!: SFComponent; | ||||
|   @ViewChild('sfView', { static: false }) sfView!: SFComponent; | ||||
|   @ViewChild('stFloat') private readonly stFloat!: STComponent; | ||||
|   @ViewChild('stFloatView') private readonly stFloatView!: STComponent; | ||||
|   columns: STColumn[] = []; | ||||
|   columnsFloat: STColumn[] = []; | ||||
|   columnsFloatView: STColumn[] = []; | ||||
|   ViewCause: any;  // 变更运费查看数据 | ||||
|   ViewCause: any; // 变更运费查看数据 | ||||
|   resourceStatus: any; | ||||
|   tabs = { | ||||
|     totalCount: 0, | ||||
| @ -52,8 +49,11 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|     public service: OrderManagementService, | ||||
|     private modal: NzModalService, | ||||
|     public shipperservice: ShipperBaseService, | ||||
|     private router: Router | ||||
|   ) { } | ||||
|     private router: Router, | ||||
|     public searchDrawerService: SearchDrawerService | ||||
|   ) { | ||||
|     super(searchDrawerService); | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * 查询参数 | ||||
| @ -99,7 +99,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|       unstayQuantity: 0 | ||||
|     }; | ||||
|     const params: any = Object.assign({}, this.reqParams || {}); | ||||
|     delete params.complianceStatus | ||||
|     delete params.complianceStatus; | ||||
|     this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => { | ||||
|       if (res) { | ||||
|         let totalCount = 0; | ||||
| @ -142,8 +142,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|         billCode: { | ||||
|           type: 'string', | ||||
|           title: '订单号', | ||||
|           ui: { | ||||
|           } | ||||
|           ui: {} | ||||
|         }, | ||||
|         resourceCode: { | ||||
|           type: 'string', | ||||
| @ -159,7 +158,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|             searchLoadingText: '搜索中...', | ||||
|             allowClear: true, | ||||
|             onSearch: (q: any) => { | ||||
|               let str =q.replace(/^\s+|\s+$/g,""); | ||||
|               let str = q.replace(/^\s+|\s+$/g, ''); | ||||
|               if (str) { | ||||
|                 return this.service | ||||
|                   .request(this.service.$api_enterpriceList, { enterpriseName: str }) | ||||
| @ -179,56 +178,28 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|           title: '所属项目', | ||||
|           ui: { | ||||
|             widget: 'select', | ||||
|             placeholder: '请先选择货主', | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             }, | ||||
|             placeholder: '请先选择货主' | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         loadingPlace: { | ||||
|           type: 'string', | ||||
|           title: '装货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|           title: '装货地' | ||||
|         }, | ||||
|         dischargePlace: { | ||||
|           type: 'string', | ||||
|           title: '卸货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|           title: '卸货地' | ||||
|         }, | ||||
|         driverName: { | ||||
|           title: '承运司机', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|           type: 'string' | ||||
|         }, | ||||
|         carNo: { | ||||
|           title: '车牌号', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|           type: 'string' | ||||
|         }, | ||||
|         carCaptainName: { | ||||
|           title: '车队长', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|           type: 'string' | ||||
|         }, | ||||
|         paymentStatus: { | ||||
|           title: '支付状态', | ||||
| @ -236,10 +207,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'overall:payment:status' }, | ||||
|             containsAllLabel: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         enterpriseInfoId: { | ||||
| @ -249,9 +217,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|             widget: 'select', | ||||
|             placeholder: '请选择', | ||||
|             allowClear: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             }, | ||||
|             asyncData: () => this.shipperservice.getNetworkFreightForwarder() | ||||
|           } | ||||
|         }, | ||||
| @ -262,10 +227,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'service:type' }, | ||||
|             containsAllLabel: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|             containsAllLabel: true | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         createTime: { | ||||
| @ -275,16 +237,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|             widget: 'date', | ||||
|             mode: 'range', | ||||
|             format: 'yyyy-MM-dd', | ||||
|             allowClear: true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|             allowClear: true | ||||
|           } as SFDateWidgetSchema | ||||
|         }, | ||||
|         } | ||||
|       }, | ||||
|       type: 'object' | ||||
|     }; | ||||
|     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; | ||||
|   } | ||||
|   // 获取城市列表 | ||||
|   getRegionCode(regionCode: any) { | ||||
| @ -397,21 +355,21 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|         buttons: [ | ||||
|           { | ||||
|             text: '查看申诉记录', | ||||
|             click: _record => this.appeal(_record), | ||||
|             click: _record => this.appeal(_record) | ||||
|             // iif: item => item.billStatus == '5' | ||||
|           }, | ||||
|           { | ||||
|             text: '运费变更记录', | ||||
|             click: _record => this.OpenPrice(_record), | ||||
|             // iif: item => item.billStatus == '4', | ||||
|             acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }, | ||||
|             acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] } | ||||
|           }, | ||||
|           { | ||||
|             text: '合规抽查', | ||||
|             click: _record => this.audit(_record), | ||||
|             iif: item => item.complianceStatus == '0', | ||||
|             acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }, | ||||
|           }, | ||||
|             acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] } | ||||
|           } | ||||
|         ] | ||||
|       } | ||||
|     ]; | ||||
| @ -441,15 +399,15 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|         buttons: [ | ||||
|           { | ||||
|             text: '查看', | ||||
|             click: (_record) => this.FloatView(_record), | ||||
|             click: _record => this.FloatView(_record) | ||||
|           }, | ||||
|           { | ||||
|             text: '撤销', | ||||
|             click: (_record) => this.revoke(_record), | ||||
|             iif: item => item.handleStatus === '1' || item.handleStatus === 1, | ||||
|           }, | ||||
|         ], | ||||
|       }, | ||||
|             click: _record => this.revoke(_record), | ||||
|             iif: item => item.handleStatus === '1' || item.handleStatus === 1 | ||||
|           } | ||||
|         ] | ||||
|       } | ||||
|     ]; | ||||
|   } | ||||
|   initSTFloatView() { | ||||
| @ -508,49 +466,38 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|     this.router.navigate(['/order-management/risk-detail', item.id]); | ||||
|   } | ||||
|   /** | ||||
| * 浮动费用查看 | ||||
| */ | ||||
|    * 浮动费用查看 | ||||
|    */ | ||||
|   FloatView(item: any) { | ||||
|     console.log(item) | ||||
|     console.log(item); | ||||
|     this.changeViewId = item.id; | ||||
|     this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => { | ||||
|     this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe(res => { | ||||
|       this.ViewCause = res; | ||||
|     }) | ||||
|     this.isVisibleView = true | ||||
|     }); | ||||
|     this.isVisibleView = true; | ||||
|   } | ||||
|   revoke(item: any) { | ||||
|     this.modal.confirm({ | ||||
|       nzTitle: '是否确定立即撤销费用变更!</i>', | ||||
|       nzOnOk: () => | ||||
|         this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => { | ||||
|           console.log(res) | ||||
|         this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => { | ||||
|           console.log(res); | ||||
|           if (res) { | ||||
|             this.service.msgSrv.success('撤销成功!') | ||||
|             this.stFloat.reload() | ||||
|             this.service.msgSrv.success('撤销成功!'); | ||||
|             this.stFloat.reload(); | ||||
|           } | ||||
|         }) | ||||
|     }); | ||||
|   } | ||||
|   /** | ||||
|    * 伸缩查询条件 | ||||
|    */ | ||||
|   expandToggle(): void { | ||||
|     this._$expand = !this._$expand; | ||||
|     this.sf?.setValue('/_$expand', this._$expand); | ||||
|   } | ||||
|   tabChange(item: any) { } | ||||
|   tabChange(item: any) {} | ||||
|   /** | ||||
|    * 重置表单 | ||||
|    */ | ||||
|   resetSF(): void { | ||||
|     this.sf.reset(); | ||||
|     this._$expand = false; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * 导入货源 | ||||
|    */ | ||||
|   importGoodsSource() { } | ||||
|   importGoodsSource() {} | ||||
|   OpenPrice(item: any) { | ||||
|     this.changeId = item.id; | ||||
|     this.isVisible = true; | ||||
| @ -608,8 +555,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|     this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } }; | ||||
|   } | ||||
|   /* | ||||
|  * 审核关闭弹窗 | ||||
|  */ | ||||
|    * 审核关闭弹窗 | ||||
|    */ | ||||
|   handleCancel(value?: string) { | ||||
|     if (value === '0') { | ||||
|       this.isVisible = false; | ||||
| @ -620,8 +567,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|     } | ||||
|   } | ||||
|   /** | ||||
| * 审核通过按钮 | ||||
| */ | ||||
|    * 审核通过按钮 | ||||
|    */ | ||||
|   handleOK() { | ||||
|     let idList: any[] = []; | ||||
|     if (this.selectedRows.length > 0) { | ||||
| @ -629,25 +576,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|         idList.push(item.id); | ||||
|       }); | ||||
|     } else { | ||||
|       idList.push(this?.auditIdR) | ||||
|       idList.push(this?.auditIdR); | ||||
|     } | ||||
|     const parms = { | ||||
|       ids: idList, | ||||
|       complianceRemark: this.sfView.value.complianceRemark, | ||||
|       complianceStatus: 1, | ||||
|       complianceStatus: 1 | ||||
|     }; | ||||
|     this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { | ||||
|       if (res) { | ||||
|         this.service.msgSrv.success('提交成功!'); | ||||
|         this.isVisibleRE = false; | ||||
|         this.st?.load(1); | ||||
|         this.getGoodsSourceStatistical() | ||||
|         this.getGoodsSourceStatistical(); | ||||
|       } | ||||
|     }); | ||||
|   } | ||||
|   /** | ||||
|  * 审核拒绝按钮 | ||||
|  */ | ||||
|    * 审核拒绝按钮 | ||||
|    */ | ||||
|   reject() { | ||||
|     if (!this.sfView.value.complianceRemark) { | ||||
|       this.service.msgSrv.error('备注不能为空!'); | ||||
| @ -659,25 +606,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|         idList.push(item.id); | ||||
|       }); | ||||
|     } else { | ||||
|       idList.push(this.sfView.value.billCode) | ||||
|       idList.push(this.sfView.value.billCode); | ||||
|     } | ||||
|     const parms = { | ||||
|       ids: idList, | ||||
|       complianceRemark: this.sfView.value.complianceRemark, | ||||
|       complianceStatus: 2, | ||||
|       complianceStatus: 2 | ||||
|     }; | ||||
|     this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { | ||||
|       if (res) { | ||||
|         this.service.msgSrv.success('提交成功!'); | ||||
|         this.isVisibleRE = false; | ||||
|         this.st?.load(1); | ||||
|         this.getGoodsSourceStatistical() | ||||
|         this.getGoodsSourceStatistical(); | ||||
|       } | ||||
|     }); | ||||
|   } | ||||
|   /** | ||||
| *合规抽查 | ||||
| */ | ||||
|    *合规抽查 | ||||
|    */ | ||||
|   audit(item?: any) { | ||||
|     if (item) { | ||||
|       this.isVisibleRE = true; | ||||
| @ -686,7 +633,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|       this.initSTAudit(1); | ||||
|     } else { | ||||
|       if (this.selectedRows.length <= 0) { | ||||
|         this.service.msgSrv.error('请选择订单!') | ||||
|         this.service.msgSrv.error('请选择订单!'); | ||||
|         return; | ||||
|       } else { | ||||
|         this.isVisibleRE = true; | ||||
| @ -694,8 +641,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|     // 导出 | ||||
|     exprot() { | ||||
|       this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); | ||||
|     } | ||||
|   // 导出 | ||||
|   exprot() { | ||||
|     this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); | ||||
|   } | ||||
| } | ||||
|  | ||||
| @ -126,7 +126,7 @@ | ||||
|         <li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> | ||||
|           批量通过 | ||||
|         </li> | ||||
|         <li nz-menu-item a(click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> | ||||
|         <li nz-menu-item (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> | ||||
|           批量生成电子单据 | ||||
|         </li> | ||||
|       </ul> | ||||
|  | ||||
| @ -26,7 +26,6 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements | ||||
|   isVisibleRE = false; | ||||
|   resourceStatus: any; | ||||
|   @ViewChild('st') private readonly st!: STComponent; | ||||
|   @ViewChild('sf', { static: false }) sf!: SFComponent; | ||||
|   @ViewChild('sfView', { static: false }) sfView!: SFComponent; | ||||
|   columns: STColumn[] = []; | ||||
|   tabs = { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user