From f623e628118e6a9ddd04f1af79f9f69a251fa85c Mon Sep 17 00:00:00 2001
From: Ygb <2694611394@qq.com>
Date: Mon, 22 Sep 2025 15:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/newshopOrder.js  |  14 ++
 src/layout/Sidebar.vue           |   6 +-
 src/router/index.js              |   5 +
 src/views/newshopOrder/index.vue | 346 +++++++++++++++++++++++++++++++
 4 files changed, 370 insertions(+), 1 deletion(-)
 create mode 100644 src/api/modules/newshopOrder.js
 create mode 100644 src/views/newshopOrder/index.vue

diff --git a/src/api/modules/newshopOrder.js b/src/api/modules/newshopOrder.js
new file mode 100644
index 0000000..1fba60e
--- /dev/null
+++ b/src/api/modules/newshopOrder.js
@@ -0,0 +1,14 @@
+import instance from '../../utils/axios.js'
+
+// 过滤设置相关API
+const newshopOrderApi = {
+
+  //listFastMail, getFastMail, delFastMail, addFastMail, updateFastMail
+
+    listOrderService: (params) => instance.get('/orderservice/list', { params }),
+    // 获取商品详情instance.get(`/fastMail/${id}`),
+    getOrderServiceDetail :(id) => instance.get(`/orderservice/${id}`),
+};
+
+// 导出模块
+export { newshopOrderApi };
\ No newline at end of file
diff --git a/src/layout/Sidebar.vue b/src/layout/Sidebar.vue
index 2bb1b8c..7ecf0e6 100644
--- a/src/layout/Sidebar.vue
+++ b/src/layout/Sidebar.vue
@@ -159,7 +159,11 @@ const menuData = shallowRef([
 				title: '订单信息',
 				path: '/order/shopOrder'
 				// 移除权限要求，让所有用户都能看到
-			}
+			},{
+        title: '服务订单信息',
+        path: '/order/newshopOrder'
+        // 移除权限要求，让所有用户都能看到
+      }
 		]
 	},
 	{
diff --git a/src/router/index.js b/src/router/index.js
index ce46973..a8bbe9b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -169,6 +169,11 @@ const routes = [{
 				component: () => import('@/views/shopOrder/index.vue'),
 				meta: { title: '订单信息' }
 			},
+			{
+				path: '/order/newshopOrder',
+				component: () => import('@/views/newshopOrder/index.vue'),
+				meta: { title: '服务订单信息' }
+			},
 			{
 				path: '/book/excelTask',
 				component: () => import('@/views/excelTask/index.vue'),
diff --git a/src/views/newshopOrder/index.vue b/src/views/newshopOrder/index.vue
new file mode 100644
index 0000000..4ae3d1c
--- /dev/null
+++ b/src/views/newshopOrder/index.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="p-2">
+
+    <div class="filter-set-container">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="订单状态" prop="status">
+              <el-select v-model="queryParams.status" filterable placeholder="请选择订单状态" style="width: 150px" clearable>
+                <el-option v-for="dict in orderEt" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+
+           <el-form-item label="订单编号" prop="orderSn" label-width="120">
+              <el-input v-model="queryParams.orderSn" placeholder="请输入订单编号"  />
+            </el-form-item>
+
+
+            <el-form-item label="下单时间" prop="create_time_begin">
+              <el-date-picker clearable
+                v-model="queryParams.createTimebegin"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择下单时间"
+              />
+              至    <el-date-picker clearable
+                v-model="queryParams.createTimeEnd"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择下单时间"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="更新时间" prop="create_time_end">
+              <el-date-picker clearable
+                v-model="queryParams.updateTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择更新时间"
+              />
+            </el-form-item> -->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+     </div>
+
+    <el-card shadow="never">
+      <template #header >
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate(this)" >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete(this)" >删除</el-button>
+          </el-col>
+
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="orderservicelist" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+
+  
+
+        <el-table-column label="订单编号" align="center" prop="order_sn" width="500px" />
+
+        <el-table-column label="订单状态" align="center" prop="type">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.status === 0">待付款</el-tag>
+            <el-tag type="success" v-if="scope.row.status === 1">已付款</el-tag>
+            <el-tag type="warning" v-else-if="scope.row.status === 2">已发货</el-tag>
+            <el-tag type="info" v-else-if="scope.row.status === 3">已完成</el-tag>
+             <el-tag type="info" v-else-if="scope.row.status === 4">已关闭</el-tag>
+           <el-tag type="info" v-else-if="scope.row.status === 5">无效订单</el-tag>
+ 
+          </template>
+        </el-table-column>
+
+        <el-table-column label="金额" align="center" prop="pay_amount" width="300px" />
+        <el-table-column label="创建时间" align="center" prop="create_time" width="400px">
+          <template #default="scope">
+            <span>{{ scope.row.create_time}}</span>
+          </template> 
+        </el-table-column>
+ 
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
+          <template #default="scope">
+    
+
+            <el-button link type="success" @click="handleshow(scope.row)" >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+
+
+
+
+    
+    <!-- 添加或修改订单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" append-to-body>
+      <el-form ref="shopOrderFormRef" :model="form" :rules="rules" label-width="160px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="订单编号" prop="orderSn">
+              <el-input v-model="form.orderSn" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="订单金额" prop="payAmount">
+              <el-input v-model="form.payAmount" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  </div>
+</template>
+<script setup>
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { newshopOrderApi } from '@/api/modules/newshopOrder.js';
+const total = ref(0);
+const queryFormRef = ref(null);
+const showSearch = ref(true);
+const orderservicelist = ref([]);
+// 字典数据
+let orderstatus_type = ref([]);
+const loading = ref(true);
+const error = ref(null);
+const shopOrderFormRef = ref();
+
+const dialog = reactive({
+  visible: false,
+  title: '',
+  visibleSH: false,
+  titleSH: '',
+  newOrderVisible: false,
+  newOrderTitle: '',
+  startSyVisible: false
+});
+
+
+
+// 订单异常类型枚举
+const orderEt = [
+  { value: 0, label: '待付款' },
+  { value: 1, label: '已付款' },
+  { value: 2, label: '已发货' },
+  { value: 3, label: '已完成' },
+  { value: 4, label: '已关闭' },
+  { value: 5, label: '无效订单' },
+];
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    status:undefined,
+    orderSn:undefined,
+    createTimebegin:undefined,
+    createTimeEnd:undefined,
+    params: {}
+  },
+
+});
+
+
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.startSyVisible = false;
+  dialog.visible = false;
+  dialogShipments.visible = false;
+}
+
+const initFormData = {
+  id: null,
+  orderSn:null,
+  payAmount:null,
+  status:null,
+};
+
+
+
+/** 表单重置 */
+const reset = () => {
+  debugger;
+//   form.value = { ...initFormData };
+//  shopOrderFormRef.value?.resetFields();
+}
+
+
+
+const handleClick = () => {
+  console.log('click')
+}
+const { queryParams, form, rules } = toRefs(data);
+   // 参数表单
+
+// 查询记录发布数据列表
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await newshopOrderApi.listOrderService(queryParams.value)
+    console.log(res)
+    if(res.code==200){
+        total.value = res.data.total;
+    orderservicelist.value= res.data.list
+
+    
+  //循环给数组赋值
+  for (const item of res.data.list) {
+    try {
+
+      item.create_time= timestampToYmd(item.create_time)
+     console.log(`插入成功：`+item);
+    } catch (error) {
+      console.error(`第  条失败，跳过：`, item);
+      // 可选：continue 跳过当前项，或 break 终止循环
+    }
+  }
+
+
+
+
+
+
+
+    }else{
+     ElMessage.error('获取列表失败');
+    }
+  } catch (error) {
+    console.error('获取列表失败:', error);
+    ElMessage.error('获取列表失败');
+  } finally {
+    loading.value = false;
+  }
+}
+const handleshow = async (row) => {
+  debugger;
+  reset();
+  
+  const _id = row?.id || ids.value[0];
+  const res = await newshopOrderApi.getOrderServiceDetail(_id);
+
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "查看订单详情";
+
+
+}
+
+
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  debugger
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+
+
+/**
+ * 将时间戳转换为 yyyy-mm-dd 格式
+ * @param {number|string} timestamp 时间戳（10位秒级或13位毫秒级）
+ * @returns {string} yyyy-mm-dd 格式的日期字符串（如 "2023-09-22"）
+ */
+function timestampToYmd(timestamp) {
+  // 处理输入：转为数字，并统一为13位毫秒级时间戳
+  const ts = typeof timestamp === 'number' ? timestamp : Number(timestamp);
+  const millis = ts.toString().length === 10 ? ts * 1000 : ts;
+
+  // 校验时间戳有效性（非数字或无效时间）
+  if (isNaN(millis) || millis <= 0) {
+    console.error('无效的时间戳:', timestamp);
+    return '1970-01-01'; // 或返回空字符串，根据业务需求调整
+  }
+
+  const date = new Date(millis);
+
+  // 提取年、月、日（月份从0开始，需+1）
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零到两位
+  const day = String(date.getDate()).padStart(2, '0'); // 补零到两位
+
+  return `${year}-${month}-${day}`;
+}
+
+
+
+onMounted(() => {
+getList();
+});
+
+</script>
+
+<style>
+/* 文本溢出处理 */
+.truncate-cell {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>