diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 7b7b011b..6c8f2ec8 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 10:27:04 + * @LastEditTime : 2022-01-24 10:55:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -144,4 +144,35 @@ 取消 确定 + + + + + + + {{ item.amountBeforeChange | currency}} + + + ¥{{ item.amountchangeValue | number: '0.2-2'}} + + + {{ item.amountAfterChange | currency}} + + + 变更原因:{{ViewCause?.changeCause}} + 拒绝原因:{{ViewCause?.refuseCause}} + 注:附加费依据调整后的运输费用重新计算 + + + 取消 + 确定 + \ No newline at end of file diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index c42b0f8e..c43c3147 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -23,6 +23,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { schema: SFSchema = {}; schemaView: SFSchema = {}; changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 + changeViewId: any; // 查看运费变更记录id - 用于查看 auditId: any; auditMany = false; isVisibleView = false; @@ -37,6 +38,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { @ViewChild('stFloatView') private readonly stFloatView!: STComponent; columns: STColumn[] = []; columnsFloat: STColumn[] = []; + columnsFloatView: STColumn[] = []; + ViewCause: any; // 变更运费查看数据 resourceStatus: any; tabs = { totalCount: 0, @@ -78,6 +81,11 @@ export class OrderManagementComplianceAuditComponent implements OnInit { get selectedRows() { return this.st?.list.filter(item => item.checked) || []; } + get changeViewParams() { + return { + id: this.changeViewId + }; + } search() { this.st?.load(1); this.getGoodsSourceStatistical(); @@ -120,6 +128,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.getGoodsSourceStatistical(); this.initSF(); this.initST(); + this.initSTFloat(); + this.initSTFloatView(); } /** @@ -358,7 +368,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { { title: '操作', fixed: 'right', - width: '120px', + width: '140px', className: 'text-left', buttons: [ { @@ -372,7 +382,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { // iif: item => item.billStatus == '4' }, { - text: '合规抽查', + text: '合规抽查 ', click: _record => this.audit(_record), // iif: item => item.billStatus == '4' }, @@ -380,12 +390,99 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } ]; } + initSTFloat() { + this.columnsFloat = [ + { + title: '序号', + className: 'text-center', + render: 'order' + }, + { + title: '操作时间', + className: 'text-center', + index: 'applyTime' + }, + { + title: '操作人', + className: 'text-center', + index: 'applyUserName' + }, + { title: '状态', index: 'handleStatusLabel', className: 'text-center' }, + { + title: '操作', + fixed: 'right', + className: 'text-left', + buttons: [ + { + text: '查看', + click: (_record) => this.FloatView(_record), + }, + { + text: '撤销', + click: (_record) => this.revoke(_record), + iif: item => item.handleStatus === '1' || item.handleStatus === 1, + }, + ], + }, + ]; + } + initSTFloatView() { + this.columnsFloatView = [ + { + title: '费用名称', + width: '100px', + className: 'text-center', + index: 'costName' + }, + { + title: '变更前', + width: '100px', + className: 'text-center', + index: 'amountAfterChange', + render: 'amountAfterChange' + }, + { title: '变更值', + index: 'amountchangeValue', + render: 'amountchangeValue', + width: '120px', + className: 'text-center' }, + { title: '变更后', + index: 'amountBeforeChange', + render: 'amountBeforeChange', + width: '120px', + className: 'text-center' } + ]; + } /** * 查询字段个数 */ get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } + /** + * 浮动费用查看 + */ + FloatView(item: any) { + console.log(item) + this.changeViewId = item.id; + this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => { + this.ViewCause = res; + }) + this.isVisibleView = true + } + revoke(item: any) { + this.modal.confirm({ + nzTitle: '是否确定立即撤销费用变更!', + nzOnOk: () => + 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() + } + }) + }); + } /** * 伸缩查询条件 */ @@ -470,6 +567,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.isVisible = false; } else if(value === '1') { this.isVisibleRE = false; + } else if(value === '2') { + this.isVisibleView = false; } } /**