From 73ce45aff90da47eb9eae33ad36ca46c68c29975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Mon, 17 Apr 2023 17:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=89=A9=E6=B5=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/order/order/fictitiousOrderList.vue | 493 ++++++++----------
 manager/src/views/order/order/orderDetail.vue |   9 +-
 seller/src/views/order/order/orderDetail.vue  |  48 +-
 3 files changed, 258 insertions(+), 292 deletions(-)

diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
index 69b40ddc..2a2b218c 100644
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -4,22 +4,10 @@
       <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"
-              placeholder="请输入订单号"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="会员名称" prop="buyerName">
-            <Input
-              type="text"
-              v-model="searchForm.buyerName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="订单状态" prop="orderStatus">
             <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
@@ -32,274 +20,251 @@
             </Select>
           </Form-item>
           <Form-item label="下单时间">
-            <DatePicker
-              v-model="selectDate"
-              type="datetimerange"
-              format="yyyy-MM-dd"
-              clearable
-              @on-change="selectDateRange"
-              placeholder="选择起始时间" 
-              style="width: 200px"
-            ></DatePicker>
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable
+              @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          
+
         </Form>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        class="mt_10"
-        sortable="custom"
-        @on-sort-change="changeSort"
-      ></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" sortable="custom"
+        @on-sort-change="changeSort"></Table>
       <Row type="flex" justify="end" class="mt_10">
-        <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>
+        <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 * as API_Order from "@/api/order";
 
-  export default {
-    name: "fictitiousOrderList",
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "", // 默认排序字段
-          order: "", // 默认排序方式
-          startDate: "", // 起始时间
-          endDate: "", // 终止时间
-          orderType: "VIRTUAL",
-          orderSn: "",
-          buyerName: "",
-          orderStatus: ""
+export default {
+  name: "fictitiousOrderList",
+  data () {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "", // 默认排序字段
+        order: "", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderType: "VIRTUAL",
+        orderSn: "",
+        buyerName: "",
+        orderStatus: ""
+      },
+
+      selectDate: null, // 下单时间
+      columns: [
+        {
+          title: "订单号",
+          key: "sn",
+          minWidth: 230,
+          tooltip: true
         },
-     
-        selectDate: null, // 下单时间
-        columns: [
-          {
-            title: "订单号",
-            key: "sn",
-            minWidth: 230,
-            tooltip: true
-          },
-          {
-            title: "下单时间",
-            key: "createTime",
-            width: 200,
-          },
-          {
-            title: "订单来源",
-            key: "clientType",
-            width: 95,
-            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",
-            width: 130,
-          },
-          {
-            title: "订单金额",
-            key: "flowPrice",
-            minWidth: 120,
-            sortable: true,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.flowPrice, "￥")
-              );
-            },
-          },
-
-          {
-            title: "订单状态",
-            key: "orderStatus",
-            width:95,
-            render: (h, params) => {
-              if (params.row.orderStatus == "UNPAID") {
-                return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
-              } else if (params.row.orderStatus == "PAID") {
-                return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
-              } else if (params.row.orderStatus == "COMPLETED") {
-                return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
-              } else if (params.row.orderStatus == "TAKE") {
-                return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
-              } else if (params.row.orderStatus == "CANCELLED") {
-                return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
-              }
+        {
+          title: "下单时间",
+          key: "createTime",
+          width: 200,
+        },
+        {
+          title: "订单来源",
+          key: "clientType",
+          width: 95,
+          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: "action",
-            align: "center",
-            width: 200,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-
-                  {
-                    props: {
-                      type: "primary",
-                      size: "small",
-                    },
-                    attrs: {
-                      disabled: params.row.orderStatus == "UNPAID" ? false : true,
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.confirmPrice(params.row);
-                      },
-                    },
-                  },
-                  "收款"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.detail(params.row);
-                      },
-                    },
-                  },
-                  "查看"
-                ),
-              ]);
-            },
+        },
+        {
+          title: "买家名称",
+          key: "memberName",
+          width: 130,
+        },
+        {
+          title: "订单金额",
+          key: "flowPrice",
+          minWidth: 120,
+          sortable: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
           },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
