From 0849482d1bd0efa4a6b043970a83e686e1d06a0b Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 15 Nov 2022 14:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 9312c1a..496b751 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -31,6 +31,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      
 
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
@@ -78,9 +79,17 @@
         label="订单编号"
         align="center"
         prop="orderNo"
-        width="190"
+          width="190"
       />
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
+       <el-table-column
+        label="商品名称"
+        align="center"
+        prop="goodsName"
+      
+      />
+     
+      <el-table-column label="订单总金额" align="center" prop="totalPrice" />
+   <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <!-- {{ orderStatus(scope.row.orderStatus) }} -->
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
@@ -125,8 +134,6 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="订单总金额" align="center" prop="totalPrice" />
-
       <el-table-column
         label="下单时间"
         align="center"
@@ -193,7 +200,7 @@
             icon="el-icon-edit"
             @click="seeOrder(scope.row)"
             v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
-            >查看商品信息</el-button
+            >订单详情</el-button
           >
 
           <el-button
@@ -226,7 +233,7 @@
     />
     <!-- 查看商品信息弹框 -->
     <el-dialog
-      title="查看商品信息"
+      title="订单详情"
       :visible.sync="innerorder"
       append-to-body
       width="1200px"
@@ -290,8 +297,8 @@
             style="width: 240px"
           />
         </el-form-item>
-      
-       
+
+
         <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
           <el-input
             v-model="orderList.goodsAttributeName"
@@ -319,7 +326,7 @@
             style="width: 240px"
           />
         </el-form-item> -->
-      
+
         <el-form-item label="订单状态" prop="orderStatus">
           <!-- <el-form-item label="退款类型" prop="refundType">
           <el-input