From 413076cd5691803aaf3425b951f9e915858040cd Mon Sep 17 00:00:00 2001
From: hu177768073 <177768073@qq.com>
Date: Mon, 23 Sep 2024 09:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gas-order-receipt/gas-order-receipt.component.html    | 8 ++++++++
 .../gas-order-receipt/gas-order-receipt.component.ts      | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.html b/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.html
index 4e7bc54..878a313 100644
--- a/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.html
+++ b/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.html
@@ -37,6 +37,14 @@
         </nz-form-control>
       </nz-form-item>
     </div>
+    <div nz-col [nzSpan]="6">
+      <nz-form-item>
+        <nz-form-label>油站</nz-form-label>
+        <nz-form-control>
+          <input nz-input formControlName="merName" placeholder="请输入" />
+        </nz-form-control>
+      </nz-form-item>
+    </div>
     <div nz-col [nzSpan]="24" class="search-area">
       <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">查询</button>
       <button nz-button (click)="searchFormReset()">重置</button>
diff --git a/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.ts b/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.ts
index f2072b8..a142fa8 100644
--- a/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.ts
+++ b/src/app/pages/trade/gas-order-receipt/gas-order-receipt.component.ts
@@ -128,6 +128,7 @@ export class GasOrderReceiptComponent {
     this.searchForm = this.fb.group({
       orderNo: [''],
       contactsPhone: [''],
+      merName: [''],
       status: [''],
       createTimeArray: [[]],
       createTimeSelect: ['1'],