Merge branch 'main' of http://47.109.205.240:3000/Web/operation-system

src/assets/styles/custom.scss

@@ -218,6 +218,7 @@
   height: 100%;
   left: 0;
   right: 0;
+  min-width: 1000px;
 }
 // 表格组件中的各插槽元素自定义样式
 .custom-tooltip-content {

src/components/tableComponent.vue

@@ -59,6 +59,7 @@
           :label="column.label"
           :width="column.width"
           :align="column.align || 'center'"
+          :fixed="column.fixed ?? false"
           :sortable="column.sortable"
           :header-class-name="column.headerClassName"
         >
@@ -340,7 +341,7 @@ onBeforeUnmount(() => {
 
   /* 自定义鼠标悬停颜色 */
   :deep(.el-table__body tr:hover > td) {
-    background-color: rgba(37, 191, 130, 0.1) !important;
+    background-color: rgba(237 255 248) !important;
   }
 
   /* 自定义表头样式 */

src/router/index.js

@@ -1,3 +1,4 @@
+
 import { createWebHistory, createRouter } from 'vue-router'
 /* Layout */
 import Layout from '@/layout'
@@ -92,16 +93,38 @@ export const constantRoutes = [
         component: () => import('@/views/goods/goodsManage/editGoods'),
         name: 'editGoods',
         meta: { title: '编辑商品', icon: '' }
-      },
-      {
-        path: '/goods/goodsReview/auditGoods/:activeTab?',
-        component: () => import('@/views/goods/goodsReview/auditGoods'),
-        name: 'auditGoods',
-        meta: { title: '审核商品', icon: '' }
       }
     ]
   },
-   {
+  {
+    path: '/order',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'order/sendGoodsInfo/:activeTab?',
+        component: () => import('@/views/order/sendGoodsInfo'),
+        hidden: false,
+        meta: {
+          title: "去发货",
+          icon: "star",
+        },
+        name: "sendGoodsInfo",
+      },
+      {
+        path: 'order/orderDetails/:activeTab?',
+        component: () => import('@/views/order/orderDetails'),
+        hidden: false,
+        meta: {
+          title: "订单详情",
+          icon: "star",
+        },
+        name: "orderDetails",
+      },
+    ]
+  },
+  {
     path: '/user',
     component: Layout,
     hidden: true,
@@ -192,31 +215,7 @@ export const constantRoutes = [
           noCache: false,
           link: null,
         },
-      },
+      }
-      {
-        path: 'goods/contrabandManage',
-        component: () => import('@/views/goods/contrabandManage/index'),
-        name: 'contrabandManage',
-        hidden: false,
-        meta: {
-          title: "违禁物品管理",
-          icon: "",
-          noCache: false,
-          link: null,
-        },
-      },
-      {
-        path: 'goods/goodsReview',
-        component: () => import('@/views/goods/goodsReview/index'),
-        name: 'goodsReview',
-        hidden: false,
-        meta: {
-          title: "上架审核设置",
-          icon: "",
-          noCache: false,
-          link: null,
-        },
-      },
     ],
   },
   {
@@ -328,63 +327,122 @@ export const constantRoutes = [
     name: "brand",
     component: Layout,
     hidden: false,
-    alwaysShow: true,
+    children: [
-    redirect: 'noredirect',
+      {
+        path: 'brand/index',
+        component: () => import('@/views/brand/index'),
+        hidden: false,
+        meta: {
+          title: "公共品牌",
+          icon: "star",
+          noCache: false,
+          link: null,
+        },
+        name: "index",
+      },
+    ],
+  },
+  {
+    path: '/order',
+    name: "order",
+    component: Layout,
+    hidden: false,
     meta: {
-      icon: "money",
+      title: "订单列表",
-      link: null,
+      icon: "documentation",
       noCache: false,
-      title: "公共品牌",
+      link: null,
     },
     children: [
       {
-        path: 'brand/informationManagement',
+        path: 'order/obligation',
-        component: () => import('@/views/brand/informationManagement/index'),
+        component: () => import('@/views/order/obligation'),
         hidden: false,
         meta: {
-          title: "信息管理",
+          title: "待付款",
-          icon: "",
           noCache: false,
           link: null,
         },
-        name: "informationManagement",
+        name: "obligation",
       },
       {
-        path: 'brand/applicationReview',
+        path: 'order/sendGoods',
-        component: () => import('@/views/brand/applicationReview/index'),
+        component: () => import('@/views/order/sendGoods'),
         hidden: false,
         meta: {
-          title: "申请审核",
+          title: "待发货",
-          icon: "",
           noCache: false,
           link: null,
         },
-        name: "applicationReview",
+        name: "sendGoods",
       },
       {
-        path: 'brand/renewal',
+        path: 'order/shipped',
-        component: () => import('@/views/brand/renewal/index'),
+        component: () => import('@/views/order/shipped'),
         hidden: false,
         meta: {
-          title: "申请续期",
+          title: "已发货",
-          icon: "",
           noCache: false,
           link: null,
         },
-        name: "renewal",
+        name: "shipped",
       },
-      // {
+      {
-      //   path: 'brand/management',
+        path: 'order/receivedGoods',
-      //   component: () => import('@/views/brand/management/index'),
+        component: () => import('@/views/order/receivedGoods'),
-      //   hidden: false,
+        hidden: false,
-      //   meta: {
+        meta: {
-      //     title: "品牌使用管理",
+          title: "已收货",
-      //     icon: "",
+          noCache: false,
-      //     noCache: false,
+          link: null,
-      //     link: null,
+        },
-      //   },
+        name: "receivedGoods",
-      //   name: "management",
+      },
-      // },
+      {
+        path: 'order/completed',
+        component: () => import('@/views/order/completed'),
+        hidden: false,
+        meta: {
+          title: "已完成",
+          noCache: false,
+          link: null,
+        },
+        name: "completed",
+      },
+      {
+        path: 'order/cancelled',
+        component: () => import('@/views/order/cancelled'),
+        hidden: false,
+        meta: {
+          title: "已取消",
+          noCache: false,
+          link: null,
+        },
+        name: "cancelled",
+      },
+      {
+        path: 'order/salesService',
+        component: () => import('@/views/order/salesService'),
+        hidden: false,
+        meta: {
+          title: "退货/退款",
+          noCache: false,
+          link: null,
+        },
+        name: "salesService",
+      },
+      {
+        path: 'order/refunded',
+        component: () => import('@/views/order/refunded'),
+        hidden: false,
+        meta: {
+          title: "已退货/退款",
+          noCache: false,
+          link: null,
+        },
+        name: "refunded",
+      },
+
     ],
   },
 ]

