commit
f00d261234
@ -0,0 +1,94 @@ |
||||
<!-- start 面包屑 --> |
||||
<app-breadcrumb></app-breadcrumb> |
||||
<!-- end 面包屑 --> |
||||
|
||||
<!--条件搜索--> |
||||
<div class="inner-content"> |
||||
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)"> |
||||
<div nz-row> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">优惠券包名称</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="title"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">用户电话</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="phone"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">订单号</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="recordNo"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">类型</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear formControlName="salesType" nzPlaceHolder="请选择类型"> |
||||
<nz-option nzLabel="售卖" nzValue="1"></nz-option> |
||||
<nz-option nzLabel="赠送" nzValue="2"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
</div> |
||||
|
||||
<div nz-row> |
||||
<div nz-col nzSpan="24" class="search-button"> |
||||
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button> |
||||
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button> |
||||
</div> |
||||
</div> |
||||
</form> |
||||
</div> |
||||
|
||||
|
||||
<div class="inner-content"> |
||||
<span>共计 {{total}} 条数据</span> |
||||
|
||||
<nz-table |
||||
class="table" |
||||
#ajaxTable |
||||
nzShowSizeChanger |
||||
[nzFrontPagination]="false" |
||||
[nzData]="requestData" |
||||
[nzLoading]="loading" |
||||
[nzTotal]="total" |
||||
[(nzPageIndex)]="pageNum" |
||||
[(nzPageSize)]="pageSize" |
||||
[nzScroll]="{ x: '1200px' }" |
||||
(nzPageIndexChange)="getRequest(false , searchForm.value)" |
||||
(nzPageSizeChange)="getRequest(false , searchForm.value)"> |
||||
<thead nzSingleSort> |
||||
<tr> |
||||
<th nzWidth="50px">编号</th> |
||||
<th nzWidth="150px">优惠券标题</th> |
||||
<th nzWidth="70px">用户电话</th> |
||||
<th nzWidth="70px">订单号</th> |
||||
<th nzWidth="70px">销售类型</th> |
||||
<th nzWidth="100px">创建时间</th> |
||||
</tr> |
||||
</thead> |
||||
<tbody> |
||||
<tr *ngFor="let data of ajaxTable.data; let i = index"> |
||||
<td>{{i+1}}</td> |
||||
<td>{{data.discountPackageTitle}}</td> |
||||
<td>{{data.ext1}}</td> |
||||
<td>{{data.recordNo}}</td> |
||||
<td>{{data.salesType == 1 ? '售卖' : '赠送'}}</td> |
||||
<td>{{data.createdTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||
</tbody> |
||||
</nz-table> |
||||
</div> |
||||
|
||||
|
||||
@ -0,0 +1,80 @@ |
||||
import { Component, OnInit } from '@angular/core'; |
||||
import {environment} from '../../../../environments/environment'; |
||||
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; |
||||
import {CompanyService} from '../../../services/company.service'; |
||||
import {ActivateService} from '../../../services/activate.service'; |
||||
import {IconService} from '../../../services/icon.service'; |
||||
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; |
||||
import {Router} from '_@angular_router@9.0.7@@angular/router'; |
||||
import {CommonsService} from '../../../services/commons.service'; |
||||
import {DiscountPackageService} from '../../../services/discount-package.service'; |
||||
|
||||
@Component({ |
||||
selector: 'app-order-list', |
||||
templateUrl: './order-list.component.html', |
||||
styleUrls: ['./order-list.component.scss'] |
||||
}) |
||||
export class OrderListComponent implements OnInit { |
||||
|
||||
WEB_SERVE_URL = environment.imageUrl; |
||||
searchForm: FormGroup; // 搜索框
|
||||
requestData = []; // 列表数据
|
||||
total: number; // 页码
|
||||
pageNum = 1; // 页码
|
||||
pageSize = 10; // 条码
|
||||
loading = true; |
||||
listOfData = []; |
||||
isVisible = false; |
||||
id: number; |
||||
num: number; |
||||
constructor( |
||||
private form: FormBuilder, |
||||
private company: CompanyService, |
||||
private activate: ActivateService, |
||||
private iconService: IconService, |
||||
private message: NzMessageService, |
||||
private router: Router, |
||||
private discountPackage: DiscountPackageService, |
||||
) { |
||||
} |
||||
|
||||
ngOnInit(): void { |
||||
this.init(); |
||||
} |
||||
|
||||
public init(): void { |
||||
this.searchForm = this.form.group({ |
||||
title: [null], |
||||
phone: [null], |
||||
recordNo: [null], |
||||
saleType: [null], |
||||
}); |
||||
this.getRequest(true, this.searchForm.value); |
||||
|
||||
} |
||||
|
||||
// 查询列表
|
||||
public getRequest(reset: boolean = false, whereObject: object) { |
||||
|
||||
this.loading = false; |
||||
if (reset) { |
||||
this.pageNum = 1; |
||||
} |
||||
whereObject['pageNum'] = this.pageNum; |
||||
whereObject['pageSize'] = this.pageSize; |
||||
this.discountPackage.getDiscountPackageOrderList(whereObject, data => { |
||||
if (data['return_code'] === '000000') { |
||||
this.requestData = data['return_data'].list; |
||||
this.total = data['return_data'].total; |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
// 重置
|
||||
public resetForm(): void { |
||||
this.searchForm.reset(); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,182 @@ |
||||
<!-- start 面包屑 --> |
||||
<app-breadcrumb></app-breadcrumb> |
||||
<!-- end 面包屑 --> |
||||
|
||||
<!--条件搜索--> |
||||
<div class="inner-content"> |
||||
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)"> |
||||
<div nz-row> |
||||
<div nz-col nzSpan="8" *ngIf="roleType === 1"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">区域公司</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear [formControlName]="'companyId'" (ngModelChange)="getMerchantListByCompany($event)"> |
||||
<nz-option *ngFor="let item of companyData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8" *ngIf="roleType === 5 || roleType === 1"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">商户</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear [formControlName]="'merchantId'"> |
||||
<nz-option *ngFor="let item of merchantData" nzValue="{{item.id}}" nzLabel="{{item.merchantName}}"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">订单号</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="orderNo"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">商品名称</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="memDiscountName"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">用户电话</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<input nz-input formControlName="memPhone"/> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">支付模式</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear formControlName="payModel" nzPlaceHolder="请选择支付模式"> |
||||
<nz-option nzLabel="金币支付" nzValue="1"></nz-option> |
||||
<nz-option nzLabel="第三方支付" nzValue="2"></nz-option> |
||||
<nz-option nzLabel="混合支付" nzValue="3"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">支付方式</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear formControlName="payType" nzPlaceHolder="请选择支付模式"> |
||||
<nz-option nzLabel="支付宝" nzValue="1"></nz-option> |
||||
<nz-option nzLabel="微信" nzValue="2"></nz-option> |
||||
<nz-option nzLabel="金币" nzValue="3"></nz-option> |
||||
<nz-option nzLabel="工会卡" nzValue="4"></nz-option> |
||||
<nz-option nzLabel="银联" nzValue="5"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">状态</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="orderStatus"> |
||||
<nz-option nzLabel="待支付" nzValue="1"></nz-option> |
||||
<nz-option nzLabel="已支付" nzValue="2"></nz-option> |
||||
<nz-option nzLabel="已完成" nzValue="3"></nz-option> |
||||
<nz-option nzLabel="已退款" nzValue="4"></nz-option> |
||||
<nz-option nzLabel="已取消" nzValue="5"></nz-option> |
||||
<nz-option nzLabel="退款中" nzValue="6"></nz-option> |
||||
<nz-option nzLabel="退款失败" nzValue="7"></nz-option> |
||||
</nz-select> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
<div nz-col nzSpan="8"> |
||||
<nz-form-item> |
||||
<nz-form-label [nzSpan]="6">时间区间</nz-form-label> |
||||
<nz-form-control [nzSpan]="16"> |
||||
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="payTime"></nz-range-picker> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</div> |
||||
</div> |
||||
|
||||
<div nz-row> |
||||
<div nz-col nzSpan="24" class="search-button"> |
||||
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button> |
||||
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button> |
||||
</div> |
||||
</div> |
||||
</form> |
||||
</div> |
||||
|
||||
|
||||
<div class="inner-content"> |
||||
<span>共计 {{total}} 条数据</span> |
||||
<div class="operating-button"> |
||||
<button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button> |
||||
</div> |
||||
<nz-table |
||||
class="table" |
||||
#ajaxTable |
||||
nzShowSizeChanger |
||||
[nzFrontPagination]="false" |
||||
[nzData]="requestData" |
||||
[nzLoading]="loading" |
||||
[nzTotal]="total" |
||||
[(nzPageIndex)]="pageNum" |
||||
[(nzPageSize)]="pageSize" |
||||
[nzScroll]="{ x: '1200px' }" |
||||
(nzPageIndexChange)="getRequest(false , searchForm.value)" |
||||
(nzPageSizeChange)="getRequest(false , searchForm.value)"> |
||||
<thead nzSingleSort> |
||||
<tr> |
||||
<th nzWidth="50px">编号</th> |
||||
<th nzWidth="180px">商品名称</th> |
||||
<th nzWidth="180px">订单来源</th> |
||||
<th nzWidth="180px">订单类型</th> |
||||
<th nzWidth="180px">订单号</th> |
||||
<th nzWidth="180px">支付流水号</th> |
||||
<th nzWidth="120px">客户名称</th> |
||||
<th nzWidth="130px">客户电话</th> |
||||
<th nzWidth="110px">支付模式</th> |
||||
<th nzWidth="100px">支付方式</th> |
||||
<th nzWidth="100px">支付金额</th> |
||||
<th nzWidth="140px">生成时间</th> |
||||
<th nzWidth="140px">支付时间</th> |
||||
<th nzWidth="140px">取消时间</th> |
||||
<th nzRight nzWidth="100px">状态</th> |
||||
</tr> |
||||
</thead> |
||||
<tbody> |
||||
<tr *ngFor="let data of ajaxTable.data; let i = index"> |
||||
<td>{{i+1}}</td> |
||||
<td>{{data.goodsName}}</td> |
||||
<td>{{data.giveawayType}}</td> |
||||
<td>{{data.goodsType}}</td> |
||||
<td>{{data.orderNo}}</td> |
||||
<td>{{data.paySerialNo}}</td> |
||||
<td>{{data.memName == null ? '暂无': data.memName}}</td> |
||||
<td>{{data.memPhone == null ? '暂无': data.memPhone}}</td> |
||||
<td>{{data.payModel}}</td> |
||||
<td>{{data.payType}}</td> |
||||
<td>{{data.payPrice}}</td> |
||||
<td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> |
||||
<td>{{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> |
||||
<td>{{data.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> |
||||
<td nzRight>{{data.orderStatus}}</td> |
||||
</tbody> |
||||
</nz-table> |
||||
</div> |
||||
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" nzTitle="退款理由" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()"> |
||||
<nz-form-item> |
||||
<nz-form-label>退款理由</nz-form-label> |
||||
<nz-form-control> |
||||
<textarea [(ngModel)]="refundContent" nz-input rows="2" placeholder="请输入退款理由"></textarea> |
||||
</nz-form-control> |
||||
</nz-form-item> |
||||
</nz-modal> |
||||
|
||||
@ -0,0 +1,192 @@ |
||||
import { Component, OnInit } from '@angular/core'; |
||||
import {environment} from '../../../../environments/environment'; |
||||
import {FormBuilder, FormGroup} from '@angular/forms'; |
||||
import {MerchantService} from '../../../services/merchant.service'; |
||||
import {IconService} from '../../../services/icon.service'; |
||||
import {NzMessageService} from 'ng-zorro-antd'; |
||||
import {Router} from '@angular/router'; |
||||
import {CommonsService} from '../../../services/commons.service'; |
||||
import {OrderService} from '../../../services/order.service'; |
||||
import {CompanyService} from '../../../services/company.service'; |
||||
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; |
||||
import {LocalStorageService} from '../../../services/local-storage.service'; |
||||
|
||||
@Component({ |
||||
selector: 'app-dicount-package-order-list', |
||||
templateUrl: './dicount-package-order-list.component.html', |
||||
styleUrls: ['./dicount-package-order-list.component.scss'] |
||||
}) |
||||
export class DicountPackageOrderListComponent implements OnInit { |
||||
|
||||
WEB_SERVE_URL = environment.baseUrl; |
||||
FILE_URL = environment.imageUrl; |
||||
searchForm: FormGroup; // 搜索框
|
||||
requestData = []; // 列表数据
|
||||
companyData = []; // 列表数据
|
||||
merchantData = []; // 列表数据
|
||||
total: number; // 页码
|
||||
pageNum = 1; // 页码
|
||||
pageSize = 10; // 条码
|
||||
loading = true; |
||||
id: number; // 订单ID
|
||||
isVisible = false; |
||||
refundContent: string; |
||||
roleType: number; |
||||
constructor( |
||||
private form: FormBuilder, |
||||
private order: OrderService, |
||||
private iconService: IconService, |
||||
private message: NzMessageService, |
||||
private router: Router, |
||||
private company: CompanyService, |
||||
private merchant: MerchantService, |
||||
private store: LocalStorageService, // 数据请求
|
||||
private common: CommonsService |
||||
) { |
||||
} |
||||
|
||||
ngOnInit(): void { |
||||
this.init(); |
||||
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole']['roleType']; |
||||
const whereObject = {}; |
||||
whereObject['pageNum'] = 1; |
||||
whereObject['pageSize'] = 10000; |
||||
this.company.selectCompanyList(whereObject, data => { |
||||
if (data['return_code'] === '000000') { |
||||
this.companyData = data['return_data'].list; |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
if (this.roleType === 5) { |
||||
this.getMerchantListByCompany(this.store.get(ADMIN_INFO_OBJECT)['bsCompany']['id']); |
||||
} else { |
||||
this.getMerchantListByCompany(this.searchForm.value.companyId); |
||||
} |
||||
|
||||
} |
||||
|
||||
public init(): void { |
||||
this.searchForm = this.form.group({ |
||||
companyId: [null], |
||||
merchantId: [null], |
||||
orderNo: [null], |
||||
paySerialNo: [null], |
||||
payModel: [null], |
||||
payType: [null], |
||||
memDiscountName: [null], |
||||
memPhone: [null], |
||||
orderStatus: [null], |
||||
payTime: [null] |
||||
}); |
||||
this.getRequest(true, this.searchForm.value); |
||||
} |
||||
|
||||
// 查询列表
|
||||
public getRequest(reset: boolean = false, whereObject: object) { |
||||
|
||||
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { |
||||
whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); |
||||
whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); |
||||
} |
||||
|
||||
|
||||
this.loading = false; |
||||
if (reset) { |
||||
this.pageNum = 1; |
||||
} |
||||
whereObject['pageNum'] = this.pageNum; |
||||
whereObject['pageSize'] = this.pageSize; |
||||
this.order.getDiscountPackageList(whereObject, data => { |
||||
if (data['return_code'] === '000000') { |
||||
this.requestData = data['return_data'].list; |
||||
this.total = data['return_data'].total; |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
// 查询商户
|
||||
public getMerchantListByCompany(companyId: number): void { |
||||
this.merchant.getMerchantListByCompany(companyId, data => { |
||||
if (data['return_code'] === '000000') { |
||||
if (data['return_code'] === '000000') { |
||||
this.merchantData = data['return_data']; |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
// 重置
|
||||
public resetForm(): void { |
||||
this.searchForm.reset(); |
||||
} |
||||
|
||||
|
||||
// 查看详情
|
||||
public getDetail(id: number): void { |
||||
this.router.navigate(['/admin/order/order-detail'], { |
||||
queryParams: { |
||||
merchantId: id |
||||
} |
||||
}).then(r => console.log(r)); |
||||
} |
||||
|
||||
// 下载模板
|
||||
downloadTemplate(whereObject) { |
||||
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { |
||||
whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); |
||||
whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); |
||||
} |
||||
this.order.exportDiscountPackageList(whereObject, data => { |
||||
if (data['return_code'] === '000000') { |
||||
window.location.href = this.FILE_URL + data['return_data']; |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
provinceChange(e) { |
||||
console.log(e); |
||||
} |
||||
|
||||
// 退款
|
||||
public orderToRefund(id): void { |
||||
|
||||
} |
||||
|
||||
showModal(id): void { |
||||
this.id = id; |
||||
this.isVisible = true; |
||||
} |
||||
|
||||
handleOk(): void { |
||||
this.common.showConfirm('确认订单是否退款', item => { |
||||
if (item) { |
||||
const params = { |
||||
orderId: this.id , |
||||
refundContent: this.refundContent |
||||
}; |
||||
this.order.refuelingOrderRefund(params, data => { |
||||
if (data['return_code'] === '000000') { |
||||
this.getRequest(false, this.searchForm.value); |
||||
this.isVisible = false; |
||||
this.message.success('退款成功'); |
||||
} else { |
||||
this.message.error(data['return_msg']); |
||||
} |
||||
}); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
handleCancel(): void { |
||||
this.isVisible = false; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue