diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts
index eb621f0b..ee3975f3 100644
--- a/src/app/routes/order-management/order-management.module.ts
+++ b/src/app/routes/order-management/order-management.module.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-23 17:13:28
+ * @LastEditTime: 2021-12-29 16:49:32
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\order-management.module.ts
@@ -27,6 +27,8 @@ import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.compon
import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component';
import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component';
+import { VehicleFreightPeopleComponent } from './modal/vehicle/freight-people/freight-people.component';
+import { VehicleModifyRateComponent } from './modal/vehicle/modify-rate/modify-rate.component';
import { VehicleSureArriveComponent } from './modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from './modal/vehicle/sure-depart/sure-depart.component';
import { VehicleUpdateFreightComponent } from './modal/vehicle/update-freight/update-freight.component';
@@ -53,7 +55,9 @@ const COMPONENTS: Type[] = [
OrderManagementRiskDetailComponent,
OneCarOrderCancelComponent,
OrderManagementVehicleDetailChangeComponent,
- OrderManagementBulkDetailChangeComponent
+ OrderManagementBulkDetailChangeComponent,
+ VehicleModifyRateComponent,
+ VehicleFreightPeopleComponent
];
@NgModule({
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index b828a4b5..1be3be20 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -122,11 +122,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
title: '货主',
type: 'string',
maxLength: 30,
+ enum: [],
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
+
onSearch: (q: any) => {
if (!!q) {
return this.service
@@ -757,8 +759,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// 初始化信息
dataR (res: any) {
// this.dataList = res;
+ if(res?.shipperAppUserName) {
+ const List: any = []
+ this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName}).subscribe((res) => {
+ console.log(res)
+ res?.forEach((element: any) => {
+ List.push({ label: element.enterpriseName, value: element.id } )
+ });
+ })
+ this.schema1.shipperAppUserId.enum = List
+ }
this.sf1data = {
- // shipperAppUserName: res?.shipperAppUserName ,
enterpriseProjectId: res?.enterpriseProjectId ,
enterpriseInfoName: res?.enterpriseInfoName ,
externalResourceCode: res?.externalResourceCode ,
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 ee4a79d5..1df08eff 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
@@ -27,8 +27,7 @@
-
{{ i?.externalResourceCode }}
+
{{ i?.externalResourceCode }}
{{i?.enterpriseProjectId}}
{{i?.createUserId}}
{{i?.dispatchName}} 18100000000
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 3251f184..d65d6237 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -343,7 +343,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
// type: 'enum',
// enum: { '1': '抢单', '2': '指派' }
// },
- { title: '货主', index: 'shipperAppUserNmae', width: '120px' },
+ { title: '货主', index: 'shipperAppUserName', width: '120px' },
{
title: '项目名称',
index: 'enterpriseProjectName',
diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
index b64cc8b8..6b2969a3 100644
--- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
+++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
@@ -29,7 +29,6 @@ export class CrmManagementComponent implements OnInit {
{ title: '客户名称', index: 'customerName' },
{ title: '客户简称', index: 'customerShortName' },
{ title: '客户编码', index: 'customerCode' },
- { title: '客户类型', render: 'customerType' },
{
title: '操作',
buttons: [
@@ -92,17 +91,6 @@ export class CrmManagementComponent implements OnInit {
title: '客户简称',
ui: { placeholder: '请输入' }
},
- customerType: {
- type: 'string',
- title: '客户类型',
- enum: [
- { label: '客户', value: 1 },
- { label: '供应商', value: 2 },
- ],
- ui: {
- widget: 'select'
- }
- },
customerCode: {
type: 'string',
title: '客户编码',
@@ -134,20 +122,8 @@ export class CrmManagementComponent implements OnInit {
title: '客户编码',
ui: { placeholder: '请输入' }
},
- customerType: {
- type: 'string',
- title: '客户类型',
- enum: [
- { label: '客户', value: 1 },
- { label: '供应商', value: 2 },
- ],
- ui: {
- widget: 'radio',
- } as SFRadioWidgetSchema,
- default: 1,
- },
},
- required: ['customerName', 'customerShortName', 'customerType', 'customerCode']
+ required: ['customerName', 'customerShortName', 'customerCode']
};
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
}
diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts
index 0a12e736..1012fd28 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: 2021-12-27 14:09:14
+ * @LastEditTime: 2021-12-29 16:53:47
* @LastEditors: Please set LastEditors
* @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
@@ -45,38 +45,38 @@ export class SystemService extends BaseService {
$api_update_dict = '/api/mdc/pbc/dictItems/update';
// 获取CRM客户信息表
- $api_get_crmCustomer = '/api/mdc/crmCustomer/get';
+ $api_get_crmCustomer = '/api/mdc/cuc/crmCustomer/get';
// 查询CRM客户信息表
- $api_get_crmCustomer_page = '/api/mdc/crmCustomer/list/page';
+ $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page';
// 保存CRM客户信息表
- $api_save_crmCustomer = '/api/mdc/crmCustomer/save';
+ $api_save_crmCustomer = '/api/mdc/cuc/crmCustomer/save';
// 删除CRM客户信息表
- $api_deletebatch_crmCustomer = '/api/mdc/crmCustomer/deletebatch';
+ $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch';
// 获取某个应用的所有菜单
$api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId';
// 查询网络货运信息表
- $api_networkTransporter_page = '/api/mdc/networkTransporter/list/page';
+ $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page';
// 获取网络货运信息表(id)
- $api_get_networkTransporter = '/api/mdc/networkTransporter/get';
+ $api_get_networkTransporter = '/api/mdc/cuc/networkTransporter/get';
// 批量获取网络货运信息
- $api_findNetworkTransporterByIds = '/api/mdc/networkTransporter/findNetworkTransporterByIds';
+ $api_findNetworkTransporterByIds = '/api/mdc/cuc/networkTransporter/findNetworkTransporterByIds';
// 查找所有网络货运信息(下拉)
- $api_networkTransporter_findAll = '/api/mdc/networkTransporter/findAll';
+ $api_networkTransporter_findAll = '/api/mdc/cuc/networkTransporter/findAll';
// 删除网络货运信息表
- $api_networkTransporter_deletebatch = '/api/mdc/networkTransporter/deletebatch';
+ $api_networkTransporter_deletebatch = '/api/mdc/cuc/networkTransporter/deletebatch';
// 保存网络货运信息表
- $api_networkTransporter_save = '/api/mdc/networkTransporter/save';
+ $api_networkTransporter_save = '/api/mdc/cuc/networkTransporter/save';
// 查询结算客户表
- $api_settlementCustomer_page = '/api/mdc/settlementCustomer/list/page';
+ $api_settlementCustomer_page = '/api/mdc/cuc/settlementCustomer/list/page';
// 获取结算客户表
- $api_settlementCustomer_get = '/api/mdc/settlementCustomer/get';
+ $api_settlementCustomer_get = '/api/mdc/cuc/settlementCustomer/get';
// 保存结算客户表
- $api_settlementCustomer_save = '/api/mdc/settlementCustomer/save';
+ $api_settlementCustomer_save = '/api/mdc/cuc/settlementCustomer/save';
// 删除结算客户表
- $api_settlementCustomer_deletebatch = '/api/mdc/settlementCustomer/deletebatch';
+ $api_settlementCustomer_deletebatch = '/api/mdc/cuc/settlementCustomer/deletebatch';
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index 78fd70bb..b46c136a 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -38,7 +38,9 @@ export class InvoiceRequestedDetailComponent implements OnInit {
this.loadHeadInfo();
}
- ngOnInit(): void {}
+ ngOnInit(): void {
+ console.log(this.route.snapshot)
+ }
loadHeadInfo() {
this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => {
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
index 61add36b..3f050e34 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
@@ -1,3 +1,11 @@
+
@@ -21,8 +29,8 @@