diff --git a/src/app/pages/body/index/index.component.ts b/src/app/pages/body/index/index.component.ts index 811d45f..1cae0a6 100644 --- a/src/app/pages/body/index/index.component.ts +++ b/src/app/pages/body/index/index.component.ts @@ -22,6 +22,7 @@ import {Dictionary, dictionaryData} from "../../../data/common/dictionary.namesp import {CommonService} from "../../../services/common/common.service"; import {LoginService} from "../../../services/login/login.service"; import {NzConfigService} from "ng-zorro-antd/core/config"; +import {buttonData} from "../../../data/common/button.namespace"; @Component({ selector: 'app-index', @@ -76,6 +77,20 @@ export class IndexComponent { private router: Router, // 路由 private login: LoginService ) { + // 缓存角色按钮权限 + for (let item of this.storage.get(DATA)['button']) { + buttonData.push( + { + menuName: item.menuName, + menuType: item.menuType, + menuUrl: item.menuUrl, + menuUrlImg: item.menuUrlImg, + menuPSid: item.menuPSid, + menuSort: item.menuSort, + menuDesc: item.menuDesc, + } + ); + } // 缓存数据字典 this.commonService.queryDictionary('','',(data: any) => { dictionaryData.length = 0; diff --git a/src/app/pages/login/login/login.component.ts b/src/app/pages/login/login/login.component.ts index 2e11274..e86e249 100644 --- a/src/app/pages/login/login/login.component.ts +++ b/src/app/pages/login/login/login.component.ts @@ -99,20 +99,6 @@ export class LoginComponent { this.storage.set(DATA, data['return_data']['object']); this.storage.set(USER_TOKEN, data['return_data']['token']); this.storage.set(INIT_FLAG, true); - // 缓存角色按钮权限 - for (let item of data['return_data']['object']['button']) { - buttonData.push( - { - menuName: item.menuName, - menuType: item.menuType, - menuUrl: item.menuUrl, - menuUrlImg: item.menuUrlImg, - menuPSid: item.menuPSid, - menuSort: item.menuSort, - menuDesc: item.menuDesc, - } - ); - } this.router.navigateByUrl('/admin/index'); } else { this.message.error(data['return_msg']); 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 3f53c25..fb881c4 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 @@ -57,6 +57,24 @@ +
+ + 渠道 + + + + + + +
+
+ + 渠道单号 + + + + +
客户电话 @@ -126,7 +144,7 @@
代理商 业务员 交易单号 + 渠道 + 渠道单号 客户电话 加油站 加油员 @@ -172,10 +192,13 @@ - + + {{data.agentName?data.agentName:'无'}} {{data.agentStaffName?data.agentStaffName:'无'}} {{data.orderNo}} + {{data.channelType | dictionary: 'MER_SOURCE_TYPE'}} + {{data.channelOrderNo!=null?data.channelOrderNo:'无'}} {{data.userPhone!=null?data.userPhone:'无'}} {{data.merName}} {{data.gasStaffName?data.gasStaffName:'未知'}} @@ -192,7 +215,7 @@ {{data.deductionOilPrice}}元 {{data.payablePrice}}元 {{data.payIntegral / 100}}元 - {{data.actualPayPrice!=null?data.payPrice+'元':'未支付'}} + {{data.actualPayPrice!=null?data.actualPayPrice+'元':'未支付'}} {{data.payType | dictionary: 'ORDER_PAY_TYPE'}} {{data.paySerialNo}} {{data.status | dictionary: 'GAS_ORDER_STATUS'}} @@ -206,7 +229,7 @@ @@ -224,6 +247,8 @@ {{orderDetailObject.gasOrder.merName}} + {{orderDetailObject.gasOrder.channelType | dictionary: 'MER_SOURCE_TYPE'}} + {{orderDetailObject.gasOrder.channelOrderNo?orderDetailObject.gasOrder.channelOrderNo:'无'}} {{orderDetailObject.tradeOrder.orderNo}} {{orderDetailObject.tradeOrder.orderStatus| dictionary: 'GAS_ORDER_STATUS' }} {{orderDetailObject.tradeOrder.payType | dictionary: 'ORDER_PAY_TYPE'}} @@ -254,6 +279,8 @@ {{orderDetailObject.gasOrder.agentStaffName?orderDetailObject.gasOrder.agentStaffName:'无'}} + + {{orderDetailObject.gasOrder.abnormalContent}} @@ -284,7 +311,7 @@ - 退款备注 + 退款备注 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 cc5d4d7..895e84b 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 @@ -36,6 +36,8 @@ import {NzSpinComponent, NzSpinModule} from "ng-zorro-antd/spin"; import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; import {NzBadgeComponent} from "ng-zorro-antd/badge"; import {ButtonPipe} from "../../../pipes/common/button.pipe"; +import {NzTooltipDirective} from "ng-zorro-antd/tooltip"; +import {symlinkSync} from "fs"; @Component({ selector: 'app-order-oil-list', @@ -83,6 +85,7 @@ import {ButtonPipe} from "../../../pipes/common/button.pipe"; NzTimelineItemComponent, NzTimelineComponent, NzBadgeComponent, + NzTooltipDirective, ], templateUrl: './order-oil-list.component.html', styleUrl: './order-oil-list.component.less' @@ -119,6 +122,8 @@ export class OrderOilListComponent { oilNoArray = new DictionaryPipe().getDictionaryList('OIL_NO'); // 支付类型 payTypeArray = new DictionaryPipe().getDictionaryList('ORDER_PAY_TYPE'); + // 渠道 + channelTypeArray = new DictionaryPipe().getDictionaryList('MER_SOURCE_TYPE'); // 账户类型 accountType: number; // 代理商 @@ -154,7 +159,7 @@ export class OrderOilListComponent { this.refundForm = this.fb.group({ orderNo: [{ value: null, disabled: true}, [Validators.required]], childOrderNo: [{ value: null, disabled: true}, [Validators.required]], - remarks: [null], + remarks: [null,[Validators.required]], }); // 初始化搜索框 @@ -164,6 +169,8 @@ export class OrderOilListComponent { orderNo: [''], payType: [''], paySerialNo: [''], + channelType: [''], + channelOrderNo: [''], gasOilNo: [''], gasStaffName: [''], agentId: [''], @@ -183,7 +190,6 @@ export class OrderOilListComponent { // 查询代理商 this.queryAgent(); } - if (this.accountType == 4) { // 查询业务员 this.queryAgentStaff(this.storage.get(DATA)['account']['objectId']); @@ -215,8 +221,8 @@ export class OrderOilListComponent { queryData() { if (this.searchForm.controls['createTimeArray'].value != null && this.searchForm.controls['createTimeArray'].value.length > 0) { - this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); - this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); + this.searchForm.controls['createTimeS'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[0]).getTime()); + this.searchForm.controls['createTimeE'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[1]).getTime()); } else { this.searchForm.controls['createTimeS'].setValue(null); this.searchForm.controls['createTimeE'].setValue(null); @@ -228,6 +234,11 @@ export class OrderOilListComponent { this.orderOilService.queryList(this.searchForm.value, (data: any) => { if (data['return_code'] == '000000') { this.tableData = data['return_data']; + for (let data of this.tableData['list']) { + if (data['abnormal'] == 1) { + data['color'] = 'red'; + } + } } }); // 查询统计 @@ -386,4 +397,5 @@ export class OrderOilListComponent { }) } + }