diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
index 6eed633e..b39e4913 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-26 20:39:42
+ * @LastEditTime : 2022-04-26 20:44:56
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -23,7 +23,7 @@
固定结算费率配置
- %
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
index f54e605a..2726272e 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-26 20:42:01
+ * @LastEditTime : 2022-04-26 20:52:29
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -145,10 +145,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
}
save() {
console.log(this.configName);
-
if(!this.configName) {
- console.log('4444');
-
this.service.msgSrv.warning('请输入配置名称！');
return
}
@@ -164,6 +161,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.service.msgSrv.warning('请选择合伙人！');
return
}
+ this.partnerPeopleList.forEach((element: any) => {
+
+ });
const params = {
accountingRate: this.accountingRate,
configName: this.configName,
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts
index 5702d767..6f2ec34c 100644
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts
@@ -262,10 +262,19 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
return value;
}
viewEvaluate(item: any) {
- this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(i => {
+ // this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(i => {
+ // this.st.reload();
+ // this.getDetailList();
+ // });
+ console.log(item);
+
+ const params = {
+ imgList: [item.carProtocal],
+ index: 0
+ };
+ this.nzImageService.preview([{ src: item.carProtocal}]);
this.st.reload();
this.getDetailList();
- });
}
updateEvaluate(item: any) {
this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe(i => {
diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts
index 62cb659d..50a20048 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@@ -198,10 +198,14 @@ export class VehicleComponentsListDetailComponent implements OnInit {
*查看评价
*/
viewEvaluate(item: any) {
- this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(() => {
- this.st.reload();
- this.getDetailList();
- });
+ console.log(item);
+ this.st.reload();
+ this.getDetailList();
+ const params = {
+ imgList: [item.carProtocal],
+ index: 0
+ };
+ this.nzImageService.preview([{ src: item.carProtocal}]);
}
/**
*查看评价
diff --git a/src/app/routes/vehicle/components/list/edit/edit.component.ts b/src/app/routes/vehicle/components/list/edit/edit.component.ts
index 0de6585d..95573d49 100644
--- a/src/app/routes/vehicle/components/list/edit/edit.component.ts
+++ b/src/app/routes/vehicle/components/list/edit/edit.component.ts
@@ -61,7 +61,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
title: '车主申明/挂靠协议',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -110,8 +110,10 @@ export class VehicleComponentsListEditComponent implements OnInit {
this.modal.destroy();
}
sure() {
+ console.log(this.sf.value);
+
const params ={
- carProtocal: this.sf.value.carProtocal?.data?.fullFilePath,
+ carProtocal: this.sf.value.carProtocal,
id: this.i.id
}
this.service.request(this.service.$api_get_upLoadCarProtocal, params).subscribe((res) => {
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html
index c1ddf0d6..2380c116 100644
--- a/src/app/shared/components/rebate-table/rebate-table.component.html
+++ b/src/app/shared/components/rebate-table/rebate-table.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-25 20:18:52
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-26 16:58:41
+ * @LastEditTime : 2022-04-26 20:46:19
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -48,7 +48,7 @@
-
@@ -58,7 +58,7 @@
-
+
@@ -66,7 +66,7 @@
|
-
| |