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

提交代码

Browse Source
pull/1/head
胡锐 3 years ago
parent d1fb8ea504
commit f5550c81bb
5 changed files with 139 additions and 10 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. 97
      src/app/admin/order/oil-station-order/oil-station-order.component.html
  2. 21
      src/app/admin/order/oil-station-order/oil-station-order.component.ts
  3. 22
      src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html
  4. 1
      src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts
  5. 8
      src/environments/environment.ts

97
src/app/admin/order/oil-station-order/oil-station-order.component.html
Unescape View File

@ -76,7 +76,7 @@
(nzPageSizeChange)="getRequest(false , searchForm.value)"> (nzPageSizeChange)="getRequest(false , searchForm.value)">
<thead nzSingleSort> <thead nzSingleSort>
<tr> <tr>
<th nzWidth="50px">编号</th> <th nzWidth="60px">编号</th>
<th nzWidth="200px">订单号</th> <th nzWidth="200px">订单号</th>
<th nzWidth="180px">油站名称</th> <th nzWidth="180px">油站名称</th>
<th nzWidth="90px">类型</th> <th nzWidth="90px">类型</th>
@ -89,8 +89,8 @@
<th nzWidth="90px">支付金额</th> <th nzWidth="90px">支付金额</th>
<th nzWidth="90px">优惠金额</th> <th nzWidth="90px">优惠金额</th>
<th nzWidth="120px">创建时间</th> <th nzWidth="120px">创建时间</th>
<th nzRight nzWidth="90px">状态</th> <th nzRight nzWidth="80px">状态</th>
<th nzWidth="120px" nzRight>操作</th> <th nzWidth="105px" nzRight>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -110,9 +110,14 @@
<td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight>{{data.status | orderCouponStatus}}</td> <td nzRight>{{data.status | orderCouponStatus}}</td>
<td nzRight class="table-td-operation"> <td nzRight class="table-td-operation">
<a (click)="getDetail(data.orderNo)">详情</a> <!-- <a style="float: left;width: 100%;margin-bottom: 10px;" (click)="showPrintModal(data)">打印小票</a>-->
<nz-divider *ngIf="(secUser['objectType'] != 8) && (data.status == 2 || data.status == 3)" nzType="vertical" ></nz-divider> <a nz-dropdown [nzDropdownMenu]="menu">操作列表<i nz-icon nzType="down"></i></a>
<a *ngIf="(secUser['objectType'] != 8) && (data.status == 2 || data.status == 3)" (click)="showModal(data.orderId)">退款</a> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable>
<li nz-menu-item><a (click)="getDetail(data.orderNo)">详情</a></li>
<li nz-menu-item *ngIf="(secUser['objectType'] != 8) && (data.status == 2 || data.status == 3)" ><a (click)="showModal(data.orderId)">退款</a></li>
</ul>
</nz-dropdown-menu>
</td> </td>
</tbody> </tbody>
</nz-table> </nz-table>
@ -153,3 +158,83 @@
</nz-descriptions> </nz-descriptions>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="printModal" nzTitle="订单详情" nzWidth="58mm" [nzBodyStyle]="{ width: '58mm', height: '210mm'}" (nzOnCancel)="closePrintModal()">
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div>
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div> <div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">油站名称</div></div>
<div nz-col class="gutter-row" [nzSpan]="12"><div class="inner-box">{{printData['gasName']}}</div></div>
</div>
</nz-modal>

21
src/app/admin/order/oil-station-order/oil-station-order.component.ts
Unescape View File

@ -36,6 +36,11 @@ export class OilStationOrderComponent implements OnInit {
refundContent: string; refundContent: string;
roleType: number; roleType: number;
secUser: object; secUser: object;
printModal = false;
printData = {};
constructor( constructor(
private form: FormBuilder, private form: FormBuilder,
private order: OrderService, private order: OrderService,
@ -152,4 +157,20 @@ export class OilStationOrderComponent implements OnInit {
} }
}); });
} }
/**
* 打开打印小票模态框
*/
showPrintModal(data: object) {
this.printData = data;
this.printModal = true;
}
/**
* 关闭打印小票模态框
*/
closePrintModal() {
this.printData = {};
this.printModal = false;
}
} }

22
src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html
Unescape View File

@ -72,6 +72,19 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">订单状态</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select formControlName="orderStatus" nzAllowClear>
<nz-option nzValue="3" nzLabel="已完成"></nz-option>
<nz-option nzValue="4" nzLabel="已退款"></nz-option>
<nz-option nzValue="6" nzLabel="退款中"></nz-option>
<nz-option nzValue="7" nzLabel="退款驳回"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
</div> </div>
<div nz-row> <div nz-row>
@ -117,6 +130,8 @@
<th nzWidth="100px">团油枪价</th> <th nzWidth="100px">团油枪价</th>
<th nzWidth="170px">创建时间</th> <th nzWidth="170px">创建时间</th>
<th nzWidth="170px">支付时间</th> <th nzWidth="170px">支付时间</th>
<th nzWidth="100px">订单状态</th>
<th nzWidth="170px">退款时间</th>
<th nzWidth="110px" nzRight="0px">操作</th> <th nzWidth="110px" nzRight="0px">操作</th>
</tr> </tr>
</thead> </thead>
@ -139,6 +154,13 @@
<td>{{data.gasPriceGun}}元</td> <td>{{data.gasPriceGun}}元</td>
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</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.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>
<span *ngIf="data.orderStatus == 3">已完成</span>
<span *ngIf="data.orderStatus == 4">已退款</span>
<span *ngIf="data.orderStatus == 6">退款中</span>
<span *ngIf="data.orderStatus == 7">退款驳回</span>
</td>
<td>{{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight="0px" class="table-td-operation"> <td nzRight="0px" class="table-td-operation">
<a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a> <a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a>
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">

1
src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts
Unescape View File

@ -53,6 +53,7 @@ export class TyOrderListComponent implements OnInit {
salesmanId: [null], salesmanId: [null],
memPhone: [null], memPhone: [null],
payTimeArray: [null], payTimeArray: [null],
orderStatus: [null],
}); });
this.requestData(1); this.requestData(1);

8
src/environments/environment.ts
Unescape View File

@ -4,10 +4,10 @@
export const environment = { export const environment = {
production: false, production: false,
baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) /* baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'http://localhost:9302/filesystem/', imageUrl: 'http://localhost:9302/filesystem/',*/
/* baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsg.dctpay.com/filesystem/',*/ imageUrl: 'https://hsg.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
}; };

Write Preview
Loading…
Cancel
Save