From a3b4b8bd4c928ce4694a32f005b9068877885db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Mar 2023 17:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue  |  49 +++++++++++-
 src/views/system/goodsOrder/indexjs.js | 101 ++++++++++++++-----------
 2 files changed, 104 insertions(+), 46 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index d1f9a3a..5bc97c6 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -63,7 +63,7 @@
       :data="goodsOrderList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" align="center" />
       <el-table-column
         label="所属护理站"
         align="center"
@@ -78,7 +78,12 @@
       <el-table-column label="商品名称" align="center" prop="goodsName" />
 
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
+      <el-table-column
+        label="订单状态"
+        align="center"
+        width="100"
+        prop="orderStatus"
+      >
         <template slot-scope="scope">
           <!-- {{ orderStatus(scope.row.orderStatus) }} -->
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
@@ -123,12 +128,20 @@
           >
         </template>
       </el-table-column>
+      <el-table-column label="订单类型" align="center" prop="orderType">
+        <template slot-scope="scope">
+          {{ scope.row.orderType == "INTEGRAL_EXCHANGE" ? "积分兑换" : "" }}
+          {{ scope.row.orderType == "DIRECT_BUY" ? "直接购买" : "" }}
+          {{ scope.row.orderType == "HEALTH_CONSULTATION" ? "健康咨询" : "" }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="下单时间"
         align="center"
         prop="orderTime"
         width="180"
       />
+
       <el-table-column
         label="联系电话"
         align="center"
@@ -257,6 +270,22 @@
             style="width: 240px"
           />
         </el-form-item>
+        <el-form-item label="订单类型" prop="orderType">
+          <el-select
+            v-model="orderList.orderType"
+            placeholder="请选择订单状态"
+            disabled
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in orderTypelist"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="收货人" prop="receiveAddress">
           <el-input
             v-model="orderList.receiver"
@@ -511,6 +540,21 @@
             style="width: 205px"
           />
         </el-form-item>
+        <el-form-item label="订单类型" prop="orderType">
+          <el-select
+            v-model="refundlist.orderType"
+            placeholder="请选择订单状态"
+            disabled
+          >
+            <el-option
+              v-for="item in orderTypelist"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="退款原因" prop="dictLabel">
           <el-input
             v-model="refundlist.dictLabel"
@@ -519,6 +563,7 @@
             disabled
           />
         </el-form-item>
+
         <el-form-item label="退款金额" prop="godTotalPrice">
           <el-input
             v-model="refundlist.godTotalPrice"
diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js
index 458e802..699428e 100644
--- a/src/views/system/goodsOrder/indexjs.js
+++ b/src/views/system/goodsOrder/indexjs.js
@@ -25,47 +25,60 @@ export default {
             innerrefund: false,
             orderList: [],
             refundlist: [],
+            orderTypelist: [
+                {
+                    value: "INTEGRAL_EXCHANGE",
+                    label: "积分兑换",
+                },
+                {
+                    value: "DIRECT_BUY",
+                    label: "直接购买",
+                }, {
+                    value: "HEALTH_CONSULTATION",
+                    label: "健康咨询",
+                }
+            ],
             ratelist: {}, //评分list
             orderStatuslist: [{
-                    value: "WAIT_PAY",
-                    label: "待付款",
-                },
-                {
-                    value: "PAY",
-                    label: "待发货",
-                },
-                {
-                    value: "WAIT_RECEIVED_GOODS",
-                    label: "待收货",
-                },
-                {
-                    value: "RECEIVED_GOODS",
-                    label: "待评价",
-                },
-                {
-                    value: "EVALUATED",
-                    label: "交易完成",
-                },
-                {
-                    value: "CANCEL",
-                    label: "已取消",
-                },
-                {
-                    value: "WAIT_RETURNED_GOODS",
-                    label: "待退货",
-                },
-                {
-                    value: "RETURNED_GOODS",
-                    label: "已退货",
-                },
-                {
-                    value: "WAIT_REFUND",
-                    label: "退款中",
-                },
-                {
-                    value: "REFUNDED",
-                    label: "退款成功",
-                },
+                value: "WAIT_PAY",
+                label: "待付款",
+            },
+            {
+                value: "PAY",
+                label: "待发货",
+            },
+            {
+                value: "WAIT_RECEIVED_GOODS",
+                label: "待收货",
+            },
+            {
+                value: "RECEIVED_GOODS",
+                label: "待评价",
+            },
+            {
+                value: "EVALUATED",
+                label: "交易完成",
+            },
+            {
+                value: "CANCEL",
+                label: "已取消",
+            },
+            {
+                value: "WAIT_RETURNED_GOODS",
+                label: "待退货",
+            },
+            {
+                value: "RETURNED_GOODS",
+                label: "已退货",
+            },
+            {
+                value: "WAIT_REFUND",
+                label: "退款中",
+            },
+            {
+                value: "REFUNDED",
+                label: "退款成功",
+            },
             ],
             // 遮罩层
             loading: true,
@@ -245,7 +258,7 @@ export default {
                 this.ratelist = {}
                 if (row.orderStatus == 'EVALUATED') {
                     this.ratelist = res.data.orderEvaluatePictureInfoList
-                } else {}
+                } else { }
             });
         },
         // 查看录入物流单号弹框
@@ -405,21 +418,21 @@ export default {
             const ids = row.id || this.ids;
             this.$modal
                 .confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？')
-                .then(function() {
+                .then(function () {
                     return delGoodsOrder(ids);
                 })
                 .then(() => {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => {});
+                .catch(() => { });
         },
         /** 导出按钮操作 */
         handleExport() {
             this.download(
                 "system/goodsOrder/export", {
-                    ...this.queryParams,
-                },
+                ...this.queryParams,
+            },
                 `goodsOrder_${new Date().getTime()}.xlsx`
             );
         },