Hwf 2 тижнів тому
батько
коміт
8fb9f260eb

+ 2 - 2
src/components/Chart/index.vue

@@ -17,11 +17,11 @@ const props = defineProps({
   },
   chartClick: Function,
   legendChange: {
-    type:Function,
+    type: Function,
     required: false,
     default: () => {}
   }
-})
+});
 const emits = defineEmits(['ready', 'click']);
 
 // 渲染容器

+ 1 - 0
src/views/commodityManage/index.vue

@@ -84,6 +84,7 @@ const queryFormRef = ref();
 const queryParams = reactive({
   name: '',
   serviceClass: '',
+  serviceStatus: '',
   page: 1,
   page_size: 10
 });

+ 60 - 86
src/views/orderList/index.vue

@@ -39,13 +39,17 @@
         </el-col>
       </el-row>
       <!-- 表格组件 -->
-      <el-table ref="multipleTable" v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table ref="multipleTable" v-loading="loading" :data="dataList">
         <el-table-column label="订单编号" align="center" prop="id" />
         <el-table-column label="提交时间" align="center" prop="submissionTime" />
         <el-table-column label="用户账号" align="center" prop="userAccount" />
-        <el-table-column label="订单金额" align="center" prop="orderAmount" />
+        <el-table-column label="退款金额" align="center" prop="orderAmount">
+          <template #default="scope">
+            <div v-if="scope.row.orderAmount">¥{{ scope.row.orderAmount }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="支付方式" align="center" prop="paymentMethod" />
-        <el-table-column label="商品分类" align="center" prop="category" />
+        <el-table-column label="商品类" align="center" prop="category" />
         <el-table-column label="订单状态" align="center" prop="orderStatus" />
         <el-table-column label="接口状态" align="center" prop="status" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -95,76 +99,68 @@ const filterItems = [
   { label: '已完成', value: 'completed', sum: 1 },
   { label: '已退款', value: 'refunded', sum: 1 }
 ];
-// 表格数据
-const originalData = [
-  {
-    id: 'DD20230515001',
-    submissionTime: '2023-05-15 09:30:45',
-    userAccount: 'user_zhangsan',
-    orderAmount: '¥258.00',
-    paymentMethod: '微信支付',
-    category: '电子产品',
-    orderStatus: '待签署',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515002',
-    submissionTime: '2023-05-15 10:15:22',
-    userAccount: 'user_lisi',
-    orderAmount: '¥599.00',
-    paymentMethod: '支付宝',
-    category: '家居用品',
-    orderStatus: '待付款',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515003',
-    submissionTime: '2023-05-15 13:45:18',
-    userAccount: 'user_wangwu',
-    orderAmount: '¥1299.00',
-    paymentMethod: '银联云闪付',
-    category: '家用电器',
-    orderStatus: '已取消',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515004',
-    submissionTime: '2023-05-15 15:20:33',
-    userAccount: 'user_zhaoliu',
-    orderAmount: '¥89.00',
-    paymentMethod: '微信支付',
-    category: '食品饮料',
-    orderStatus: '已完成',
-    status: '已关闭'
-  },
-  {
-    id: 'DD20230515005',
-    submissionTime: '2023-05-15 18:05:07',
-    userAccount: 'user_qianqi',
-    orderAmount: '¥1999.00',
-    paymentMethod: '支付宝',
-    category: '数码产品',
-    orderStatus: '已退款',
-    status: '异常'
-  }
-];
+const dataList = ref([]);
 // 加载中
 const loading = ref(false);
 // 总数
 const total = ref(0);
-// 表格选中的所有id
-const ids = ref([]);
-// 表格选中一个
-const single = ref(true);
-// 表格选中多个
-const multiple = ref(true);
-// 选中行的数据
-const selectedRow = ref(null);
 
 // 获取数据
 const getList = () => {
   loading.value = true;
   const query = addDateRange2(queryParams, value1.value, 'startTime', 'endTime');
+  dataList.value = [
+    {
+      id: 'DD20230515001',
+      submissionTime: '2023-05-15 09:30:45',
+      userAccount: 'user_zhangsan',
+      orderAmount: '258.00',
+      paymentMethod: '微信支付',
+      category: '电子产品',
+      orderStatus: '待签署',
+      status: '正常'
+    },
+    {
+      id: 'DD20230515002',
+      submissionTime: '2023-05-15 10:15:22',
+      userAccount: 'user_lisi',
+      orderAmount: '599.00',
+      paymentMethod: '支付宝',
+      category: '家居用品',
+      orderStatus: '待付款',
+      status: '正常'
+    },
+    {
+      id: 'DD20230515003',
+      submissionTime: '2023-05-15 13:45:18',
+      userAccount: 'user_wangwu',
+      orderAmount: '1299.00',
+      paymentMethod: '银联云闪付',
+      category: '家用电器',
+      orderStatus: '已取消',
+      status: '正常'
+    },
+    {
+      id: 'DD20230515004',
+      submissionTime: '2023-05-15 15:20:33',
+      userAccount: 'user_zhaoliu',
+      orderAmount: '89.00',
+      paymentMethod: '微信支付',
+      category: '食品饮料',
+      orderStatus: '已完成',
+      status: '已关闭'
+    },
+    {
+      id: 'DD20230515005',
+      submissionTime: '2023-05-15 18:05:07',
+      userAccount: 'user_qianqi',
+      orderAmount: '1999.00',
+      paymentMethod: '支付宝',
+      category: '数码产品',
+      orderStatus: '已退款',
+      status: '异常'
+    }
+  ];
   setTimeout(() => {
     loading.value = false;
   }, 500);
@@ -194,28 +190,6 @@ const cancelOrder = (id) => {
   });
 };
 
