修改了一些bug

2024-11-05 20:34:10 +08:00 · 2024-11-05 20:34:10 +08:00 · 6bd1d4f49f
commit 6bd1d4f49f
parent 393e3d9dc9 8bdd2ab425
2 changed files with 57 additions and 66 deletions
--- a/src/views/Orders/OrderList.vue
+++ b/src/views/Orders/OrderList.vue
@ -54,15 +54,6 @@
        <el-button size="small" @click="showDetail(scope.$index, scope.row , 0)">
          详情
        </el-button>
-        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
-                       title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
-          <template #reference>
-            <el-button  class="ml-5" type="danger">删除</el-button>
-          </template>
-        </el-popconfirm>
-        <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
-                       title="您确定删除吗？">
-        </el-popconfirm>
      </template>
    </el-table-column>
  </el-table>
--- a/src/views/Orders/orderOperations.vue
+++ b/src/views/Orders/orderOperations.vue
@ -1,61 +1,61 @@
-<template>
-<!--<div>-->
-<!--  <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"-->
-<!--            v-model="id"></el-input>-->
-<!--  <el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>-->
-<!--  <el-button type="warning" @click="reset" style="height:25px">重置</el-button>-->
-<!--</div>-->
-<!--  <div style="margin: 15px 0">-->
-<!--    <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"-->
-<!--                   title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>-->
-<!--      <template #reference>-->
-<!--        <el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">-->
-<!--          <Remove />-->
-<!--        </el-icon></el-button>-->
-<!--      </template>-->
-<!--    </el-popconfirm>-->
-<!--  </div>-->
-<!--  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"-->
-<!--            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"-->
-<!--            :header-cell-style="{ 'text-align': 'center' }">-->
-<!--    <el-table-column type="selection" width="55"></el-table-column>-->
-<!--    <el-table-column prop="id" label="订单id" width="80"></el-table-column>-->
-<!--    <el-table-column prop="" label="购买商品名称"></el-table-column>-->
-<!--    <el-table-column prop="" label="购买数量" width="180"></el-table-column>-->
-<!--    <el-table-column prop="totalAmount" label="订单总金额"></el-table-column>-->
-<!--    <el-table-column prop="" label="下单时间"></el-table-column>-->
-<!--    <el-table-column prop="" label="快递单号"></el-table-column>-->
-<!--    <el-table-column prop="orderStatus" label="订单状态"></el-table-column>-->
-<!--    <el-table-column label="操作" width="250px">-->
-<!--      <template #default="scope">-->
-<!--        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">-->
-<!--          编辑-->
-<!--        </el-button>-->
-<!--        <el-button plain @click="dialogFormVisible = true">-->
-<!--          发货-->
-<!--        </el-button>-->
-<!--        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"-->
-<!--                       title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>-->
-<!--          <template #reference>-->
-<!--            <el-button  class="ml-5" type="danger">取消订单</el-button>-->
-<!--          </template>-->
-<!--        </el-popconfirm>-->
-<!--        <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"-->
-<!--                       title="您确定删除吗？">-->
-<!--        </el-popconfirm>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--  </el-table>-->
-<!--  <div style="padding: 10px 0">-->
-<!--    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
-<!--                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"-->
-<!--                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"-->
-<!--                   :total="total" />-->
-<!--  </div>-->
+ <template>
+<div>
+  <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"
+            v-model="id"></el-input>
+  <el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>
+  <el-button type="warning" @click="reset" style="height:25px">重置</el-button>
+</div>
+  <div style="margin: 15px 0">
+    <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
+                   title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
+      <template #reference>
+        <el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">
+          <Remove />
+        </el-icon></el-button>
+      </template>
+    </el-popconfirm>
+  </div>
+  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
+            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+            :header-cell-style="{ 'text-align': 'center' }">
+    <el-table-column type="selection" width="55"></el-table-column>
+    <el-table-column prop="id" label="订单id" width="80"></el-table-column>
+    <el-table-column prop="goodSnapshot.name" label="商品名称"></el-table-column>
+    <el-table-column prop="quantity" label="购买数量" width="180"></el-table-column>
+    <el-table-column prop="totalAmount" label="订单总金额"></el-table-column>
+    <el-table-column prop="createTime" label="下单时间"></el-table-column>
+    <el-table-column prop="orderNumber" label="快递单号"></el-table-column>
+    <el-table-column prop="orderStatus" label="订单状态"></el-table-column>
+    <el-table-column label="操作" width="250px">
+      <template #default="scope">
+        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
+          编辑
+        </el-button>
+        <el-button plain @click="dialogFormVisible = true">
+          发货
+        </el-button>
+        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
+                       title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
+          <template #reference>
+            <el-button  class="ml-5" type="danger">取消订单</el-button>
+          </template>
+        </el-popconfirm>
+        <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+                       title="您确定删除吗？">
+        </el-popconfirm>
+      </template>
+    </el-table-column>
+  </el-table>
+  <div style="padding: 10px 0">
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+                   :total="total" />
+  </div>
 <!--  <el-dialog v-model="dialogFormVisible" title="Shipping address" width="500">-->
-<!--    <el-form :model=" null">-->
+<!--    <el-form :model="">-->
 <!--      <el-form-item label="快递单号" :label-width="formLabelWidth">-->
-<!--        <el-input v-model=" null" autocomplete="off" />-->
+<!--        <el-input v-model=" " autocomplete="off" />-->
 <!--      </el-form-item>-->
 <!--    </el-form>-->
 <!--    <template #footer>-->
@ -67,7 +67,7 @@
 <!--      </div>-->
 <!--    </template>-->
 <!--  </el-dialog>-->
-</template>
+<!--</template>-->

 <!--<script lang="ts" setup>-->
 <!--import {ref} from "vue";-->