@@ -108,7 +106,7 @@
+ 保险配置
+
\ No newline at end of file
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 bbde1287..f0f1eccd 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -24,10 +24,6 @@ export class insuranceManagementListComponent implements OnInit {
isVisibleEvaluate = false;
isVisible = false;
_$expand = false;
- changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
- changeViewId: any; // 查看运费变更记录id - 用于查看
- ViewCause: any; // 变更运费查看数据
- sfViewFormData: any; // 变更运费查看的sf 数据
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@@ -57,8 +53,6 @@ export class insuranceManagementListComponent implements OnInit {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
- signQuantity: 0,
- compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
@@ -91,11 +85,6 @@ export class insuranceManagementListComponent implements OnInit {
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
- get changeParams() {
- return {
- id: this.changeId
- };
- }
search() {
this.st?.load(1);
this.getGoodsSourceStatistical();
@@ -105,8 +94,6 @@ export class insuranceManagementListComponent implements OnInit {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
- signQuantity: 0,
- compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
@@ -328,42 +315,7 @@ export class insuranceManagementListComponent implements OnInit {
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
- /**
- * 初始化查询表单
- */
- initSFView() {
- this.schemaView = {
- properties: {
- freightPrice: {
- type: 'string',
- title: '运费单价'
- },
- rule: {
- title: '',
- type: 'string',
- ui: {
- widget: 'dict-select',
- params: { dictKey: 'goodresource:rounding:rules' },
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- } as SFSelectWidgetSchema
- },
- settlementBasis: {
- type: 'string',
- title: '结算重量',
- ui: {
- widget: 'dict-select',
- params: { dictKey: 'goodresource:settlement:type' },
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- } as SFSelectWidgetSchema
- }
- }
- };
- this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
- }
+
/**
* 初始化数据列表
@@ -372,26 +324,26 @@ export class insuranceManagementListComponent implements OnInit {
this.columns = [
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
- title: '订单号',
+ title: '投保编号',
width: '180px',
fixed: 'left',
className: 'text-left',
render: 'billCode'
},
{
- title: '运费明细',
+ title: '保单号',
width: '250px',
className: 'text-right',
render: 'mybidDetailInfo'
},
- { 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' },
+ { 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' },
{
- title: '卸货地',
+ title: '实际保费（元）',
className: 'text-left',
width: '180px',
index: 'unloadingAddressArr'
@@ -403,49 +355,73 @@ export class insuranceManagementListComponent implements OnInit {
render: 'goodsName'
},
{
- title: '运费单价',
+ title: '车牌号',
className: 'text-right',
width: '180px',
render: 'freightPrice'
},
{
- title: '接单数量',
+ title: '关联订单号',
className: 'text-right',
index: 'goodsNumber',
width: '180px'
},
{
- title: '结算重量',
+ title: '货源编号',
className: 'text-right',
index: 'settlementWeight',
width: '150px'
},
{
- title: '承运司机',
+ title: '网络货运人',
className: 'text-left',
width: '250px',
index: 'driverName',
render: 'driverName'
},
{
- title: '收款人',
+ title: '货主',
className: 'text-left',
width: '180px',
index: 'payeeName',
render: 'payeeName'
},
{
- title: '装卸货时间',
+ title: '所属项目',
width: '200px',
className: 'text-left',
render: 'loadingTime'
},
+ {
+ title: '投保时间',
+ width: '180px',
+ className: 'text-left',
+ index: 'createTime'
+ },
+ {
+ title: '生效时间',
+ width: '180px',
+ className: 'text-left',
+ index: 'createTime'
+ },
+ {
+ title: '录单时间',
+ width: '180px',
+ className: 'text-left',
+ index: 'createTime'
+ },
{
title: '创建时间',
width: '180px',
className: 'text-left',
index: 'createTime'
},
+ {
+ title: '失败原因',
+ width: '180px',
+ className: 'text-left',
+ index: 'createTime'
+ },
{
title: '操作',
fixed: 'right',
@@ -453,71 +429,32 @@ export class insuranceManagementListComponent implements OnInit {
className: 'text-left',
buttons: [
{
- text: '取消订单 ',
+ text: '再次投保',
click: _record => console.log(''),
- iif: item =>
- item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
+ // iif: item =>
+ // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
},
{
- text: '修改订单 ',
+ text: '查看保单',
+ click: _record => console.log(''),
+ // 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'
- }
- ]
- }
- ];
- }
- 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 => console.log('')
- },
- // {
- // text: '查看协议',
- // click: (_record, _modal, _instance) => this.view(_record)
- // },
- {
- text: '撤销',
- click: _record => console.log(''),
- iif: item => item.handleStatus === '1' || item.handleStatus === 1
}
]
}
];
}
+
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
- get changeViewParams() {
- return {
- id: this.changeViewId
- };
- }
/**
* 伸缩查询条件
*/
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index f1d7e441..124015aa 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -117,8 +117,8 @@
-
- {{i?.carrierInformationVO?.serviceTypeLabel}}
+
+ {{i?.insuranceType}}
{{i?.goodsValue}}
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
index feecb88c..2a949bd7 100644
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 15:54:08
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-25 17:43:07
+ * @LastEditTime : 2022-01-25 19:44:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -60,6 +60,18 @@
设置
+
+ 设置
+
+
+ 设置
+
+
+ 开通子账户
+
+
+ 开通子账户
+
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 16e6ef27..3af27c83 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -244,7 +244,7 @@
"children": [
{
"text": "保险列表",
- "link": "/waybill-management/vehicle"
+ "link": "/insurance-management/list"
}
]
},