+ |
+ {{data.sourceType | dictionary: "MER_SOURCE_TYPE"}} |
+ {{data.chainBrandName?data.chainBrandName:'无'}} |
{{data.merNo}} |
{{data.merName}} |
- {{data.directorName}} |
- {{data.directorTel}} |
- {{data.opUserName}} |
- {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
- {{data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
+ {{data.provinceName+"/"+data.cityName+"/"+data.areaName}} |
+ {{data.status | dictionary: "MERCHANT_STATUS"}} |
详情
- 修改资料
-
更多
diff --git a/src/app/pages/merchant/mer-list/mer-list.component.less b/src/app/pages/merchant/mer-list/mer-list.component.less
index 37076bc..6e50626 100644
--- a/src/app/pages/merchant/mer-list/mer-list.component.less
+++ b/src/app/pages/merchant/mer-list/mer-list.component.less
@@ -1,9 +1,30 @@
-button {
- margin-left: 8px;
-}
.search-area {
- margin-top: 30px;
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 8px;
}
.submit-btn {
width: 150px;
}
+.collapse {
+ margin-left: 10px;
+}
+.csp-statistic {
+ font-feature-settings: "tnum";
+ border: 1px solid #d9d9d9;
+ border-radius: 4px;
+}
+.csp-statistic-title {
+ padding: 0 16px;
+ height: 64px;
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-align: center;
+ align-items: center;
+ background-color: #fafafa;
+}
+.csp-text-primary{
+ font-size: 20px;
+ color: #1890ff;
+}
diff --git a/src/app/pages/merchant/mer-list/mer-list.component.ts b/src/app/pages/merchant/mer-list/mer-list.component.ts
index 476b739..3b0ce52 100644
--- a/src/app/pages/merchant/mer-list/mer-list.component.ts
+++ b/src/app/pages/merchant/mer-list/mer-list.component.ts
@@ -29,7 +29,12 @@ import {NzAvatarModule} from "ng-zorro-antd/avatar";
import {MerService} from "../../../services/merchant/mer.service";
import {RoleService} from "../../../services/role/role.service";
import {NzImageModule} from "ng-zorro-antd/image";
-
+import {NzSwitchComponent} from "ng-zorro-antd/switch";
+import {DateSelectType} from "../../../utils/dateUtils.service";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+import {CommonService} from "../../../services/common/common.service";
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
@Component({
selector: 'app-mer-list',
standalone: true,
@@ -70,7 +75,14 @@ import {NzImageModule} from "ng-zorro-antd/image";
NzDescriptionsModule,
NzUploadComponent,
NzAvatarModule,
- NzImageModule
+ NzImageModule,
+ NzSwitchComponent,
+ NzDatePickerComponent,
+ NzRadioButtonDirective,
+ NzRadioComponent,
+ NzRadioGroupComponent,
+ NzRangePickerComponent,
+ NzToolTipModule
],
templateUrl: './mer-list.component.html',
styleUrl: './mer-list.component.less'
@@ -80,6 +92,8 @@ export class MerListComponent {
IMAGE_URL = environment.imageUrl;
// 表单页数
tablePageNum = 1;
+ // 每页数量
+ tablePageSize = 10;
// 表单数据
tableData: any = {
total: 0,
@@ -87,7 +101,14 @@ export class MerListComponent {
};
// 搜索表单
searchForm: FormGroup;
-
+ // 更多搜索条件
+ isCollapse = false;
+ // 油站状态
+ merchantStatusArray = new DictionaryPipe().getDictionaryList('MERCHANT_STATUS');
+ // 油站来源
+ merSourceTypeArray = new DictionaryPipe().getDictionaryList('MER_SOURCE_TYPE');
+ // 地区数据
+ regionData: any = []
roleData: any = []
merDetailVisible = false;
merDetailObject: any = {};
@@ -102,12 +123,14 @@ export class MerListComponent {
private merService: MerService,
private roleService: RoleService,
private message: NzMessageService,
+ private commonService: CommonService,
private modal: NzModalService) {
// 初始化搜索框
this.searchForm = this.fb.group({
+ sourceType: [''],
+ provinceCode: [''],
merNo: [''],
merName: [''],
- opUserName: [''],
status: [''],
});
@@ -127,6 +150,10 @@ export class MerListComponent {
this.roleService.queryAllRole((data: any) => {
this.roleData = data['return_data'];
});
+ // 获取地区
+ this.commonService.getRegion("", (data: any) => {
+ this.regionData = data['return_data'];
+ });
this.queryData();
}
@@ -136,9 +163,9 @@ export class MerListComponent {
*/
queryData() {
this.searchForm.value.pageNum = this.tablePageNum;
- this.searchForm.value.pageSize = 10;
+ this.searchForm.value.pageSize = this.tablePageSize;
this.searchForm.value.time = new Date().getTime();
- this.merService.queryList(this.searchForm.value, (data: any) => {
+ this.merService.queryMerList(this.searchForm.value, (data: any) => {
if (data['return_code'] == '000000') {
this.tableData = data['return_data'];
}
@@ -183,6 +210,13 @@ export class MerListComponent {
this.merDetailVisible = false;
}
+ /**
+ * 列表展示
+ */
+ listShowChange(data: boolean) {
+ console.log(data);
+ }
+
/**
* 打开修改商户模态框
* @param merData
@@ -315,4 +349,5 @@ export class MerListComponent {
});
};
+ protected readonly DateSelectType = DateSelectType;
}
diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.html b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
index be150ba..01a73c2 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.html
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
@@ -155,7 +155,7 @@
客户电话
| 加油站 |
加油员 |
- 加油信息 |
- 支付信息 |
+ 加油信息 |
+ 结算信息 |
交易状态 |
创建时间 |
支付时间 |
@@ -190,6 +190,7 @@
油枪号 |
平台折扣 |
平台价 |
+ 优惠价 |
油站价 |
国标价 |
总优惠 |
@@ -198,7 +199,8 @@
服务费 |
应付金额 |
积分抵扣 |
- 实付金额 |
+ 油站结算 |
+ 用户实付 |
支付方式 |
支付单号 |
|
@@ -220,6 +222,7 @@
{{data.gasGunNo}}号枪 |
{{data.gasDiscount != 1?(data.gasDiscount*100).toFixed(2) + '折':'无'}} |
{{data.gasPricePlatform}}元 |
+ {{data.gasPriceVip}}元 |
{{data.gasPriceGun}}元 |
{{data.gasPriceOfficial}}元 |
{{data.totalDeductionPrice}}元 |
@@ -228,6 +231,7 @@
{{data.gasServiceFeePrice}}元 |
{{data.payablePrice}}元 |
{{data.payIntegral / 100}}元 |
+ {{data.gasSettlePrice!=null?data.gasSettlePrice+'元':'未支付'}} |
{{data.actualPayPrice!=null?data.actualPayPrice+'元':'未支付'}} |
{{data.payType | dictionary: 'ORDER_PAY_TYPE'}} |
{{data.paySerialNo}} |
@@ -274,20 +278,22 @@
{{orderDetailObject.gasOrder.gasOilNo}} #
{{orderDetailObject.gasOrder.gasGunNo}} 号枪
- 平台折扣：{{orderDetailObject.gasOrder.gasDiscount != 1?(orderDetailObject.gasOrder.gasDiscount * 100).toFixed(2)+'折':'无'}}
总优惠：{{orderDetailObject.gasOrder.totalDeductionPrice}}元
优惠券优惠：{{orderDetailObject.gasOrder.deductionCouponPrice}}元
加油优惠：{{orderDetailObject.gasOrder.deductionOilPrice}}元
- 积分抵扣：{{orderDetailObject.gasOrder.payIntegral / 100}}元
- 服务费：{{orderDetailObject.gasOrder.gasServiceFeePrice}}元
-
+
+
- {{orderDetailObject.gasOrder.payablePrice}}
- {{orderDetailObject.gasOrder.actualPayPrice}}
+ {{orderDetailObject.gasOrder.gasServiceFeePrice}}元
+ {{orderDetailObject.gasOrder.payIntegral / 100}}元
+ {{orderDetailObject.gasOrder.payablePrice}}
+ {{orderDetailObject.gasOrder.actualPayPrice}}
+ {{orderDetailObject.gasOrder.gasSettlePrice?orderDetailObject.gasOrder.gasSettlePrice:0}}元
+ {{orderDetailObject.gasOrder.gasAgentSettlePrice?orderDetailObject.gasOrder.gasAgentSettlePrice:0}}元
{{orderDetailObject.gasOrder.agentName?orderDetailObject.gasOrder.agentName:'无'}}
diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
index 3219ab8..d559cdf 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
@@ -39,6 +39,7 @@ import {ButtonPipe} from "../../../pipes/common/button.pipe";
import {NzTooltipDirective} from "ng-zorro-antd/tooltip";
import {symlinkSync} from "fs";
import {DateMinutesDiffPipe} from "../../../pipes/common/date-minutes-diff.pipe";
+import {NzDividerModule} from "ng-zorro-antd/divider";
@Component({
selector: 'app-order-oil-list',
@@ -87,7 +88,8 @@ import {DateMinutesDiffPipe} from "../../../pipes/common/date-minutes-diff.pipe"
NzTimelineComponent,
NzBadgeComponent,
NzTooltipDirective,
- DateMinutesDiffPipe
+ DateMinutesDiffPipe,
+ NzDividerModule
],
templateUrl: './order-oil-list.component.html',
styleUrl: './order-oil-list.component.less'
diff --git a/src/app/services/common/common.service.ts b/src/app/services/common/common.service.ts
index 5370216..4b4c147 100644
--- a/src/app/services/common/common.service.ts
+++ b/src/app/services/common/common.service.ts
@@ -28,6 +28,18 @@ export class CommonService {
});
}
+ /**
+ *
+ * 分级查询区域信息
+ * @param regionId 地区id
+ * @param callBack
+ */
+ public getRegion(regionId: string, callBack:any) {
+ this.http.get(environment.baseUrl + 'common/getRegion?regionId=' + regionId).subscribe(data => {
+ callBack(data);
+ });
+ }
+
/**
*
* 查询数据字典
diff --git a/src/app/services/merchant/mer.service.ts b/src/app/services/merchant/mer.service.ts
index 75a5ba5..8379ead 100644
--- a/src/app/services/merchant/mer.service.ts
+++ b/src/app/services/merchant/mer.service.ts
@@ -62,9 +62,9 @@ export class MerService {
* @param params
* @param callBack
*/
- public queryList(params: any, callBack:any) {
+ public queryMerList(params: any, callBack:any) {
params.time = new Date().getTime();
- this.http.get(environment.baseUrl + 'mer/queryList?' + ObjectData.objectByString(params)).subscribe(data => {
+ this.http.get(environment.baseUrl + 'merchant/queryMerList?' + ObjectData.objectByString(params)).subscribe(data => {
callBack(data);
});
}