补充缺失文件

src/views/shop/shopOrder/components/orderInfo.vue

@@ -1,18 +1,28 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal
-    :width="`80%`"
+  <a-drawer
+    :width="`65%`"
     :visible="visible"
     :confirm-loading="loading"
     :maxable="maxAble"
     :title="isUpdate ? '编辑订单' : '订单详情'"
     :body-style="{ paddingBottom: '8px', background: '#f3f3f3' }"
     @update:visible="updateVisible"
-    :maskClosable="false"
     :footer="null"
     @ok="save"
   >
-    <a-card style="margin-bottom: 20px" :bordered="false">
+    <template #extra>
+      <a-space>
+        <a-button
+          type="primary"
+          @click="save"
+          :loading="loading"
+        >发货
+        </a-button>
+        <a-button @click="updateVisible(false)" danger>取消订单</a-button>
+      </a-space>
+    </template>
+    <a-card title="基本信息" style="margin-bottom: 20px" :bordered="false">
       <a-descriptions :column="3">
         <!-- 第一排-->
         <a-descriptions-item
@@ -217,13 +227,13 @@
           <a-tag v-if="form.isSettled == 1" color="green">已结算</a-tag>
         </a-descriptions-item>
 
-<!--        <a-descriptions-item span="3">-->
-<!--          <a-divider/>-->
-<!--        </a-descriptions-item>-->
+        <!--        <a-descriptions-item span="3">-->
+        <!--          <a-divider/>-->
+        <!--        </a-descriptions-item>-->
 
       </a-descriptions>
     </a-card>
-    <a-card class="order-card" :bordered="false">
+    <a-card title="商品信息" style="margin-bottom: 20px" :bordered="false">
       <a-spin :spinning="loading">
         <a-table
           :data-source="orderGoods"
@@ -232,7 +242,16 @@
         />
       </a-spin>
     </a-card>
-  </ele-modal>
+    <a-card title="收货信息" style="margin-bottom: 20px" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-table
+          :data-source="orderGoods"
+          :columns="columns"
+          :pagination="false"
+        />
+      </a-spin>
+    </a-card>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -466,7 +485,7 @@ const columns = ref<ColumnItem[]>([
     title: '金额',
     dataIndex: 'price',
     align: 'center',
-    customRender: ({ record }) => {
+    customRender: ({record}) => {
       return `￥${record.price || 0}`;
     }
   },
@@ -474,7 +493,7 @@ const columns = ref<ColumnItem[]>([
     title: '数量',
     dataIndex: 'quantity',
     align: 'center',
-    customRender: ({ record }) => {
+    customRender: ({record}) => {
       return record.quantity || 1;
     }
   },
@@ -488,7 +507,7 @@ const columns = ref<ColumnItem[]>([
     title: '是否免费',
     dataIndex: 'isFree',
     align: 'center',
-    customRender: ({ record }) => {
+    customRender: ({record}) => {
       return record.isFree ? '是' : '否';
     }
   }

src/views/shop/shopOrder/index.vue

@@ -38,8 +38,8 @@
               </template>
           </template>
           <template v-if="column.key === 'payStatus'">
-            <a-tag v-if="record.payStatus == 1" color="green" @click="updatePayStatus(record)">已付款</a-tag>
-            <a-tag v-if="record.payStatus == 0" @click="updatePayStatus(record)">未付款</a-tag>
+            <a-tag v-if="record.payStatus == 1" color="green" @click.stop="updatePayStatus(record)" class="cursor-pointer">已付款</a-tag>
+            <a-tag v-if="record.payStatus == 0" @click.stop="updatePayStatus(record)" class="cursor-pointer">未付款</a-tag>
             <a-tag v-if="record.payStatus == 3">未付款,占场中</a-tag>
           </template>
           <template v-if="column.key === 'image'">
@@ -103,6 +103,7 @@ import type {
 } from 'ele-admin-pro/es/ele-pro-table/types';
 import Search from './components/search.vue';
 import {getPageTitle} from "@/utils/common";
+import { toDateString } from 'ele-admin-pro';
 import OrderInfo from './components/orderInfo.vue';
 import {ShopOrder, ShopOrderParam} from "@/api/shop/shopOrder/model";
 import {pageShopOrder, repairOrder} from "@/api/shop/shopOrder";
@@ -204,7 +205,8 @@ const columns = ref<ColumnItem[]>([
     align: 'center',
     width: 180,
     sorter: true,
-    ellipsis: true
+    ellipsis: true,
+    customRender: ({ text }) => toDateString(text)
   },
   // {
   //   title: '操作',
@@ -266,11 +268,11 @@ const customRow = (record: ShopOrder) => {
   return {
     // 行点击事件
     onClick: () => {
-      // console.log(record);
+      openEdit(record);
     },
     // 行双击事件
     onDblclick: () => {
-      openEdit(record);
+      // openEdit(record);
     }
   };
 };