diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index a9d112ba..53cdfc00 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -10,32 +10,28 @@ import {
SFSelectWidgetSchema,
SFUISchema
} from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
selector: 'app-abnormal-appear',
templateUrl: './abnormal-appear.component.html',
- styleUrls: ['./abnormal-appear.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less', './abnormal-appear.component.less']
})
-export class WaybillManagementAbnormalAppearComponent implements OnInit {
+export class WaybillManagementAbnormalAppearComponent extends BasicTableComponent implements OnInit {
@ViewChild('detailModal', { static: true })
detailModal!: any;
@ViewChild('replyModal', { static: true })
replyModal!: any;
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('st2', { static: true })
- st2!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
ui: SFUISchema = {};
ui2: SFUISchema = {};
- schema: SFSchema = {};
addSchema: SFSchema = {};
- _$expand = false;
editText = '';
formData: any;
isVisible = false;
@@ -74,44 +70,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '300px', className: 'text-left' },
{ title: '上报时间', index: 'createTime', width: '180px', className: 'text-center' },
+ { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
+ { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
{
title: '操作',
fixed: 'right',
width: '100px',
+ iif: _ => this.selectedIndex === 0,
className: 'text-center',
buttons: [{ text: '回复', click: item => this.replyAction(item) }]
}
];
- columns2: STColumn[] = [
- {
- title: '异常编号',
- index: 'exceptionCode',
- width: '180px',
- className: 'text-left',
- type: 'link',
- click: item => this.reviewDetailAction(item)
- },
- { title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
- {
- title: '关联运单号',
- index: 'wayBillCode',
- width: '180px',
- className: 'text-left',
- type: 'link',
- click: item => this.routeToBill(item)
- },
- { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
- { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
- { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
- { title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
- { title: '承运司机', index: 'driver', width: '200px', className: 'text-left' },
- { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
- { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
- { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },
- { title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
- { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
- { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
- ];
resourceStatus: number | undefined;
get reqParams() {
@@ -140,28 +109,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
public service: WaybillManagementServe,
private nzModalService: NzModalService,
public shipperSrv: ShipperBaseService,
- private router: Router
- ) {}
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
ngOnInit(): void {
this.initSF();
this.getGoodsSourceStatistical();
}
- /**
- * 伸缩查询条件
- */
- expandToggle(): void {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
- /**
- * 查询字段个数
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
- }
-
reviewDetailAction(item: any) {
this.itemInfo = {};
this.service.request(`${this.service.$api_get_listOperate_detail}${item.id}`, {}, 'GET').subscribe(res => {
@@ -217,7 +175,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
initSF() {
this.schema = {
properties: {
- _$expand: { type: 'boolean', ui: { hidden: true } },
exceptionCode: {
type: 'string',
title: '异常编号',
@@ -259,9 +216,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
},
change: (q: any) => {
this.getRegionCode(q);
- },
- visibleIf: {
- _$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
@@ -270,29 +224,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请先选择货主',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ placeholder: '请先选择货主'
} as SFSelectWidgetSchema
},
driverName: {
title: '承运司机',
- type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
carNo: {
title: '车牌号',
- type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
reportingTime: {
title: '上报时间',
@@ -300,10 +241,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
ui: {
widget: 'date',
mode: 'range',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
enterpriseInfoId: {
@@ -312,9 +250,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- _$expand: (value: boolean) => value
- },
allowClear: true,
asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
}
@@ -328,7 +263,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
this.resourceStatus = e;
setTimeout(() => {
this?.st?.load(1);
- this?.st2?.load(1);
+ this.st.resetColumns();
}, 0);
}
getGoodsSourceStatistical() {
@@ -351,11 +286,9 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
});
}
search() {
- if (this.selectedIndex === 0) {
- this.st?.load(1);
- } else {
- this.st2?.load(1);
- }
+ console.log(this.st);
+
+ this.st?.load(1);
this.getGoodsSourceStatistical();
}
/**
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index cbc5221f..9403b45c 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -7,24 +7,9 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
-->
-
+
-
-
-
-
-
@@ -40,32 +25,26 @@