diff --git a/proxy.conf.js b/proxy.conf.js
index 2799a9fa..29173019 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-27 11:21:30
+ * @LastEditTime : 2022-04-27 17:26:44
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
- host: 'tms-api-test.eascs.com',
+ host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
index 6494a9c4..d9134c20 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
@@ -26,7 +26,9 @@ export class CarSettleCarauthComponent implements OnInit {
companyData: any = {};
detailData: any = {};
carNo = ''
-
+ private titles = `
+ 根据监管要求:总质量 4.5 吨及以下普通货 运车辆的,可填车籍地 6 位行政
区域代码
000000。
+ `
constructor(
private modal: NzModalRef,
public service: VehicleService,
@@ -184,9 +186,11 @@ export class CarSettleCarauthComponent implements OnInit {
carEnergyType: {
title: '车辆能源类型',
type: 'string',
- readOnly: true,
ui: {
- placeholder:'请输入车辆能源类型'
+ widget: 'dict-select',
+ params: { dictKey: 'car:energy:type' },
+ placeholder: '请选择车辆能源类型',
+ containsAllLabel:false,
},
},
carLength: {
@@ -200,7 +204,7 @@ export class CarSettleCarauthComponent implements OnInit {
} as SFSelectWidgetSchema,
},
carLoad: {
- title: '载重',
+ title: '核定载质量',
type: 'string',
maxLength: 6,
ui: {
@@ -480,6 +484,13 @@ export class CarSettleCarauthComponent implements OnInit {
placeholder: '请输入',
},
},
+ carTotalLoad: {
+ title: '总质量',
+ type: 'string',
+ ui: {
+ placeholder: '请输入',
+ },
+ },
carOwner: {
title: '所有人',
type: 'string',
@@ -493,6 +504,7 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
ui: {
widget: 'text',
+
},
default: '照片上传后会自动识别文字并填充下列内容栏',
},
@@ -564,6 +576,9 @@ export class CarSettleCarauthComponent implements OnInit {
ui: {
// widget: this.detailData.commitFlag !== 0 ? 'text' : '',
placeholder: '请输入',
+ optionalHelp: {
+ i18n: this.titles,
+ },
},
},
roadTransportLicenceNo: {
@@ -610,6 +625,8 @@ export class CarSettleCarauthComponent implements OnInit {
'driverLicenseSigningOrg',
'carDistinguishCode',
'useNature',
+ 'curbWeight',
+ 'carTotalLoad',
'carOwner'
],
};
@@ -687,9 +704,11 @@ export class CarSettleCarauthComponent implements OnInit {
this.sf.setValue('/carOwner', res.name);
this.sf.setValue('/useNature', res.useCharacter);
this.sf.setValue('/carModel', res?.vehicleType);
+ this.sf.setValue('/carTotalLoad', res?.grossMass.slice(0, -2) % 1000);
} else {
- this.sf.setValue('/curbWeight', res.unladenMass);
+ this.sf.setValue('/curbWeight', res.unladenMass.slice(0, -2) % 1000);
+ this.sf.setValue('/carLoad', res.approvedLoad.slice(0, -2) % 1000);
}
if(this.carNo === '') {
this.carNo = res.number