-// 多选框选中数据
-const handleSelectionChange = (selection) => {
-  ids.value = selection.map((item) => item.reportId);
-  selectedRow.value = selection.length === 1 ? selection[0] : null;
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-const dataList = computed(() => {
-  if (queryParams.activeFilter === 'all') {
-    return originalData;
-  }
-  const statusMap = {
-    'pending_sign': '待签署',
-    'pending_payment': '待付款',
-    'cancelled': '已取消',
-    'completed': '已完成',
-    'refunded': '已退款'
-  };
-  return originalData.filter((item) => item.orderStatus === statusMap[queryParams.activeFilter]);
-});
-
 const handleFilterChange = (value) => {
   queryParams.activeFilter = value;
   // 这里可以添加根据筛选条件重新获取数据的逻辑

+ 74 - 112
src/views/orderList/refundHistory.vue

@@ -7,10 +7,12 @@
           <el-form-item label="输入搜索:" prop="name">
             <el-input v-model="queryParams.name" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="收货人:" prop="consignee">
-            <el-input v-model="queryParams.consignee" placeholder="请输入用户账号" clearable @keyup.enter="handleQuery" />
+          <el-form-item label="处理状态:" prop="refundStatus">
+            <el-select v-model="queryParams.refundStatus" clearable>
+              <el-option v-for="item in refund_apply_status" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="商品类型:" prop="submissionTime">
+          <el-form-item label="商品类型:" prop="serviceStatus">
             <el-select v-model="queryParams.serviceStatus" clearable>
               <el-option v-for="item in service_class" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
@@ -39,27 +41,21 @@
         </el-col>
       </el-row>
       <!-- 表格组件 -->
-      <el-table ref="multipleTable" v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table ref="multipleTable" v-loading="loading" :data="dataList">
         <el-table-column label="订单编号" align="center" prop="id" />
-        <el-table-column label="提交时间" align="center" prop="submissionTime" />
+        <el-table-column label="申请时间" align="center" prop="submissionTime" />
         <el-table-column label="用户账号" align="center" prop="userAccount" />
-        <el-table-column label="订单金额" align="center" prop="orderAmount" />
-        <el-table-column label="支付方式" align="center" prop="paymentMethod" />
-        <el-table-column label="商品分类" align="center" prop="category" />
-        <el-table-column label="订单状态" align="center" prop="orderStatus" />
-        <el-table-column label="接口状态" align="center" prop="status" />
+        <el-table-column label="退款金额" align="center" prop="orderAmount">
+          <template #default="scope">
+            <div v-if="scope.row.orderAmount">¥{{ scope.row.orderAmount }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" align="center" prop="category" />
+        <el-table-column label="申请状态" align="center" prop="status" />
+        <el-table-column label="处理时间" align="center" prop="time" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <!-- 待签署和待付款状态显示取消订单 -->
-            <el-text v-if="['待签署', '待付款'].includes(scope.row.orderStatus)" class="common-btn-text-danger" @click="cancelOrder(scope.row.id)">
-              取消订单
-            </el-text>
-
-            <!-- 已完成状态显示查看详情 -->
-            <el-text v-if="scope.row.orderStatus === '已完成'" class="common-btn-text-primary" @click="viewDetails(scope.row)"> 查看详情 </el-text>
-
-            <!-- 已退款和已取消状态不显示操作按钮 -->
-            <span v-if="['已退款', '已取消'].includes(scope.row.orderStatus)">-</span>
+            <el-text class="common-btn-text-primary" @click="viewDetails(scope.row)"> 查看详情 </el-text>
           </template>
         </el-table-column>
       </el-table>
@@ -75,89 +71,29 @@ import OrderDetails from '@/views/orderList/orderDetails.vue';
 import { addDateRange2 } from '@/utils/ruoyi.js';
 
 const { proxy } = getCurrentInstance();
-const { refund_apply_status } = toRefs(proxy?.useDict('refund_apply_status'));
+const { service_class, refund_apply_status } = toRefs(proxy?.useDict('service_class', 'refund_apply_status'));
 const queryFormRef = ref();
 const value1 = ref([]);
 // 搜索条件
 const queryParams = reactive({
   name: '',
-  serviceClass: '',
+  refundStatus: '',
   serviceStatus: '',
   page: 1,
   page_size: 10,
-  activeFilter: 'all'
+  activeFilter: ''
 });
 const filterItems = [
-  { label: '全部申请', value: 'all', sum: 3 },
+  { label: '全部申请', value: '', sum: 3 },
   { label: '待处理', value: '0', sum: 1 },
   { label: '已处理', value: '1', sum: 1 },
   { label: '已拒绝', value: '2', sum: 1 }
 ];
-// 表格数据
-const originalData = [
-  {
-    id: 'DD20230515001',
-    submissionTime: '2023-05-15 09:30:45',
-    userAccount: 'user_zhangsan',
-    orderAmount: '¥258.00',
-    paymentMethod: '微信支付',
-    category: '电子产品',
-    orderStatus: '待签署',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515002',
-    submissionTime: '2023-05-15 10:15:22',
-    userAccount: 'user_lisi',
-    orderAmount: '¥599.00',
-    paymentMethod: '支付宝',
-    category: '家居用品',
-    orderStatus: '待付款',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515003',
-    submissionTime: '2023-05-15 13:45:18',
-    userAccount: 'user_wangwu',
-    orderAmount: '¥1299.00',
-    paymentMethod: '银联云闪付',
-    category: '家用电器',
-    orderStatus: '已取消',
-    status: '正常'
-  },
-  {
-    id: 'DD20230515004',
-    submissionTime: '2023-05-15 15:20:33',
-    userAccount: 'user_zhaoliu',
-    orderAmount: '¥89.00',
-    paymentMethod: '微信支付',
-    category: '食品饮料',
-    orderStatus: '已完成',
-    status: '已关闭'
-  },
-  {
-    id: 'DD20230515005',
-    submissionTime: '2023-05-15 18:05:07',
-    userAccount: 'user_qianqi',
-    orderAmount: '¥1999.00',
-    paymentMethod: '支付宝',
-    category: '数码产品',
-    orderStatus: '已退款',
-    status: '异常'
-  }
-];
+
 // 加载中
 const loading = ref(false);
 // 总数
 const total = ref(0);
-// 表格选中的所有id
-const ids = ref([]);
-// 表格选中一个
-const single = ref(true);
-// 表格选中多个
-const multiple = ref(true);
-// 选中行的数据
-const selectedRow = ref(null);
 
 // 获取数据
 const getList = () => {
@@ -165,6 +101,58 @@ const getList = () => {
   const query = addDateRange2(queryParams, value1.value, 'startTime', 'endTime');
   setTimeout(() => {
     loading.value = false;
+    dataList.value = [
+      {
+        id: 'DD20230515001',
+        submissionTime: '2023-05-15 09:30:45',
+        userAccount: 'user_zhangsan',
+        orderAmount: '¥258.00',
+        paymentMethod: '微信支付',
+        category: '电子产品',
+        orderStatus: '待签署',
+        status: '正常'
+      },
+      {
+        id: 'DD20230515002',
+        submissionTime: '2023-05-15 10:15:22',
+        userAccount: 'user_lisi',
+        orderAmount: '¥599.00',
+        paymentMethod: '支付宝',
+        category: '家居用品',
+        orderStatus: '待付款',
+        status: '正常'
+      },
+      {
+        id: 'DD20230515003',
+        submissionTime: '2023-05-15 13:45:18',
+        userAccount: 'user_wangwu',
+        orderAmount: '¥1299.00',
+        paymentMethod: '银联云闪付',
+        category: '家用电器',
+        orderStatus: '已取消',
+        status: '正常'
+      },
+      {
+        id: 'DD20230515004',
+        submissionTime: '2023-05-15 15:20:33',
+        userAccount: 'user_zhaoliu',
+        orderAmount: '¥89.00',
+        paymentMethod: '微信支付',
+        category: '食品饮料',
+        orderStatus: '已完成',
+        status: '已关闭'
+      },
+      {
+        id: 'DD20230515005',
+        submissionTime: '2023-05-15 18:05:07',
+        userAccount: 'user_qianqi',
+        orderAmount: '¥1999.00',
+        paymentMethod: '支付宝',
+        category: '数码产品',
+        orderStatus: '已退款',
+        status: '异常'
+      }
+    ];
   }, 500);
 };
 
@@ -186,33 +174,7 @@ const resetQuery = () => {
   getList();
 };
 
-const cancelOrder = (id) => {
-  proxy?.$modal.confirm('确定要取消订单吗?').then(() => {
-
-  });
-};
-
-// 多选框选中数据
-const handleSelectionChange = (selection) => {
-  ids.value = selection.map((item) => item.reportId);
-  selectedRow.value = selection.length === 1 ? selection[0] : null;
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-const dataList = computed(() => {
-  if (queryParams.activeFilter === 'all') {
-    return originalData;
-  }
-  const statusMap = {
-    'pending_sign': '待签署',
-    'pending_payment': '待付款',
-    'cancelled': '已取消',
-    'completed': '已完成',
-    'refunded': '已退款'
-  };
-  return originalData.filter((item) => item.orderStatus === statusMap[queryParams.activeFilter]);
-});
+const dataList = ref([]);
 
 const handleFilterChange = (value) => {
   queryParams.activeFilter = value;