hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
pull/1/head
胡锐 2 years ago
parent 7821421839
commit f9f4fc692f
4 changed files with 83 additions and 43 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
  2. 20
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
  3. 22
      src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html
  4. 22
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html

62
src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
Unescape View File

@ -37,6 +37,38 @@
</div> </div>
<div nz-row *ngIf="isCollapse"> <div nz-row *ngIf="isCollapse">
<div nz-col nzSpan="8" *ngIf="roleType == 0 || roleType == 1">
<nz-form-item>
<nz-form-label [nzSpan]="8">分公司</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="companyId">
<nz-option *ngFor="let item of companyArray" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">卡券编码</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="couponKey" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">卡券来源</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="couponSource">
<nz-option *ngFor="let item of couponSourceArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">支付卡号</nz-form-label> <nz-form-label [nzSpan]="8">支付卡号</nz-form-label>
@ -67,7 +99,7 @@
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">订单状态</nz-form-label> <nz-form-label [nzSpan]="8">订单状态</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="status"> <nz-select nzAllowClear formControlName="orderStatus">
<nz-option nzValue="1" nzLabel="待支付"></nz-option> <nz-option nzValue="1" nzLabel="待支付"></nz-option>
<nz-option nzValue="2" nzLabel="已支付"></nz-option> <nz-option nzValue="2" nzLabel="已支付"></nz-option>
<nz-option nzValue="3" nzLabel="已完成"></nz-option> <nz-option nzValue="3" nzLabel="已完成"></nz-option>
@ -138,10 +170,13 @@
[nzScroll]="{ x: '1100px'}"> [nzScroll]="{ x: '1100px'}">
<thead> <thead>
<tr> <tr>
<th nzWidth="200px" *ngIf="roleType == 0 || roleType == 1">分公司</th>
<th nzWidth="200px">交易单号</th> <th nzWidth="200px">交易单号</th>
<th nzWidth="120px">客户电话</th> <th nzWidth="120px">客户电话</th>
<th nzWidth="150px">卡券编码</th>
<th nzWidth="200px">卡券名称</th> <th nzWidth="200px">卡券名称</th>
<th nzWidth="100px">卡券面值</th> <th nzWidth="100px">卡券面值</th>
<th nzWidth="140px">卡券来源</th>
<th nzWidth="100px">订单总额</th> <th nzWidth="100px">订单总额</th>
<th nzWidth="100px">总优惠</th> <th nzWidth="100px">总优惠</th>
<th nzWidth="110px">优惠券优惠</th> <th nzWidth="110px">优惠券优惠</th>
@ -160,10 +195,13 @@
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of basicTable.data;let i = index"> <tr *ngFor="let data of basicTable.data;let i = index">
<td *ngIf="roleType == 0 || roleType == 1">{{data.companyName}}</td>
<td>{{data.orderNo}}</td> <td>{{data.orderNo}}</td>
<td>{{data.memPhone}}</td> <td>{{data.memPhone}}</td>
<td>{{data.couponKey}}</td>
<td>{{data.couponName}}</td> <td>{{data.couponName}}</td>
<td>￥{{data.couponPrice}}</td> <td>￥{{data.couponPrice}}</td>
<td>{{data.couponSource}}</td>
<td>￥{{data.totalPrice}}</td> <td>￥{{data.totalPrice}}</td>
<td>￥{{data.totalDeductionPrice}}</td> <td>￥{{data.totalDeductionPrice}}</td>
<td>￥{{data.deductionCouponPrice}}</td> <td>￥{{data.deductionCouponPrice}}</td>
@ -230,14 +268,8 @@
<nz-tab nzTitle="交易时间"> <nz-tab nzTitle="交易时间">
<nz-card> <nz-card>
<nz-timeline> <nz-timeline>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null"> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
<p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@ -245,21 +277,23 @@
</nz-card> </nz-card>
</nz-tab> </nz-tab>
<nz-tab nzTitle="产品信息"> <nz-tab nzTitle="产品信息">
<nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true"> <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
<thead> <thead>
<tr> <tr>
<th nzWidth="110px">订单编号</th>
<th nzWidth="60px">产品类型</th> <th nzWidth="60px">产品类型</th>
<th nzWidth="150px">产品名称</th> <th nzWidth="150px">产品名称</th>
<th nzWidth="80px">产品规格</th> <th nzWidth="80px">产品规格</th>
<th nzWidth="20px">数量</th> <th nzWidth="60px">数量</th>
<th nzWidth="20px">单价</th> <th nzWidth="60px">单价</th>
<th nzWidth="20px">总价</th> <th nzWidth="60px">总价</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of childOrder.data"> <tr *ngFor="let data of childOrder.data">
<td>{{ data.childOrderNo}}</td>
<td>{{ data.goodsType | orderChildGoodsType}}</td> <td>{{ data.goodsType | orderChildGoodsType}}</td>
<td> <td nzEllipsis>
{{ data.goodsName }} {{ data.goodsName }}
<nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag> <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
</td> </td>

20
src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
Unescape View File

