From 5e0edcf639fd5b1f2fc9fa11e9325a60281de91c Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 23 Aug 2024 10:47:33 +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

---
 .../order-after-sales.component.html          | 58 ++++++++++++++-----
 .../order-after-sales.component.ts            |  7 +++
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.html b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
index 961bf1f..d5c3768 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.html
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
@@ -1,5 +1,16 @@
 <form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
   <div nz-row [nzGutter]="24">
+    <div nz-col [nzSpan]="24">
+      <nz-form-item>
+        <nz-form-label>申请时间</nz-form-label>
+        <nz-form-control>
+          <nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
+          <nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
+            <label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
+          </nz-radio-group>
+        </nz-form-control>
+      </nz-form-item>
+    </div>
     <div nz-col [nzSpan]="6">
       <nz-form-item>
         <nz-form-label>用户手机号</nz-form-label>
@@ -27,6 +38,24 @@
       </nz-form-item>
     </div>
     <div nz-col [nzSpan]="6">
+      <nz-form-item>
+        <nz-form-label>售后状态</nz-form-label>
+        <nz-form-control>
+          <nz-select nzSize="large" formControlName="status" nzAllowClear [nzPlaceHolder]="'请选择'">
+            <nz-option *ngFor="let item of applyStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+          </nz-select>
+        </nz-form-control>
+      </nz-form-item>
+    </div>
+    <div nz-col [nzSpan]="6" [hidden]="!isCollapse">
+      <nz-form-item>
+        <nz-form-label>交易单号</nz-form-label>
+        <nz-form-control>
+          <input  nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" />
+        </nz-form-control>
+      </nz-form-item>
+    </div>
+    <div nz-col [nzSpan]="6" [hidden]="!isCollapse">
       <nz-form-item>
         <nz-form-label>商品单号</nz-form-label>
         <nz-form-control>
@@ -34,36 +63,37 @@
         </nz-form-control>
       </nz-form-item>
     </div>
-    <div nz-col [nzSpan]="6">
+    <div nz-col [nzSpan]="6" [hidden]="!isCollapse">
       <nz-form-item>
-        <nz-form-label>状态</nz-form-label>
+        <nz-form-label>产品类型</nz-form-label>
         <nz-form-control>
-          <nz-select nzSize="large" formControlName="status" nzAllowClear [nzPlaceHolder]="'请选择'">
-            <nz-option *ngFor="let item of applyStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+          <nz-select nzSize="large" formControlName="productType" nzAllowClear [nzPlaceHolder]="'请选择'">
+            <nz-option *ngFor="let item of orderChildProductType" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
     </div>
-    <div nz-col [nzSpan]="18">
+    <div nz-col [nzSpan]="6" [hidden]="!isCollapse">
       <nz-form-item>
-        <nz-form-label>创建时间</nz-form-label>
+        <nz-form-label>产品名称</nz-form-label>
         <nz-form-control>
-          <nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
-          <nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
-            <label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
-          </nz-radio-group>
+          <input  nzSize="large" nz-input formControlName="productName" 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>
+      <a class="collapse" (click)="isCollapse = !isCollapse">
+        更多查询条件
+        <i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i>
+      </a>
     </div>
   </div>
 </form>
 
 <nz-table #basicTable
-          [nzScroll]="{ x: '1500px' }"
+          [nzScroll]="{ x: '2200px' }"
           [nzBordered]="true"
           [nzFrontPagination]="false"
           [nzShowQuickJumper]="true"
@@ -77,10 +107,11 @@
     <th nzWidth="150px">申请单号</th>
     <th nzWidth="100px">申请类型</th>
     <th nzWidth="130px">用户手机号</th>
+    <th nzWidth="150px">交易单号</th>
     <th nzWidth="150px">商品单号</th>
     <th nzWidth="100px">产品类型</th>
-    <th nzWidth="200px">产品名称</th>
-    <th nzWidth="100px">产品规格</th>
+    <th nzWidth="250px">产品名称</th>
+    <th nzWidth="200px">产品规格</th>
     <th nzWidth="100px">申请数量</th>
     <th nzWidth="150px">申请时间</th>
     <th nzWidth="100px">状态</th>
@@ -92,6 +123,7 @@
     <td>{{data.applyNo}}</td>
     <td>{{data.type | dictionary: 'ORDER_AFTER_SALES_APPLY_TYPE'}}</td>
     <td>{{data.userPhone}}</td>
+    <td>{{data.orderNo}}</td>
     <td>{{data.childOrderNo}}</td>
     <td>{{data.productType | dictionary: 'ORDER_CHILD_PRODUCT_TYPE'}}</td>
     <td>{{data.productName}}</td>
diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.ts b/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
index 60665eb..80a6183 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
@@ -111,6 +111,8 @@ export class OrderAfterSalesComponent {
   applyStatusArray = new DictionaryPipe().getDictionaryList('ORDER_AFTER_SALES_APPLY_STATUS');
   // 申请类型
   applyTypeArray = new DictionaryPipe().getDictionaryList('ORDER_AFTER_SALES_APPLY_TYPE');
+  // 产品类型
+  orderChildProductType = new DictionaryPipe().getDictionaryList('ORDER_CHILD_PRODUCT_TYPE');
   // 申请详情模态框
   applyDetailVisible = false;
   // 申请详情数据
@@ -121,6 +123,8 @@ export class OrderAfterSalesComponent {
   applyAuditForm: FormGroup;
   // 申请审核模态框
   applyAuditVisible = false;
+  // 更多查询条件
+  isCollapse = false;
   constructor(private fb: NonNullableFormBuilder,
               private orderAfterSalesService : OrderAfterSalesService,
               private message: NzMessageService,
@@ -132,6 +136,9 @@ export class OrderAfterSalesComponent {
       childOrderNo: [''],
       applyNo: [''],
       status: [''],
+      productType: [''],
+      productName: [''],
+      orderNo: [''],
       createTimeArray: [[]],
       createTimeSelect: ['1'],
       createTimeS: [''],