src/views/goods/goodsCategory/index.vue

@@ -171,7 +171,7 @@ const columns1 = ref([
   { prop: "level", label: "分类级别", slotName: "level" },
   { prop: "createTime", label: "添加时间" },
   { prop: "status", label: "状态", slotName: "status" },
-  { prop: "action", label: "操作", slotName: "action", width: 150 },
+  { prop: "action", label: "操作", slotName: "action", width: 150,fixed: "right" },
 ]);
 
 // 生成食物主题昵称

src/views/goods/goodsManage/addGoods.vue

@@ -564,6 +564,7 @@ const onGoodSave = async (params) => {
   if (response.code === 200) {
     ElMessage.success("新增成功！");
     formRef.value.resetFields();
+    router.go(-1);
   } else {
     ElMessage.error(response.message);
   }

src/views/goods/goodsManage/editGoods.vue

@@ -554,6 +554,7 @@ const onGoodSave = async (params) => {
   if (response.code === 200) {
     ElMessage.success("编辑成功！");
     formRef.value.resetFields();
+    router.go(-1);
   } else {
     ElMessage.error(response.message);
   }

src/views/goods/goodsManage/seeDetails.vue

@@ -209,7 +209,7 @@
         </el-form-item>
 
       </el-form>
-      <el-button type="primary" @click="approved" style="margin: 10px 0 0 80px;width: 150px;">返回</el-button>
+      <el-button type="primary" @click="goBack" style="margin: 10px 0 0 80px;width: 150px;">返回</el-button>
     </div>
   </div>
 </template>
@@ -530,8 +530,7 @@ const changeCategory3 = (id) => {
   formInline.categoryId = id;
 };
 
-//审核/驳回
+const goBack = async () => {
-const approved = async () => {
   router.go(-1);
 };
 

src/views/order/orderDetails.vue

@@ -194,9 +194,9 @@
                 "
                 class="order-list-warp-right-list"
               >
-                <div>退款理由</div>
+                <div>申请退款原因</div>
                 <div style="color: #000000">
-                  {{ detailsData.totalQuantity }}
+                  {{ detailsData.refundReason }}
                 </div>
               </div>
               <div
@@ -206,9 +206,31 @@
                 "
                 class="order-list-warp-right-list"
               >
-                <div>退款描述</div>
+                <div>申请退款时间</div>
                 <div style="color: #000000">
-                  {{ detailsData.totalQuantity }}
+                  {{ detailsData.refundApproveTime }}
+                </div>
+              </div>
+              <div
+                v-if="
+                  detailsData.orderStatus == '10' ||
+                  detailsData.orderStatus == '11'
+                "
+                class="order-list-warp-right-list"
+              >
+                <div style="color: red">申请退款金额</div>
+                <div style="color: red">￥{{ detailsData.payableAmount }}</div>
+              </div>
+              <div
+                v-if="
+                  detailsData.orderStatus == '10' &&
+                  detailsData.refundAuditResult
+                "
+                class="order-list-warp-right-list"
+              >
+                <div style="color: red">拒绝退款原因</div>
+                <div style="color: red">
+                  {{ detailsData.refundFailReason }}
                 </div>
               </div>
               <div class="order-list-warp-right-list">
@@ -311,6 +333,7 @@
   </div>
 </template>
 <script setup>
+import { ElMessage } from "element-plus";
 import { ref, reactive, computed, onMounted, onBeforeUnmount } from "vue";
 import {
   createLogisticOrder,
@@ -418,17 +441,22 @@ const submit = () => {
   refund(
     refundState.value == "1"
       ? {
-          id: detailsData.value.id,
+          orderId: detailsData.value.id,
           approveStatus: refundState.value,
           refundAmount: refundPrice.value,
         }
       : {
-          id: detailsData.value.id,
+          orderId: detailsData.value.id,
           approveStatus: refundState.value,
           refuseReason: rejectReason.value,
         }
   ).then((res) => {
     dialogVisible.value = false;
+    ElMessage({
+      message: "操作成功",
+      type: "success",
+      plain: true,
+    });
     getOrderDetails();
   });
 };

src/views/order/refunded.vue

@@ -280,7 +280,7 @@ const router = useRouter();
 const preserveExpanded = ref(true);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: "3",
+  orderStatus: "11",
   current: 1,
   size: 10,
   receiverName: "",

src/views/order/sendGoods.vue

@@ -285,10 +285,10 @@
           <!-- 自定义-操作 -->
           <template #action="slotProps">
             <div @click="goSend(slotProps.row)" class="send-button">去发货</div>
-            <div @click="upAddress(slotProps.row)" class="send-button">
+            <div @click="upAddress(slotProps.row.id)" class="send-button">
               修改收货地址
             </div>
-            <div @click="goSends(slotProps.row)" class="send-buttons-info">
+            <div @click="goSends(slotProps.row.id)" class="send-buttons-info">
               查看详情
             </div>
             <!-- <el-tooltip effect="dark" placement="bottom-end">
@@ -418,10 +418,10 @@ const resetForm = () => {
   searchForm.value.resetFields();
 };
 
-const goSends = (id) => {
+const goSends = (data) => {
   router.push({
     path: "/order/order/orderDetails",
-    query: { data: id },
+    query: { data: data },
   });
 };
 
@@ -532,7 +532,7 @@ const generateMockData = () => {
 const upAddress = (data) => {
   dialogVisible.value = true;
   console.log("31231");
-  upid.value = data.id;
+  upid.value = data;
 
   // router.push({
   //   path: "/order/order/sendGoodsInfo",

src/views/order/sendGoodsInfo.vue

@@ -134,6 +134,7 @@
   </div>
 </template>
 <script setup>
+import { ElMessage } from "element-plus";
 import { ref, reactive, computed, onMounted, onBeforeUnmount } from "vue";
 import { createLogisticOrder } from "../../api/order/list";
 import { useRoute, useRouter } from "vue-router";
@@ -142,7 +143,6 @@ const router = useRouter();
 const tableData = ref([]);
 const radio1 = ref("2");
 onMounted(() => {
-  // console.log(JSON.parse(route.query.data));
   tableData.value = JSON.parse(route.query.data).orderItemInfos;
 });
 
@@ -150,7 +150,6 @@ watch(
   () => route.query.data,
   (newSearch) => {
     if (route.query.data) {
-      console.log(JSON.parse(route.query.data));
       tableData.value = JSON.parse(route.query.data).orderItemInfos;
     }
   }
@@ -219,6 +218,11 @@ const send = async () => {
     });
     console.log(response);
     if (response.code == 200) {
+      ElMessage({
+        message: "发货成功",
+        type: "success",
+        plain: true,
+      });
       router.back();
     }
   } catch (error) {