@ -8,6 +8,7 @@ import {ADMIN_INFO_OBJECT} from '../../../../services/local-storage.namespace';
import {environment} from '../../../../../environments/environment'; import {environment} from '../../../../../environments/environment';
import {OrderManageService} from '../../../../services/order/order-manage.service'; import {OrderManageService} from '../../../../services/order/order-manage.service';
import {OrderCouponService} from '../../../../services/order/order-coupon.service'; import {OrderCouponService} from '../../../../services/order/order-coupon.service';
import {CompanyService} from '../../../../services/company.service';
@Component({ @Component({
selector: 'app-order-coupon-list', selector: 'app-order-coupon-list',
@ -32,8 +33,6 @@ export class OrderCouponListComponent implements OnInit {
whereObject: any = {}; whereObject: any = {};
isCollapse = false; isCollapse = false;
positionTypeArray = [];
orderDetailModal = false; orderDetailModal = false;
orderDetailModalLoading = false; orderDetailModalLoading = false;
orderDetailObject: any = { orderDetailObject: any = {
@ -41,12 +40,16 @@ export class OrderCouponListComponent implements OnInit {
gasOrder: {}, gasOrder: {},
}; };
couponSourceArray = [];
companyArray = [];
constructor(private modal: NzModalService, constructor(private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private store: LocalStorageService, private store: LocalStorageService,
private orderManageService: OrderManageService, private orderManageService: OrderManageService,
private orderCouponService: OrderCouponService, private orderCouponService: OrderCouponService,
private commonsService: CommonsService, private commonsService: CommonsService,
private companyService: CompanyService,
private router: Router, private router: Router,
private form: FormBuilder) { private form: FormBuilder) {
this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType); this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
@ -56,15 +59,26 @@ export class OrderCouponListComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.searchForm = this.form.group({ this.searchForm = this.form.group({
companyId: [null],
orderNo: [null], orderNo: [null],
memPhone: [null], memPhone: [null],
couponKey: [null],
couponSource: [null],
couponName: [null], couponName: [null],
payType: [null], payType: [null],
status: [null], orderStatus: [null],
createTime: [null], createTime: [null],
payTime: [null], payTime: [null],
finishTime: [null], finishTime: [null],
}); });
this.companyService.selectCompanyList({pageNum: 1, pageSize: 100}, data => {
this.companyArray = data['return_data']['list'];
});
this.commonsService.getDictionary("COUPON_SOURCE", data => {
this.couponSourceArray = data['return_data'];
});
this.requestData(1); this.requestData(1);
} }

22
src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html
Unescape View File

@ -185,14 +185,8 @@
<nz-tab nzTitle="交易时间"> <nz-tab nzTitle="交易时间">
<nz-card> <nz-card>
<nz-timeline> <nz-timeline>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null"> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
<p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@ -200,21 +194,23 @@
</nz-card> </nz-card>
</nz-tab> </nz-tab>
<nz-tab nzTitle="产品信息"> <nz-tab nzTitle="产品信息">
<nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true"> <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
<thead> <thead>
<tr> <tr>
<th nzWidth="110px">订单编号</th>
<th nzWidth="60px">产品类型</th> <th nzWidth="60px">产品类型</th>
<th nzWidth="150px">产品名称</th> <th nzWidth="150px">产品名称</th>
<th nzWidth="80px">产品规格</th> <th nzWidth="80px">产品规格</th>
<th nzWidth="20px">数量</th> <th nzWidth="60px">数量</th>
<th nzWidth="20px">单价</th> <th nzWidth="60px">单价</th>
<th nzWidth="20px">总价</th> <th nzWidth="60px">总价</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of childOrder.data"> <tr *ngFor="let data of childOrder.data">
<td>{{ data.childOrderNo}}</td>
<td>{{ data.goodsType | orderChildGoodsType}}</td> <td>{{ data.goodsType | orderChildGoodsType}}</td>
<td> <td nzEllipsis>
{{ data.goodsName }} {{ data.goodsName }}
<nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag> <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
</td> </td>

22
src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
Unescape View File

@ -324,14 +324,8 @@
<nz-tab nzTitle="交易时间"> <nz-tab nzTitle="交易时间">
<nz-card> <nz-card>
<nz-timeline> <nz-timeline>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null"> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
<p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item> <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@ -339,21 +333,23 @@
</nz-card> </nz-card>
</nz-tab> </nz-tab>
<nz-tab nzTitle="产品信息"> <nz-tab nzTitle="产品信息">
<nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true"> <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
<thead> <thead>
<tr> <tr>
<th nzWidth="110px">订单编号</th>
<th nzWidth="60px">产品类型</th> <th nzWidth="60px">产品类型</th>
<th nzWidth="150px">产品名称</th> <th nzWidth="150px">产品名称</th>
<th nzWidth="80px">产品规格</th> <th nzWidth="80px">产品规格</th>
<th nzWidth="20px">数量</th> <th nzWidth="60px">数量</th>
<th nzWidth="20px">单价</th> <th nzWidth="60px">单价</th>
<th nzWidth="20px">总价</th> <th nzWidth="60px">总价</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of childOrder.data"> <tr *ngFor="let data of childOrder.data">
<td>{{ data.childOrderNo}}</td>
<td>{{ data.goodsType | orderChildGoodsType}}</td> <td>{{ data.goodsType | orderChildGoodsType}}</td>
<td> <td nzEllipsis>
{{ data.goodsName }} {{ data.goodsName }}
<nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag> <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
</td> </td>

Write Preview
Loading…
Cancel
Save