Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-26 21:14:53 +08:00
parent 15b1ce3601
commit 5e593b9ec7
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-21 09:26:45 * @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-26 20:52:29 * @LastEditTime : 2022-04-26 21:06:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -145,23 +145,24 @@ export class ParterRebateManageMentAddComponent implements OnInit {
} }
save() { save() {
console.log(this.configName); console.log(this.configName);
if(!this.configName) { // if(!this.configName) {
this.service.msgSrv.warning('请输入配置名称！'); // this.service.msgSrv.warning('请输入配置名称！');
return // return
} // }
if(!this.accountingRate) { // if(!this.accountingRate) {
this.service.msgSrv.warning('请输入固定结算费率！'); // this.service.msgSrv.warning('请输入固定结算费率！');
return // return
} // }
if(!this.partnerType) { // if(!this.partnerType) {
this.service.msgSrv.warning('请选择合伙人范围！'); // this.service.msgSrv.warning('请选择合伙人范围！');
return // return
} // }
if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { // if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
this.service.msgSrv.warning('请选择合伙人！'); // this.service.msgSrv.warning('请选择合伙人！');
return // return
} // }
this.partnerPeopleList.forEach((element: any) => { this.table.data.forEach((element: any) => {
console.log(element);
}); });
const params = { const params = {
@ -175,12 +176,12 @@ export class ParterRebateManageMentAddComponent implements OnInit {
remarke: this.remarke, remarke: this.remarke,
partnerType: this.partnerType partnerType: this.partnerType
}; };
this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { // this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
if (res) { // if (res) {
this.service.msgSrv.success('新增成功！'); // this.service.msgSrv.success('新增成功！');
this.router.navigate(['/partner/rebate/setting']); // this.router.navigate(['/partner/rebate/setting']);
} // }
}); // });
} }
initData(id:string) { initData(id:string) {
this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, {id: id}).subscribe((res: any) => { this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, {id: id}).subscribe((res: any) => {

9
src/app/routes/vehicle/components/list/edit/edit.component.ts
View File

@ -56,7 +56,8 @@ export class VehicleComponentsListEditComponent implements OnInit {
// 依据类型初始表单 // 依据类型初始表单
this.schema = { this.schema = {
properties: { properties: {
carProtocal: { carProtocal: { title: '', type: 'string', ui: { hidden: true } },
carProtocalWatermark: {
type: 'string', type: 'string',
title: '车主申明/挂靠协议', title: '车主申明/挂靠协议',
ui: { ui: {
@ -72,6 +73,11 @@ export class VehicleComponentsListEditComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
}, },
name: 'multipartFile', name: 'multipartFile',
change: args => {
if (args.type === 'success') {
this.sf.setValue('/carProtocal', args.fileList[0].response.data.fullFilePath);
}
},
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
return new Observable((observer: Observer<boolean>) => { return new Observable((observer: Observer<boolean>) => {
const isLt1M = file.size / 1024 / 1024 < 5; const isLt1M = file.size / 1024 / 1024 < 5;
@ -114,6 +120,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
const params ={ const params ={
carProtocal: this.sf.value.carProtocal, carProtocal: this.sf.value.carProtocal,
carProtocalWatermark: this.sf.value.carProtocalWatermark,
id: this.i.id id: this.i.id
} }
this.service.request(this.service.$api_get_upLoadCarProtocal, params).subscribe((res) => { this.service.request(this.service.$api_get_upLoadCarProtocal, params).subscribe((res) => {