-    },
-    methods: {
-      // 初始化数据
-      init() {
-        this.getDataList();
-      },
-      // 分页 改变页码
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-      },
-      // 分页 改变页数
-      changePageSize(v) {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      // 搜索
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
-      // 列表排序
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      // 起止时间从新赋值
-      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;
+        },
+
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          width: 95,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
+              return h("div", [h("tag", { props: { color: "magenta" } }, "未付款")]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [h("tag", { props: { color: "blue" } }, "已付款")]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [h("tag", { props: { color: "green" } }, "已完成")]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
+            }
           }
-        });
-        this.total = this.data.length;
-        this.loading = false;
-      },
-      //确认收款
-      confirmPrice(v) {
-        this.$Modal.confirm({
-          title: "确认收款",
-          content: "您确定要收款吗？",
-          loading: true,
-          onOk: () => {
-            API_Order.orderPay(v.sn).then(res => {
-              if(res.success){
-                this.$Message.success("收款成功")
-                this.getDataList()
-              }
-              this.$Modal.remove();
-            })
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  attrs: {
+                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.confirmPrice(params.row);
+                    },
+                  },
+                },
+                "收款"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+            ]);
           },
-        });
-
-      },
-      // 订单详情
-      detail(v) {
-        let sn = v.sn;
-        this.$router.push({
-          name: "order-detail",
-          query: {sn: sn},
-        });
-
-      },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    // 初始化数据
+    init () {
+      this.getDataList();
     },
