diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 55b04a00..6ecd3f78 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 14:39:52 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html + * @LastEditTime : 2022-01-21 10:47:36 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -43,19 +43,15 @@ - - - - - - + +
{ - if (element.billStatusLabel === '待发车') { - this.tabs.stayQuantity = element.quantity; - } else if (element.billStatusLabel === '待接单') { + if (element.billStatusLabel === '待审核') { this.tabs.receivedQuantity = element.quantity; - } else if (element.billStatusLabel === '待签收') { - this.tabs.signQuantity = element.quantity; - } else if (element.billStatusLabel === '已完成') { - this.tabs.compolatelQuantity = element.quantity; - } else if (element.billStatusLabel === '已取消') { - this.tabs.cancelQuantity = element.quantity; - } else if (element.billStatusLabel === '运输中') { - this.tabs.GoingQuantity = element.quantity; + } else if (element.billStatusLabel === '已审核') { + this.tabs.stayQuantity = element.quantity; } totalCount += element.quantity; }); @@ -259,35 +251,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } } as SFSelectWidgetSchema }, - createTime: { - title: '创建时间', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } as SFDateWidgetSchema - }, - riskStatus: { - type: 'string', - title: '是否风险单', - enum: [ - { label: '全部', value: '' }, - { label: '是', value: '3' }, - { label: '否', value: '1' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, enterpriseInfoId: { type: 'string', title: '网络货运人', @@ -315,7 +278,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } as SFSelectWidgetSchema }, settlementBasis: { - title: '结算依据', + title: '装卸凭证', type: 'string', ui: { widget: 'dict-select', @@ -391,7 +354,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' }, { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' }, - { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' }, { @@ -406,24 +368,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { width: '250px', render: 'goodsName' }, - { - title: '运费单价', - className: 'text-right', - width: '180px', - render: 'freightPrice' - }, - { - title: '接单数量', - className: 'text-right', - index: 'goodsNumber', - width: '180px' - }, - { - title: '结算重量', - className: 'text-right', - index: 'settlementWeight', - width: '150px' - }, { title: '承运司机', className: 'text-left', @@ -445,7 +389,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { render: 'loadingTime' }, { - title: '创建时间', + title: '装货凭证', + width: '180px', + className: 'text-left', + index: 'createTime' + }, + { + title: '卸货凭证', width: '180px', className: 'text-left', index: 'createTime' @@ -457,37 +407,21 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { className: 'text-left', buttons: [ { - text: '查看评价　', + text: '通过', click: _record => this.viewEvaluate(_record), iif: item => item.billStatus == '5' }, { - text: '运费变更记录', + text: '生成电子单据', click: _record => this.OpenPrice(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6' }, { - text: '变更运费　', + text: '修改', click: _record => this.updateFreight(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' }, - { - text: '确认签收　', - click: _record => this.confirmReceipt(_record), - iif: item => item.billStatus == '4' - }, - { - text: '取消订单　', - click: _record => this.cancellation(_record), - iif: item => - item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' - }, - { - text: '修改订单　', - click: _record => this.changeOrder(_record), - iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' - } ] } ]; 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 a3504d3e..2a16a34e 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-01-20 19:16:44 + * @LastEditTime : 2022-01-21 10:47:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -125,7 +125,14 @@ export class OrderManagementService extends ShipperBaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询系统配置项 - public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; + public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; + + // 查询单据审核 + public $api_get_billExamine_page = '/api/sdc/billExamine/listPage'; + // 单据审核查看凭证 + public $api_get_getCredentials = '/api/sdc/billExamine/getCredentials'; + // 单据审核 + public $api_get_billAudit = '/api/sdc/billExamine/billAudit'; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/sys-setting/components/btn-management/btn-management.component.html b/src/app/routes/sys-setting/components/btn-management/btn-management.component.html index 6bf41320..fadaab59 100644 --- a/src/app/routes/sys-setting/components/btn-management/btn-management.component.html +++ b/src/app/routes/sys-setting/components/btn-management/btn-management.component.html @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-01-19 10:47:46 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 11:13:37 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\close-account copy\\btn-management.component.html + * @LastEditTime : 2022-01-21 10:56:48 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\btn-management\\btn-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -69,7 +69,7 @@ - + diff --git a/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts b/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts index a0618112..36c5e6a9 100644 --- a/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts +++ b/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts @@ -22,7 +22,7 @@ export class BtnManagementComponent implements OnInit { schema: SFSchema = {}; addSchema: SFSchema = {}; _$expand = false; - editText = ''; + editcode = ''; formData :any; isVisible = false; edit = false; @@ -32,16 +32,16 @@ export class BtnManagementComponent implements OnInit { { title: '按钮名称', index: 'name' }, { title: 'i18n', index: 'i18n' }, { title: '创建时间', index: 'createTime' }, - { title: '按钮说明', index: 'text' }, + { title: '按钮编码', index: 'code' }, { title: '操作', buttons: [ { - text: '编辑', + code: '编辑', click: item => this.roleAction(item, 2) }, { - text: '删除', + code: '删除', click: item => this.deleteAction(item) }, ] @@ -116,22 +116,22 @@ export class BtnManagementComponent implements OnInit { title: 'i18n', ui: { placeholder: '请输入' } }, - text: { - title: '按钮说明', + code: { + title: '按钮编码', type: 'string', ui: { placeholder: '请输入', } }, }, - required: ['name', 'i18n', 'text'] + required: ['name', 'i18n', 'code'] }; this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; } roleAction(value: any,item?: any) { if(item === 1) { this.edit = false; - this.editText = '新增'; + this.editcode = '新增'; this.formData = {}; } else { this.service.request(this.service.$api_getButtonInfo_one, {id: value.id}).subscribe((res: any) => { @@ -142,7 +142,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; }) this.edit = true; this.editId = value.id; - this.editText = '编辑'; + this.editcode = '编辑'; } this.isVisible = true; } diff --git a/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.html b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.html new file mode 100644 index 00000000..648c3452 --- /dev/null +++ b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.html @@ -0,0 +1,80 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + +
+
+ +
+
+ + +
+ 客户 + 供应商 +
+ + + + + + + + + + + + + diff --git a/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.less b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.less new file mode 100644 index 00000000..04fd4ba3 --- /dev/null +++ b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.less @@ -0,0 +1,13 @@ +:host::ng-deep{ + .search-box{ + .ant-card-body{ + padding-bottom: 18px; + } + } + + .content-box{ + .ant-card-body{ + padding-top: 14px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.ts b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.ts new file mode 100644 index 00000000..1ea7e778 --- /dev/null +++ b/src/app/routes/sys-setting/components/insurance-set/insurance-set.component.ts @@ -0,0 +1,252 @@ +import { Component, OnInit, ViewChild, Type } from '@angular/core'; +import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { EAEnvironmentService, ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { SystemService } from '../../services/system.service'; + +@Component({ + selector: 'app-sys-setting-components-insurance-set', + templateUrl: './insurance-set.component.html', + styleUrls: ['./insurance-set.component.less'] +}) +export class InsuranceSetComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; + ui: SFUISchema = {}; + ui2: SFUISchema = {}; + schema: SFSchema = {}; + addSchema: SFSchema = {}; + _$expand = false; + editText = ''; + formData :any; + isVisible = false; + edit = false; + editId = false; + + columns: STColumn[] = [ + { title: '公告标题', index: 'announcementTitle' }, + { title: '创建时间', index: 'createTime' }, + { title: '发送时间', index: 'sendTime' }, + { title: '公告内容', index: 'announcementContent' }, + { + title: '操作', + buttons: [ + { + text: '编辑', + click: item => this.roleAction(item, 2) + }, + { + text: '删除', + click: item => this.deleteAction(item) + }, + ] + } + ]; + + selectedRows: any[] = []; + + get reqParams (){ + return { + ...this.sf?.value, + }}; + + constructor( + public service: SystemService, + private nzModalService: NzModalService, + public shipperservice: ShipperBaseService, + private envSrv: EAEnvironmentService, + ) {} + + ngOnInit(): void { + this.initSF() + this.initSFFre() + } + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + case 'filter': + this.st.load(); + break; + } + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + initSF(){ + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + announcementTitle: { + type: 'string', + title: '按钮名称', + ui: { placeholder: '请输入' } + }, + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + allowClear: true, + } as SFDateWidgetSchema + }, + } + + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + initSFFre() { + this.addSchema = { + properties: { + appIdList: { + type: 'string', + title: '发布平台', + enum: [ + { label: '运营后台', value: this.envSrv.env.appId }, + // { label: '货主后台', value: this.envSrv.env.HzappId }, + // { label: '司机端', value: this.envSrv.env.sjappId } + ], + ui: { + widget: 'select', + mode: 'multiple', + errors: { required: '请选择' }, + placeholder: '请选择' + } + }, + announcementTitle: { + type: 'string', + title: '公告标题', + ui: { placeholder: '请输入' } + }, + announcementContent: { + type: 'string', + title: '公告内容', + ui: { placeholder: '请输入' } + }, + sendTime: { + title: '发送时间', + type: 'string', + format: 'date-time', + ui: { + allowClear: true, + } + }, + }, + required: ['name', 'i18n', 'text'] + }; +this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; +} + roleAction(value: any,item?: any) { + if(item === 1) { + this.edit = false; + this.editText = '新增'; + this.formData = {}; + } else { + this.service.request(this.service.$api_getAnnouncementInfoById_detail, {id: value.id}).subscribe((res: any) => { + console.log(res) + if(res) { + this.formData = res; + } + }) + this.edit = true; + this.editId = value.id; + this.editText = '编辑'; + } + this.isVisible = true; + } + + deleteAction(item?: any) { + this.nzModalService.error({ + nzTitle: '确认删除？', + nzClosable: false, + nzCancelText: '取消', + nzOnOk: () => { + this.service.request(this.service.$api_delete_deleteAnnouncementInfoById, [item.id]).subscribe(res => { + if (res) { + this.service.msgSrv.success('删除成功！'); + this.st.reload(1) + } + }) + } + }); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } + handleCancel() { + this.isVisible = false + } + + handleOK() { + console.log(this.sfFre.value) + if(!this.sfFre.valid) { + this.service.msgSrv.warning('请正确填写完整！') + return + } + var c = new Date(this.sfFre.value.sendTime); + this.sfFre.value.sendTime = + c.getFullYear() + + '-' + + this.addPreZero(c.getMonth() + 1) + + '-' + + this.addPreZero(c.getDate()) + + ' ' + + this.addPreZero(c.getHours()) + + ':' + + this.addPreZero(c.getMinutes()) + + ':' + + this.addPreZero(c.getSeconds()); + const params ={ + ...this.sfFre.value + } + if(this.editId) { + params.id = this.editId + console.log(params) + this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } + }) + } else { + this.service.request(this.service.$api_addAnnouncementInfo, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } + } + )} +} + addPreZero(num: any) { + if (num < 10) { + return '0' + num; + } else { + return num; + } + } +} diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index c0fe2088..23cdd1f7 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime : 2022-01-20 15:46:46 + * @LastEditTime : 2022-01-21 10:33:20 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts @@ -156,6 +156,18 @@ export class SystemService extends BaseService { // 新增公告信息 $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo'; + + // 查询保险配置 + $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; + // 获取保险配置费率 + $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; + // 获取保险配置(id) + $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; + // 删除保险配置(id) + $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; + // 批量保存保险配置 + $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; + $api_getRoleTemplateInfo: string = ''; diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index d229c8a6..2b8db6a3 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-01-19 10:53:58 + * @LastEditTime : 2022-01-21 10:29:33 * @LastEditors : Shiming * @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 @@ -27,6 +27,7 @@ import { SystemWaybillLogsComponent } from './components/system-waybill-logs/sys import { UserLogsComponent } from './components/user-logs/user-logs.component'; import { VersionLogsComponent } from './components/version-logs/version-logs.component'; import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; +import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; const routes: Routes = [ { path: 'staff-management', component: StaffManagementComponent }, @@ -48,6 +49,7 @@ const routes: Routes = [ { path: 'system-waybill-logs', component: SystemWaybillLogsComponent }, { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, + { path: 'insurance-set', component: InsuranceSetComponent }, ]; @NgModule({ diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index ad4f4e37..21e74b15 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-01-20 15:35:53 + * @LastEditTime : 2022-01-21 10:29:45 * @LastEditors : Shiming * @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.module.ts @@ -36,6 +36,7 @@ import { SystemSupplyLogsComponent } from './components/system-supply-logs/syste import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; import { BtnManagementComponent } from './components/btn-management/btn-management.component'; import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; +import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; const COMPONENTS = [ StaffManagementComponent, @@ -56,7 +57,8 @@ const COMPONENTS = [ SystemSupplyLogsComponent, SystemWaybillLogsComponent, BtnManagementComponent, - AnnouncementMessageComponent + AnnouncementMessageComponent, + InsuranceSetComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, 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 26ea6eb0..4e471280 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 @@ -106,9 +106,13 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { ui: { placeholder: '请输入' } }, exceptionType: { - type: 'string', title: '异常类型', - ui: { placeholder: '请输入' } + type: 'string', + ui: { + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'exception:report:type' }, + } as SFSelectWidgetSchema }, shipperAppUserId: { type: 'string', diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index d0337e30..fd49e41e 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -175,11 +175,6 @@ "link": "/order-management/vehicle-detail/:id", "hide": true }, - { - "text": "单据审核", - "icon": "anticon anticon-dashboard", - "link": "/order-management/receipts-audit" - }, { "text": "大宗订单详情", "icon": "anticon anticon-dashboard", @@ -484,6 +479,10 @@ "text": "按钮管理设置", "link": "/system/btn-management" }, + { + "text": "保险配置", + "link": "/system/insurance-set" + }, { "text": "公告信息管理", "link": "/system/announcement-message"