虚拟订单和商品订单区分开

seller/src/libs/routerJson.js

@@ -143,6 +143,20 @@ export const result = [
             url: "",
             children: null,
             permTypes: []
+          },
+          {
+            name: "virtualOrderList",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "虚拟订单",
+            path: "virtualOrderList",
+            component: "order/order/virtualOrderList",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
           }
         ]
       },

seller/src/views/order/order/orderList.vue

@@ -8,14 +8,6 @@
           </Form-item>
           <Form-item label="会员名称" prop="buyerName">
             <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
-          </Form-item>
-              <Form-item label="订单类型" prop="orderType">
-            <Select v-model="searchForm.orderType" placeholder="请选择" clearable style="width: 160px">
-              <Option value="NORMAL">普通订单</Option>
-              <Option value="PINTUAN">拼团订单</Option>
-              <Option value="GIFT">赠品订单</Option>
-              <Option value="VIRTUAL">核验订单</Option>
-            </Select>
           </Form-item>
           <Form-item label="订单状态" prop="orderStatus">
             <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
@@ -35,26 +27,7 @@
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
-      <div>
+      <Table class="padding-row" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        <Button type="primary" class="export" @click="expressOrderDeliver">
-          批量发货
-          <Icon type="ios-arrow-down"></Icon>
-        </Button>
-        <Poptip @keydown.enter.native="orderVerification" placement="bottom-start" width="400">
-          <Button class="export">
-            核验订单
-          </Button>
-          <div class="api" slot="content">
-            <h2>核验订单号</h2>
-            <div style="margin:10px 0;">
-              <Input v-model="orderCode" style="width:300px; margin-right:10px;" />
-              <Button style="primary" @click="orderVerification">核验</Button>
-            </div>
-          </div>
-        </Poptip>
-
-      </div>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
       <Row type="flex" justify="end" class="page">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
           show-total show-elevator show-sizer></Page>
@@ -83,6 +56,7 @@ export default {
         orderSn: "",
         buyerName: "",
         orderStatus: "",
+        orderType:"NORMAL"
       },
       selectDate: null,
       form: {
@@ -123,22 +97,6 @@ export default {
             }
           },
         },
-        {
-          title: "订单类型",
-          key: "orderType",
-          width: 120,
-          render: (h, params) => {
-            if (params.row.orderType == "NORMAL") {
-              return h("div", [h("span", {}, "普通订单")]);
-            } else if (params.row.orderType == "PINTUAN") {
-              return h("div", [h("span", {}, "拼团订单")]);
-            } else if (params.row.orderType == "GIFT") {
-              return h("div", [h("span", {}, "赠品订单")]);
-            } else if (params.row.orderType == "VIRTUAL") {
-              return h("div", [h("tag", {}, "核验订单")]);
-            }
-          },
-        },
         {
           title: "买家名称",
           key: "memberName",

seller/src/views/order/order/virtualOrderList.vue

@@ -0,0 +1,300 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 160px" />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
+          </Form-item>
+          <Form-item label="订单状态" prop="orderStatus">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+              <Option value="UNDELIVERED">待发货</Option>
+              <Option value="DELIVERED">已发货</Option>
+              <Option value="COMPLETED">已完成</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="下单时间">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <div>
+        <Button type="primary" class="export" @click="expressOrderDeliver">
+          批量发货
+          <Icon type="ios-arrow-down"></Icon>
+        </Button>
+        <Poptip @keydown.enter.native="orderVerification" placement="bottom-start" width="400">
+          <Button class="export">
+            核验订单
+          </Button>
+          <div class="api" slot="content">
+            <h2>核验订单号</h2>
+            <div style="margin:10px 0;">
+              <Input v-model="orderCode" style="width:300px; margin-right:10px;" />
+              <Button style="primary" @click="orderVerification">核验</Button>
+            </div>
+          </div>
+        </Poptip>
+
+      </div>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import { verificationCode } from "@/api/order";
+export default {
+  name: "virtualOrderList",
+  data() {
+    return {
+      orderCode: "",
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderSn: "",
+        buyerName: "",
+        orderStatus: "",
+        orderType:"VIRTUAL"
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "订单号",
+          key: "sn",
+          minWidth: 240,
+          tooltip: true,
+        },
+        {
+          title: "订单来源",
+          key: "clientType",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.clientType == "H5") {
+              return h("div", {}, "移动端");
+            } else if (params.row.clientType == "PC") {
+              return h("div", {}, "PC端");
+            } else if (params.row.clientType == "WECHAT_MP") {
+              return h("div", {}, "小程序端");
+            } else if (params.row.clientType == "APP") {
+              return h("div", {}, "移动应用端");
+            } else {
+              return h("div", {}, params.row.clientType);
+            }
+          },
+        },
+        {
+          title: "买家名称",
+          key: "memberName",
+          minWidth: 130,
+          tooltip: true,
+        },
+        {
+          title: "订单金额",
+          key: "flowPrice",
+          minWidth: 100,
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          minWidth: 100,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
+              return h("div", [h("span", {}, "未付款")]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [h("span", {}, "已付款")]);
+            } else if (params.row.orderStatus == "UNDELIVERED") {
+              return h("div", [h("span", {}, "待发货")]);
+            } else if (params.row.orderStatus == "DELIVERED") {
+              return h("div", [h("span", {}, "已发货")]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [h("span", {}, "已完成")]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [h("span", {}, "待核验")]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [h("span", {}, "已取消")]);
+            }
+          },
+        },
+        {
+          title: "下单时间",
+          key: "createTime",
+          width: 170,
+          sortable: true,
+          sortType: "desc",
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 100,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    /**
+     * 核验订单
+     */
+    async orderVerification() {
+      let result = await verificationCode(this.orderCode);
+
+      if (result.success) {
+
+
+        this.$router.push({
+          name: "order-detail",
+          query: { sn: result.result.sn || this.orderCode },
+        });
+      }
+    },
+    /**
+     * 批量发货
+     */
+    expressOrderDeliver() {
+      this.$router.push({
+        path: "/export-order-deliver",
+      });
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.searchForm = {};
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      API_Order.getOrderList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+
+    detail(v) {
+      let sn = v.sn;
+      this.$router.push({
+        name: "order-detail",
+        query: { sn: sn },
+      });
+    },
+  },
+  activated() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+.export {
+  margin: 10px 20px 10px 0;
+}
+</style>