From e32644a8bf35dc095f0d33f5cae416c07edfa865 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 28 Apr 2021 00:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E7=90=86=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/admin/orderManage/orderManage.html  | 28 +++++++------------
 public/pages/admin/orderManage/orderManage.js |  6 ++--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/public/pages/admin/orderManage/orderManage.html b/public/pages/admin/orderManage/orderManage.html
index 11fe871c5..6035b270b 100755
--- a/public/pages/admin/orderManage/orderManage.html
+++ b/public/pages/admin/orderManage/orderManage.html
@@ -58,32 +58,24 @@
                     >
                         <thead>
                         <tr>
-                            <th class="text-center">应用ID</th>
-                            <th class="text-center">订单ID</th>
-                            <th class="text-center">订单类型</th>
-                            <th class="text-center">extTransactionId</th>
-                            <th class="text-center">请求时间</th>
+                            <th class="text-center">应用名称</th>
+                            <th class="text-center">业务名称</th>
+                            <th class="text-center">订单编号</th>
+                            <th class="text-center">外部编号</th>
+                            <th class="text-center">受理时间</th>
                             <th class="text-center">操作人</th>
-                            <th class="text-center">创建时间</th>
+                            <th class="text-center">状态</th>
                         </tr>
                         </thead>
                         <tbody>
                         <tr v-for="order in orderManageInfo.orderDataVos">
-                            <td class="text-center">{{order.appId}}</td>
+                            <td class="text-center">{{order.appName}}</td>
+                            <td class="text-center">{{order.name}}</td>
                             <td class="text-center">{{order.oId}}</td>
-                            <td class="text-center">{{order.orderTypeCdName}}</td>
                             <td class="text-center">{{order.extTransactionId}}</td>
-                            <td class="text-center">{{order.requestTime}}</td>
-                            <td class="text-center">{{order.userName}}</td>
                             <td class="text-center">{{order.createTime}}</td>
-                            <td class="text-right">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openOrderDetailModel(order)">订单明细
-                                    </button>
-                                </div>
-                            </td>
-
+                            <td class="text-center">{{order.userName}}</td>
+                            <td class="text-center">{{order.statusCd}}</td>
                         </tr>
                         </tbody>
                         <tfoot>
diff --git a/public/pages/admin/orderManage/orderManage.js b/public/pages/admin/orderManage/orderManage.js
index 31a563460..2f8681e4f 100755
--- a/public/pages/admin/orderManage/orderManage.js
+++ b/public/pages/admin/orderManage/orderManage.js
@@ -43,10 +43,8 @@
                                 var _orderManageInfo=JSON.parse(json);
                                 vc.component.orderManageInfo.total = _orderManageInfo.total;
                                 vc.component.orderManageInfo.records = _orderManageInfo.records;
-                                vc.component.orderManageInfo.orderDataVos = _orderManageInfo.corderDataVos;
-                                vc.component.orderManageInfo.orderDataVos.map(item=>{
-                                    item.requestTime=item.requestTime.substring(0,4)+"-"+item.requestTime.substring(4,6)+"-"+item.requestTime.substring(6,8)+"  "+item.requestTime.substring(8,10)+":"+item.requestTime.substring(10,12)+":"+item.requestTime.substring(12,14)
-                                })
+                                vc.component.orderManageInfo.orderDataVos = _orderManageInfo.data;
+                                
                                 vc.emit('pagination','init',{
                                      total:vc.component.orderManageInfo.records,
                                      currentPage:_page