-    mounted() {
-      this.init();
+    // 分页 改变页码
+    changePage (v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
     },
-  };
+    // 分页 改变页数
+    changePageSize (v) {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    // 搜索
+    handleSearch () {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    // 列表排序
+    changeSort (e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    // 起止时间从新赋值
+    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;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //确认收款
+    confirmPrice (v) {
+      this.$Modal.confirm({
+        title: "确认收款",
+        content: "您确定要收款吗？",
+        loading: true,
+        onOk: () => {
+          API_Order.orderPay(v.sn).then(res => {
+            if (res.success) {
+              this.$Message.success("收款成功")
+              this.getDataList()
+            }
+            this.$Modal.remove();
+          })
+        },
+      });
+
+    },
+    // 订单详情
+    detail (v) {
+      console.log(v.orderType);
+      let sn = v.sn;
+      this.$router.push({
+        name: "order-detail",
+        query: { sn: sn, orderType: v.orderType },
+      });
+
+    },
+  },
+  mounted () {
+    this.init();
+  },
+};
 </script>
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index b3bb92cb..6fc84f74 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -8,7 +8,8 @@
           <Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
           <Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
           <Button @click="orderLog" type="info" ghost>订单日志</Button>
-          <Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button>
+          <Button @click="printOrder" type="primary" ghost style="float:right;"
+            v-if="$route.query.orderType != 'VIRTUAL'">打印发货单</Button>
         </div>
       </Card>
       <Card class="mt_10 clearfix">
@@ -112,10 +113,10 @@
             <div class="div-item-right">{{ orderInfo.order.remark }}</div>
           </div>
 
-          <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+          <!-- <div class="div-item" v-if="orderInfo.order.needReceipt == false">
             <div class="div-item-left">发票信息：</div>
             <div class="div-item-right">暂无发票信息</div>
-          </div>
+          </div> -->
 
           <!-- <div class="div-item" v-if="orderInfo.order.needReceipt == true">
             <div class="div-item-left">发票抬头：</div>
@@ -163,7 +164,7 @@
             </div>
           </div> -->
 
-          <div class="div-item">
+          <div class="div-item" v-if="$route.query.orderType != 'VIRTUAL'">
             <div class="div-item-left">配送方式：</div>
             <div class="div-item-right">
               {{ orderInfo.deliveryMethodValue }}
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index ddc012bb..ef8ba4fa 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -487,7 +487,7 @@ export default {
     liliMap,
     region,
   },
-  data() {
+  data () {
     return {
       typeList: [],
       showPrices: false,
@@ -693,27 +693,27 @@ export default {
   },
   methods: {
     //修改地址
-    regionClick() {
+    regionClick () {
       this.showRegion = true;
       this.regionId = "";
     },
     //弹出订单核销框
-    orderTake() {
+    orderTake () {
       this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
       this.orderTakeModal = true;
     },
     //打印发货单
-    printOrder() {
+    printOrder () {
       this.printModal = true;
     },
-    printHiddenInfo() {
+    printHiddenInfo () {
       this.printHiddenFlag = !this.printHiddenFlag;
     },
-    printCancel() {
+    printCancel () {
       // this.printHiddenFlag = false;
     },
     //订单核销提交
-    orderTakeSubmit() {
+    orderTakeSubmit () {
       this.$refs.orderTakeForm.validate((valid) => {
         if (valid) {
           API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
@@ -728,14 +728,14 @@ export default {
         }
       });
     },
-    getOrderPrice() {
+    getOrderPrice () {
       if (this.showPrices) {
         this.showPrices = false
       } else if (!this.showPrices) {
         this.showPrices = true
       }
     },
-    getContentPrice() {
+    getContentPrice () {
       for (let i = 0; i < this.typeList.length; i++) {
         for (let j = i + 1; j < this.typeList.length; j++) {
           if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@@ -751,7 +751,7 @@ export default {
       }
     },
     //获取订单详细信息
-    getDataDetail() {
+    getDataDetail () {
       this.loading = true;
       API_Order.getOrderDetail(this.sn).then((res) => {
         this.loading = false;
@@ -766,7 +766,7 @@ export default {
         }
       });
     },
-    Toprint() {
+    Toprint () {
       this.facesheetFlag = true;
       API_Logistics.getCheckedOn().then(res => {
         if (res.success) {
@@ -776,13 +776,13 @@ export default {
       });
     },
     // 修改订单金额
-    modifyPrice() {
+    modifyPrice () {
       //默认要修改的金额为订单总金额
       this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
       this.modal = true;
     },
     //修改订单金额提交
-    modifyPriceSubmit() {
+    modifyPriceSubmit () {
       this.$refs.modifyPriceForm.validate((valid) => {
         if (valid) {
           API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then(
@@ -798,12 +798,12 @@ export default {
       });
     },
     // 选中的地址
-    selectedRegion(val) {
+    selectedRegion (val) {
       this.region = val[1];
       this.regionId = val[0];
     },
     //查询物流
-    logistics() {
+    logistics () {
       this.logisticsModal = true;
       API_Order.getTraces(this.sn).then((res) => {
         if (res.success && res.result != null) {
@@ -812,7 +812,7 @@ export default {
       });
     },
     //订单发货
-    orderDeliver() {
+    orderDeliver () {
       this.facesheetFlag = false
       if (this.logisticsType == 'SHUNFENG') {
         this.$Modal.confirm({
@@ -839,7 +839,7 @@ export default {
       }
     },
     //顺丰打印面单
-    sfPrint() {
+    sfPrint () {
       API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
         if (res.success) {
           let headers = {
@@ -869,13 +869,13 @@ export default {
         }
       })
     },
-    Toprints() {
+    Toprints () {
       if (this.form.logisticsId != null && this.form.logisticsId != '') {
         this.orderDeliverModal = false;
       }
     },
     //订单发货提交
-    orderDeliverySubmit() {
+    orderDeliverySubmit () {
       if (this.facesheetFlag) {
         this.$refs['faceSheetForm'].validate((valid) => {
           if (valid) {
@@ -904,7 +904,7 @@ export default {
       }
     },
     //弹出修改收货地址框
-    editAddress() {
+    editAddress () {
       this.addressModal = true;
       this.showRegion = false;
       this.regionId = this.orderInfo.order.consigneeAddressIdPath;
@@ -918,7 +918,7 @@ export default {
         this.orderInfo.order.consigneeAddressIdPath;
     },
     //修改收货地址
-    editAddressSubmit() {
+    editAddressSubmit () {
       if (this.regionId == "") {
         this.$Message.error("请选择地址");
         return;
@@ -940,7 +940,7 @@ export default {
       });
     },
 
-    getLogisticsSetting() {
+    getLogisticsSetting () {
       API_Logistics.getLogisticsSetting().then(res => {
         if (res.success) {
           this.logisticsType = res.result;
@@ -949,13 +949,13 @@ export default {
     },
 
   },
-  mounted() {
+  mounted () {
     this.sn = this.$route.query.sn;
     this.getDataDetail();
     this.getLogisticsSetting();
   },
   // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
-  beforeRouteLeave(to, from, next) {
+  beforeRouteLeave (to, from, next) {
     if (to.name === 'orderList' || to.name === 'virtualOrderList') {
       to.meta.keepAlive = true
     }