diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
index 907c9ad5..b0f78c2a 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -177,15 +177,15 @@ export class WithdrawalsRecordComponent {
placeholder: '请输入'
}
},
- refundStatus: {
- type: 'string',
- title: '提现状态',
- ui: {
- widget: 'dict-select',
- params: { dictKey: 'refund:apply:status' },
- placeholder: '请选择'
- }
- },
+ // refundStatus: {
+ // type: 'string',
+ // title: '提现状态',
+ // ui: {
+ // widget: 'dict-select',
+ // params: { dictKey: 'refund:apply:status' },
+ // placeholder: '请选择'
+ // }
+ // },
createTime: {
title: '提现时间',
type: 'string',
@@ -201,9 +201,6 @@ export class WithdrawalsRecordComponent {
title: '账户名称',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
accountType: {
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 3ddf3244..f252d6e2 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-11 11:15:57
+ * @LastEditTime : 2022-04-11 14:26:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -158,8 +158,12 @@ export class FreightAccountService extends ShipperBaseService {
// 查询异常入金充值信息
$api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage';
- // 查询异常入金充值信息
+ // 异步导出运营后台异常入金列表
$api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage';
+ // 异步导出运营后台退款记录列表
+ $api_get_asyncExportBillRefundApplicationList = '/api/fcc/billRefundApplication/asyncExportBillRefundApplicationList';
+ // 异步导出运营后台支付记录列表
+ $api_get_asyncExportBillPaymentApplicationList = '/api/fcc/billPaymentApplicationOBC/asyncExportBillPaymentApplicationList';
constructor(public injector: Injector) {
super(injector);
@@ -193,6 +197,8 @@ export class FreightAccountService extends ShipperBaseService {
}
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
+ // 获取企业CRM信息
+ public $api_crm_enterpriceList = '/api/mdc/cuc/enterprise/getCrmSelectList';
reviewPDF(url: string) {
if (!url) {
return;
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts
index c3b2ad6c..2846e43a 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -498,9 +498,11 @@ export class insuranceManagementListComponent implements OnInit {
}
showImg(_record: any) {
// var newUrl=_record.policyUrl.replace('http','https')
+ // console.log(newUrl);
+
// window.open(newUrl,'_self');
- window.location.href = `${_record.policyUrl}`;
- // this.service.downloadFile(`${_record.policyUrl}`)
+
+ this.service.downloadFile(`${_record.policyUrl}`)
// const params = {
// imgList: [_record.policyUrl],
// index: 0
diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts
index c175dee5..a8b8b13b 100644
--- a/src/app/routes/insurance-management/services/insurance-management.service.ts
+++ b/src/app/routes/insurance-management/services/insurance-management.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-28 17:11:54
+ * @LastEditTime : 2022-04-11 15:13:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -32,6 +32,30 @@ export class InsuranceManagementService extends ShipperBaseService {
// 保险费列表数据导出接口
$api_get_asyncExport = `/api/sdc/premiumInfo/asyncExport`;
+ public reviewPDF(url: string) {
+ if (!url) {
+ return;
+ }
+ const uA = window.navigator.userAgent; // 判断浏览器内核
+ const isIE =
+ /msie\s|trident\/|edge\//i.test(uA) &&
+ !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window);
+ const objectUrl = url;
+ const a = document.createElement('a');
+ document.body.appendChild(a);
+ console.log('5555');
+
+ a.href = objectUrl;
+ a.download = '保单.pdf';
+ if (isIE) {
+ // 兼容IE11无法触发下载的问题
+ (navigator as any).msSaveBlob(url, a.download);
+ } else {
+ a.click();
+ }
+ a.remove();
+ }
+
constructor(public injector: Injector) {
super(injector);
}
diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html
index 45f34597..da667180 100644
--- a/src/app/routes/order-management/components/complaint/complaint.component.html
+++ b/src/app/routes/order-management/components/complaint/complaint.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-11 11:28:18
+ * @LastEditTime : 2022-04-11 14:33:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -27,7 +27,7 @@
-
diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts
index bf1d3fcc..82e301a3 100644
--- a/src/app/routes/order-management/components/complaint/complaint.component.ts
+++ b/src/app/routes/order-management/components/complaint/complaint.component.ts
@@ -7,7 +7,6 @@ import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service';
-
@Component({
selector: 'app-supply-management-complaint',
templateUrl: './complaint.component.html',
@@ -32,30 +31,27 @@ export class OrderManagementComplaintComponent implements OnInit {
isLoading: boolean = false;
mainTabs = [
{ name: '司机投诉', status: '2' },
- { name: '货主投诉', status: '1' },
- ]
- tabs = [ {
- name: '全部',
- type: 0,
- },
- {
- name: '待处理',
- type: 1,
- },
- {
- name: '已处理',
- type: 2,
- },
- {
- name: '已撤销',
- type: 3,
- }
+ { name: '货主投诉', status: '1' }
];
- constructor(
- public service: OrderManagementService,
- private modal: NzModalService,
- private router: Router
- ) {
+ tabs = [
+ {
+ name: '全部',
+ type: 0
+ },
+ {
+ name: '待处理',
+ type: 1
+ },
+ {
+ name: '已处理',
+ type: 2
+ },
+ {
+ name: '已撤销',
+ type: 3
+ }
+ ];
+ constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) {
// console.log(this.selectedIndex);
// if (this.selectedIndex === 0) {
// this.selectedMainTabStatus = '2';
@@ -65,25 +61,25 @@ export class OrderManagementComplaintComponent implements OnInit {
}
/**
- * 查询参数
- */
+ * 查询参数
+ */
get reqParams() {
const a: any = {};
- if(this.resourceStatus) {
- a.complaintStatus = this.resourceStatus
+ if (this.resourceStatus) {
+ a.complaintStatus = this.resourceStatus;
}
- if(this.selectedMainTabStatus) {
- a.complainantParty = this.selectedMainTabStatus
+ if (this.selectedMainTabStatus) {
+ a.complainantParty = this.selectedMainTabStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
...a,
- ...params,
+ ...params
};
}
get selectedRows() {
- return this.st?.list.filter((item) => item.checked) || [];
+ return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
this.initSF();
@@ -91,17 +87,15 @@ export class OrderManagementComplaintComponent implements OnInit {
this.initSTAudit();
}
-
-
/**
- * 初始化查询表单
- */
+ * 初始化查询表单
+ */
initSF() {
this.schema = {
properties: {
complaintCode: {
type: 'string',
- title: '投诉单号',
+ title: '投诉单号'
},
complaintCause: {
title: '投诉原因',
@@ -109,22 +103,23 @@ export class OrderManagementComplaintComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'drvcomplaint:cause' },
- containsAllLabel: true,
+ containsAllLabel: true
} as SFSelectWidgetSchema
},
complainantTime: {
type: 'string',
-
+
title: '投诉时间',
ui: {
- widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
- },
- },
+ widget: 'sl-from-to',
+ type: 'date',
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema
+ }
+ }
};
- this.ui =
- {
- '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } },
-
+ this.ui = {
+ '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } }
};
}
@@ -150,7 +145,7 @@ export class OrderManagementComplaintComponent implements OnInit {
title: '投诉时间',
width: '170px',
index: 'complainantTime',
- className: 'text-center',
+ className: 'text-center'
},
{ title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
{ title: '司机', index: 'driverName', width: '120px', className: 'text-center' },
@@ -160,8 +155,20 @@ export class OrderManagementComplaintComponent implements OnInit {
// width: '170px',
// render: 'complaintCauseLabel'
// },
- { title: '投诉原因',iif: value => this.selectedMainTabStatus == '1', index: 'shpComplaintCauseLabel', className: 'text-center',width: '170px', },
- { title: '投诉原因',iif: value => this.selectedMainTabStatus == '2', index: 'drvComplaintCauseLabel', className: 'text-center',width: '170px', },
+ {
+ title: '投诉原因',
+ iif: value => this.selectedMainTabStatus == '1',
+ index: 'shpComplaintCauseLabel',
+ className: 'text-center',
+ width: '170px'
+ },
+ {
+ title: '投诉原因',
+ iif: value => this.selectedMainTabStatus == '2',
+ index: 'drvComplaintCauseLabel',
+ className: 'text-center',
+ width: '170px'
+ },
{
title: '投诉状态',
className: 'text-center',
@@ -172,19 +179,19 @@ export class OrderManagementComplaintComponent implements OnInit {
title: '处理人',
className: 'text-center',
width: '200px',
- index:'handlePartyLabel'
+ index: 'handlePartyLabel'
},
{
title: '处理时间',
className: 'text-center',
width: '200px',
- index:'handleTime'
+ index: 'handleTime'
},
{
title: '处理结果',
className: 'text-center',
width: '170px',
- index:'handleResult'
+ index: 'handleResult'
},
{
title: '投诉方',
@@ -211,11 +218,11 @@ export class OrderManagementComplaintComponent implements OnInit {
// },
{
text: '查看',
- click: (_record) => this.view(_record),
- acl: { ability: ['ORDER-COMPLAINT-view'] },
- },
- ],
- },
+ click: _record => this.view(_record),
+ acl: { ability: ['ORDER-COMPLAINT-view'] }
+ }
+ ]
+ }
];
}
initSTAudit() {
@@ -229,8 +236,8 @@ export class OrderManagementComplaintComponent implements OnInit {
placeholder: '最多不超过50字',
widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 }
- },
- },
+ }
+ }
},
required: ['handleResult']
};
@@ -243,20 +250,19 @@ export class OrderManagementComplaintComponent implements OnInit {
return Object.keys(this.schema?.properties || {}).length;
}
/**
- * 伸缩查询条件
- */
+ * 伸缩查询条件
+ */
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
- tabChange(item: any) {
- }
+ tabChange(item: any) {}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
- this.isLoading = true
+ this.isLoading = true;
}
selectChange(e: number) {
this.resourceStatus = e;
@@ -265,29 +271,26 @@ export class OrderManagementComplaintComponent implements OnInit {
this.st.load();
}, 500);
}
- /**
+ /**
* 切换投诉与被投诉tab
*/
- selectMainTab(e: any) {
- this.selectedMainTabStatus = e?.status;
- this.resourceStatus = '';
- this.initST();
- this.initSF();
- setTimeout(() => {
- this.st.load(1);
- })
- }
-
+ selectMainTab(e: any) {
+ this.selectedMainTabStatus = e?.status;
+ this.resourceStatus = '';
+ this.initST();
+ this.initSF();
+ setTimeout(() => {
+ this.st.load(1);
+ });
+ }
+
/**
* 导入货源
*/
- importGoodsSource() {
+ importGoodsSource() {}
+ audit(item: any) {}
- }
- audit(item: any) {
- }
-
- /*
+ /*
* 审核关闭弹窗
view: 1
浮动费用： 0
@@ -298,60 +301,60 @@ export class OrderManagementComplaintComponent implements OnInit {
...this.sfView.value,
handleStatus: 0,
id: this.channelId
- }
- this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
- if(res) {
- this.service.msgSrv.success('已拒绝！')
- this.isVisibleRE = false
- this.st.reload(1)
- } else{
- this.service.msgSrv.error(res?.msg)
+ };
+ this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) => {
+ if (res) {
+ this.service.msgSrv.success('已拒绝！');
+ this.isVisibleRE = false;
+ this.st.reload(1);
+ } else {
+ this.service.msgSrv.error(res?.msg);
}
- })
- this.isVisibleRE = false
+ });
+ this.isVisibleRE = false;
}
Cancel() {
- this.isVisibleRE = false
+ this.isVisibleRE = false;
}
handleCancel2() {
const paramsa = {
id: this.channelId
- }
- this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
- if(res) {
- this.service.msgSrv.success('已拒绝！')
- this.isVisibleRE = false
- this.st.reload(1)
- } else{
- this.service.msgSrv.error(res?.msg)
+ };
+ this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) => {
+ if (res) {
+ this.service.msgSrv.success('已拒绝！');
+ this.isVisibleRE = false;
+ this.st.reload(1);
+ } else {
+ this.service.msgSrv.error(res?.msg);
}
- })
- this.isVisibleRE = false
+ });
+ this.isVisibleRE = false;
}
- /**
- * 审核通过按钮
- */
+ /**
+ * 审核通过按钮
+ */
handleOK() {
const paramsa = {
...this.sfView.value,
handleStatus: 1,
id: this.channelId
- }
- this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
- if(res) {
- this.service.msgSrv.success('已通过！')
- this.isVisibleRE = false
- this.st.reload(1)
- } else{
- this.service.msgSrv.error(res?.msg)
+ };
+ this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) => {
+ if (res) {
+ this.service.msgSrv.success('已通过！');
+ this.isVisibleRE = false;
+ this.st.reload(1);
+ } else {
+ this.service.msgSrv.error(res?.msg);
}
- })
+ });
}
- /**
- *查看评价
- */
+ /**
+ *查看评价
+ */
viewEvaluate(item: any) {
- this.isVisibleRE = true
+ this.isVisibleRE = true;
this.channelId = item.id;
}
view(value: any) {
@@ -359,6 +362,10 @@ export class OrderManagementComplaintComponent implements OnInit {
queryParams: {
detail: JSON.stringify(value)
}
- })
+ });
+ }
+ // 导出
+ exprot() {
+ this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_asyncExportComplaintListDrv);
}
}
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index 733e8c27..13e8bb1d 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-09 16:16:09
+ * @LastEditTime : 2022-04-11 14:35:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -202,6 +202,8 @@ export class OrderManagementService extends ShipperBaseService {
$api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
// 异步导出单据审核导出
$api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`;
+ // 异步导出投诉管理导出
+ $api_asyncExportComplaintListDrv= `/api/sdc/complaint/operate/asyncExportComplaintListDrv`;
/**
* 根据企业ID，获取企业历史网络货运人
* @returns
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html
index 6b065ba9..2a2358b8 100644
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-17 15:01:33
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-22 11:17:30
+ * @LastEditTime : 2022-04-11 14:50:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -17,7 +17,7 @@
正面照
示例
-
+