From 845b4e285e146e96f5d7c148c8362c4e67afdae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 28 Feb 2023 17:10:56 +0800
Subject: [PATCH 1/9] =?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/goodsInfo/goodsInfojs.js | 30 +++++++++++++++++++
 src/views/system/goodsInfo/index.vue      | 36 +++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index c48f50e..91db956 100644
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@@ -73,6 +73,17 @@ export default {
                     label: "是",
                 },
             ],
+            integraloption: [
+                {
+                    value: 0,
+                    label: "否",
+                },
+                {
+                    value: 1,
+                    label: "是",
+                },
+            ],
+            value:"",
             // goodAttributeDetailsLists:[],
             goodDetailsLists: [],
             ids: [],
@@ -217,6 +228,9 @@ export default {
                     goodsPrice: "",
                     goodsStock: "",
                     sort: null,
+                    integralExchangeCount:null,
+                    integralExchangeFlag:null,
+                    integralExchangeSill:null,
                     idd: this.idd,
                 };
                 this.goodDetailsLists.push(obj);
@@ -317,6 +331,9 @@ export default {
                 attributePitureUrl: "",
                 goodsPrice: "",
                 goodsStock: "",
+                integralExchangeCount:null,
+                integralExchangeFlag:null,
+                integralExchangeSill:null,
                 sort: null,
                 idd: 9999999,
             }, ];
@@ -360,6 +377,9 @@ export default {
                 attributePitureUrl: "",
                 goodsPrice: "",
                 goodsStock: "",
+                integralExchangeCount:null,
+                integralExchangeFlag:null,
+                integralExchangeSill:null,
                 sort: null,
                 idd: 9999999,
             }, ];
@@ -387,6 +407,16 @@ export default {
             console.log(this.goodDetailsLists);
             this.form.goodAttributeDetailsLists = [];
             this.form.goodDetailsLists = this.goodDetailsLists;
+            if (!this.form.goodDetailsLists.integralExchangeFlag) {
+                this.form.goodDetailsLists.integralExchangeFlag = null
+            }
+            if (this.form.goodDetailsLists.integralExchangeSill=="") {
+                this.form.goodDetailsLists.integralExchangeSill = null
+
+            } 
+            if (this.form.goodDetailsLists.integralExchangeCount == "") {
+                this.form.goodDetailsLists.integralExchangeCount = null
+            }
             console.log(this.form);
             this.$refs["form"].validate((valid) => {
                 if (valid) {
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 5d8199a..e684542 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -260,6 +260,42 @@
               ></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="积分兑换标识" align="center">
+            <template slot-scope="scope">
+              <el-select
+                v-model.number="scope.row.integralExchangeFlag"
+                placeholder="请选择积分兑换标识"
+                clearable
+              >
+                <el-option
+                  v-for="item in integraloption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="积分兑换门槛值" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.integralExchangeSill"
+                oninput="value=value.replace(/[^\d]/g,'')"
+                placeholder="积分兑换门槛值"
+                maxLength="10"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="积分兑换商品数量" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.integralExchangeCount"
+                oninput="value=value.replace(/[^\d]/g,'')"
+                placeholder="积分兑换商品数量"
+                maxLength="10"
+              ></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="商品属性图片" align="center" width="300">
             <template slot-scope="scope">
               <stationAcatar

From 4959486db57c6a94b38b97669788e5010700c56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Mar 2023 10:06:01 +0800
Subject: [PATCH 2/9] =?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/goodsInfo/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index e684542..37ba556 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -279,6 +279,7 @@
           <el-table-column label="积分兑换门槛值" align="center">
             <template slot-scope="scope">
               <el-input
+              :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeSill"
                 oninput="value=value.replace(/[^\d]/g,'')"
                 placeholder="积分兑换门槛值"
@@ -289,6 +290,7 @@
           <el-table-column label="积分兑换商品数量" align="center">
             <template slot-scope="scope">
               <el-input
+              :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeCount"
                 oninput="value=value.replace(/[^\d]/g,'')"
                 placeholder="积分兑换商品数量"

From a56f7273dec3ccda8cbdc8371999f99ff17bf60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 3 Mar 2023 11:57:42 +0800
Subject: [PATCH 3/9] =?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 | 117 +++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 4 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 8ded831..9ae6a7c 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -132,6 +132,13 @@
           >
         </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"
@@ -265,12 +272,84 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="订单金额" prop="totalPrice">
+        <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="integralExchangeCount"
+          v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
+        >
+          <el-input
+            v-model="orderList.integralExchangeCount"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item
+          label="兑换积分数"
+          prop="integralExchangeSill"
+          v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
+        >
+          <el-input
+            v-model="orderList.integralExchangeSill"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item
+          label="商品数量"
+          prop="goodsCount"
+          v-if="orderList.orderType == 'DIRECT_BUY'"
+        >
+          <el-input
+            v-model="orderList.goodsCount"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item
+          label="订单原始总金额"
+          prop="originalTotalPrice"
+          v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
+        >
+          <el-input
+            v-model="orderList.originalTotalPrice"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="优惠券名称" prop="couponTitle">
+          <el-input
+            v-model="orderList.couponTitle"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="优惠金额" prop="discountPrice">
+          <el-input
+            v-model="orderList.discountPrice"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="订单应付总金额" prop="totalPrice">
           <el-input
             v-model="orderList.totalPrice"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
@@ -460,6 +539,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"
@@ -623,6 +717,20 @@ export default {
           label: "退款成功",
         },
       ],
+      orderTypelist: [
+        {
+          value: "INTEGRAL_EXCHANGE",
+          label: "积分兑换",
+        },
+        {
+          value: "DIRECT_BUY",
+          label: "直接购买",
+        },
+        {
+          value: "HEALTH_CONSULTATION",
+          label: "健康咨询",
+        },
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -803,6 +911,7 @@ export default {
     //确认退款 确定按钮
     submitRefundOrder() {
       var obj = {};
+      obj.orderType = this.refundlist.orderType;
       obj.orderNo = this.refundlist.goOrderNo;
       obj.refundReason = this.refundlist.dictLabel;
       obj.refundPrice = this.refundlist.godTotalPrice;

From 556c3177e6721e16c5aae0fafca45a802497a755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 3 Mar 2023 17:24:30 +0800
Subject: [PATCH 4/9] =?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/goodsInfo/goodsInfojs.js | 6 ++++++
 src/views/system/goodsInfo/index.vue      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index 91db956..54e3523 100644
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@@ -173,6 +173,12 @@ export default {
         this.infos();
     },
     methods: {
+        changeExchangeFlag(item) {
+            if (item.integralExchangeFlag == 0) {
+                item.integralExchangeCount = ''
+                item.integralExchangeSill = ''
+            }
+        },
         imgs(item) {
             this.imgsurl.pictureUrlList.push(item);
         },
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 37ba556..67df2ea 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -266,6 +266,7 @@
                 v-model.number="scope.row.integralExchangeFlag"
                 placeholder="请选择积分兑换标识"
                 clearable
+                @change="changeExchangeFlag(scope.row)"
               >
                 <el-option
                   v-for="item in integraloption"

From 376739137cc7aaeebdcb9c8fdec5d70a53d68781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 6 Mar 2023 10:13:33 +0800
Subject: [PATCH 5/9] =?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/goodsInfo/goodsInfojs.js | 8 ++++----
 src/views/system/goodsInfo/index.vue      | 8 ++++----
 src/views/system/goodsOrder/index.vue     | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index 54e3523..ceb0587 100644
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@@ -59,10 +59,10 @@ export default {
                     value: "BUSINESS",
                     label: "买卖",
                 },
-                {
-                    value: "LEASE",
-                    label: "租赁",
-                },
+                // {
+                //     value: "LEASE",
+                //     label: "租赁",
+                // },
             ],
             options: [{
                     value: 0,
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 67df2ea..13698a9 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -277,24 +277,24 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="积分兑换门槛值" align="center">
+          <el-table-column label="积分兑换数值" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeSill"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="积分兑换门槛值"
+                placeholder="积分兑换数值"
                 maxLength="10"
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="积分兑换商品数量" align="center">
+          <el-table-column label="使用积分数量" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeCount"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="积分兑换商品数量"
+                placeholder="使用积分数量"
                 maxLength="10"
               ></el-input>
             </template>
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 9ae6a7c..69e91d3 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -324,7 +324,6 @@
         <el-form-item
           label="订单原始总金额"
           prop="originalTotalPrice"
-          v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
         >
           <el-input
             v-model="orderList.originalTotalPrice"

From e4b87cdf313e34bed9dacffd8fe32e30899f1a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 6 Mar 2023 11:17:15 +0800
Subject: [PATCH 6/9] =?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/goodsInfo/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 13698a9..6ca0ab5 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -277,24 +277,24 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="积分兑换数值" align="center">
+          <el-table-column label="使用积分数量" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeSill"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="积分兑换数值"
+                placeholder="使用积分数量"
                 maxLength="10"
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="使用积分数量" align="center">
+          <el-table-column label="积分兑换商品数量" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeCount"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="使用积分数量"
+                placeholder="积分兑换商品数量"
                 maxLength="10"
               ></el-input>
             </template>

From 5b45809f961d96d0b8c2f9078c6ba506e1423022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 6 Mar 2023 14:53:17 +0800
Subject: [PATCH 7/9] =?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/goodsInfo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 6ca0ab5..bac0029 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -299,7 +299,7 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="商品属性图片" align="center" width="300">
+          <el-table-column label="商品属性图片" align="center" width="150">
             <template slot-scope="scope">
               <stationAcatar
                 @imgUrl="attributePitureUrl"

From b1dca6f1a0e3d58638ee88031f59174bec8b4cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 6 Mar 2023 16:54:27 +0800
Subject: [PATCH 8/9] =?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 | 380 +++++++-------------------
 1 file changed, 106 insertions(+), 274 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 69e91d3..87aa707 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -9,18 +9,13 @@
       label-width="90px"
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
-        <el-select
-          v-model="queryParams.nurseStationId"
-          placeholder="请选择护理站"
-          @change="handleQuery"
-        >
+        <el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站" @change="handleQuery">
           <el-option
             v-for="item in handstationlist"
             :key="item.id"
             :label="item.nurseStationName"
             :value="item.id"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderNo">
@@ -32,17 +27,13 @@
         />
       </el-form-item>
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select
-          v-model="queryParams.orderStatus"
-          placeholder="请选择订单状态"
-        >
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
           <el-option
             v-for="item in orderStatuslist"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="phone">
@@ -54,82 +45,31 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      :data="goodsOrderList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="goodsOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="所属护理站"
-        align="center"
-        prop="nurseStationName"
-      />
-      <el-table-column
-        label="订单编号"
-        align="center"
-        prop="orderNo"
-        width="190"
-      />
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
       <el-table-column label="商品名称" align="center" prop="goodsName" />
 
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <!-- {{ orderStatus(scope.row.orderStatus) }} -->
-          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
-            >待付款</el-button
-          >
-          <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'"
-            >待发货</el-button
-          >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
-            >已取消</el-button
-          >
-          <el-button
-            type="primary"
-            v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'"
-            >待收货</el-button
-          >
-          <el-button
-            type="primary"
-            v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
-            >待评价</el-button
-          >
-          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
-            >交易完成</el-button
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_REFUND'"
-            >退款中</el-button
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'"
-            >待退货</el-button
-          >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
-            >退款成功</el-button
-          >
-          <el-button
-            type="danger"
-            v-if="scope.row.orderStatus == 'RETURNED_GOODS'"
-            >已退货</el-button
-          >
+          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">待发货</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'">待收货</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'RECEIVED_GOODS'">待评价</el-button>
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">交易完成</el-button>
+          <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
+          <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'">待退货</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">退款成功</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'RETURNED_GOODS'">已退货</el-button>
         </template>
       </el-table-column>
       <el-table-column label="订单类型" align="center" prop="orderType">
@@ -139,18 +79,8 @@
           {{ scope.row.orderType == "HEALTH_CONSULTATION" ? "健康咨询" : "" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="联系电话"
-        align="center"
-        prop="phone"
-        width="180"
-      />
-      <el-table-column
-        label="下单时间"
-        align="center"
-        prop="orderTime"
-        width="180"
-      />
+      <el-table-column label="联系电话" align="center" prop="phone" width="180" />
+      <el-table-column label="下单时间" align="center" prop="orderTime" width="180" />
       <el-table-column label="下单方式" align="center" prop="orderChannel">
         <template slot-scope="scope">
           {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
@@ -171,8 +101,7 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >修改物流单号</el-button
-          >
+          >修改物流单号</el-button>
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@@ -183,8 +112,7 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >录入物流单号</el-button
-          >
+          >录入物流单号</el-button>
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@@ -195,15 +123,10 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >录入物流单号</el-button
-          >
+          >录入物流单号</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -211,8 +134,7 @@
             icon="el-icon-edit"
             @click="seeOrder(scope.row)"
             v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
-            >订单详情</el-button
-          >
+          >订单详情</el-button>
 
           <el-button
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
@@ -221,8 +143,7 @@
             icon="el-icon-edit"
             @click="refund(scope.row.id)"
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
-            >确认退款</el-button
-          >
+          >确认退款</el-button>
           <!-- <el-button
             v-else
             size="mini"
@@ -231,7 +152,7 @@
             disabled
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
-          > -->
+          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -243,25 +164,10 @@
       @pagination="getList"
     />
     <!-- 查看商品信息弹框 -->
-    <el-dialog
-      title="订单详情"
-      :visible.sync="innerorder"
-      append-to-body
-      width="1200px"
-    >
-      <el-form
-        :inline="true"
-        ref="orderList"
-        :model="orderList"
-        :rules="rules"
-        label-width="120px"
-      >
+    <el-dialog title="订单详情" :visible.sync="innerorder" append-to-body width="1200px">
+      <el-form :inline="true" ref="orderList" :model="orderList" :rules="rules" label-width="120px">
         <el-form-item label="订单编号" prop="orderNo">
-          <el-input
-            v-model="orderList.orderNo"
-            :disabled="true"
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.orderNo" :disabled="true" style="width: 240px" />
         </el-form-item>
         <el-form-item label="商品名称" prop="goodsName">
           <el-input
@@ -284,8 +190,7 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -293,64 +198,29 @@
           prop="integralExchangeCount"
           v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
         >
-          <el-input
-            v-model="orderList.integralExchangeCount"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item
           label="兑换积分数"
           prop="integralExchangeSill"
           v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
         >
-          <el-input
-            v-model="orderList.integralExchangeSill"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.integralExchangeSill" disabled style="width: 240px" />
         </el-form-item>
-        <el-form-item
-          label="商品数量"
-          prop="goodsCount"
-          v-if="orderList.orderType == 'DIRECT_BUY'"
-        >
-          <el-input
-            v-model="orderList.goodsCount"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item label="商品数量" prop="goodsCount" v-if="orderList.orderType == 'DIRECT_BUY'">
+          <el-input v-model="orderList.goodsCount" disabled style="width: 240px" />
         </el-form-item>
-        <el-form-item
-          label="订单原始总金额"
-          prop="originalTotalPrice"
-        >
-          <el-input
-            v-model="orderList.originalTotalPrice"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item label="订单原始总金额" prop="originalTotalPrice">
+          <el-input v-model="orderList.originalTotalPrice" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="优惠券名称" prop="couponTitle">
-          <el-input
-            v-model="orderList.couponTitle"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.couponTitle" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="优惠金额" prop="discountPrice">
-          <el-input
-            v-model="orderList.discountPrice"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.discountPrice" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="订单应付总金额" prop="totalPrice">
-          <el-input
-            v-model="orderList.totalPrice"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.totalPrice" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="收货人" prop="receiveAddress">
           <el-input
@@ -396,11 +266,7 @@
           />
         </el-form-item>
         <el-form-item label="购买来源" prop="orderChannel">
-          <el-input
-            :value="buySourceinfo(orderList.buySource)"
-            disabled
-            style="width: 240px"
-          />
+          <el-input :value="buySourceinfo(orderList.buySource)" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="综合评分" v-if="orderList.compositeScore">
           <div style="width: 240px">
@@ -412,15 +278,8 @@
               show-score
               text-color="#ff9900"
               score-template="{value}"
-            >
-            </el-rate>
-            <el-input
-              v-else
-              type="text"
-              disabled
-              style="width: 240px"
-              placeholder="未评分"
-            ></el-input>
+            ></el-rate>
+            <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
           </div>
         </el-form-item>
         <el-form-item label="评价内容" v-if="orderList.evaluateContent">
@@ -443,7 +302,7 @@
               style="width: 23%; height: 100%; margin: 1%"
               v-for="(item, index) in ratelist"
               :src="baseurl + item.evaluatePictureUrl"
-              alt=""
+              alt
               :key="index"
             />
           </div>
@@ -451,12 +310,7 @@
       </el-form>
     </el-dialog>
     <!-- 查看物流信息弹框 -->
-    <el-dialog
-      title="录入物流单号"
-      :visible.sync="innerlogistics"
-      append-to-body
-      width="500px"
-    >
+    <el-dialog title="录入物流单号" :visible.sync="innerlogistics" append-to-body width="500px">
       <el-form
         :model="queryexpressNo"
         ref="queryForm"
@@ -469,7 +323,7 @@
           <el-input
             style="width: 230px"
             v-model="queryexpressNo.receiver"
-            placeholder=""
+            placeholder
             clearable
             disabled
           />
@@ -478,7 +332,7 @@
           <el-input
             style="width: 230px"
             v-model="queryexpressNo.phone"
-            placeholder=""
+            placeholder
             clearable
             disabled
           />
@@ -489,7 +343,7 @@
             style="width: 230px"
             type="textarea"
             :rows="5"
-            placeholder=""
+            placeholder
             disabled
             clearable
           />
@@ -509,12 +363,7 @@
       </div>
     </el-dialog>
     <!-- 退款弹框 -->
-    <el-dialog
-      title="退款信息"
-      :visible.sync="innerrefund"
-      append-to-body
-      width="700px"
-    >
+    <el-dialog title="退款信息" :visible.sync="innerrefund" append-to-body width="700px">
       <el-form
         :model="refundlist"
         ref="queryForm"
@@ -524,63 +373,46 @@
         label-width="110px"
       >
         <el-form-item label="商品名称" prop="goodsName">
-          <el-input
-            v-model="refundlist.goodsName"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.goodsName" placeholder clearable disabled />
         </el-form-item>
         <el-form-item label="退款类型" prop="refundType">
-          <el-input
-            :value="refundTypeStatus(refundlist.refundType)"
-            disabled
-            style="width: 205px"
-          />
+          <el-input :value="refundTypeStatus(refundlist.refundType)" disabled style="width: 205px" />
         </el-form-item>
         <el-form-item label="订单类型" prop="orderType">
-          <el-select
-            v-model="refundlist.orderType"
-            placeholder="请选择订单类型"
-            disabled
-          >
+          <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-option>
           </el-select>
         </el-form-item>
         <el-form-item label="退款原因" prop="dictLabel">
-          <el-input
-            v-model="refundlist.dictLabel"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.dictLabel" placeholder clearable disabled />
         </el-form-item>
         <el-form-item label="退款金额" prop="godTotalPrice">
-          <el-input
-            v-model="refundlist.godTotalPrice"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
+        </el-form-item>
+        <el-form-item
+          label="退款积分"
+          prop="godTotalPrice"
+          v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
+        >
+          <el-input v-model="refundlist.integralExchangeSill" placeholder clearable disabled />
         </el-form-item>
         <el-form-item label="补充描述和凭证" prop="refundReasonRemark">
           <el-input
             style="width: 300px"
             v-model="refundlist.refundReasonRemark"
-            placeholder=""
+            placeholder
             clearable
             type="textarea"
             :rows="5"
             disabled
           />
         </el-form-item>
-        <el-form-item> </el-form-item>
+        <el-form-item></el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refundcancel">取 消</el-button>
@@ -638,7 +470,7 @@
         >
         </el-table-column>
       </el-table>
-    </el-dialog> -->
+    </el-dialog>-->
   </div>
 </template>
 
@@ -654,7 +486,7 @@ import {
   editExpressNo,
   goodsOrderrefund,
   weChatRefundOrderApply,
-  selectOrderEvaluate,
+  selectOrderEvaluate
 } from "@/api/system/goodsOrder";
 import { getListByUser } from "@/api/system/userlist.js";
 import baseurl from "@/api/baseurl.js";
@@ -677,58 +509,58 @@ export default {
       orderStatuslist: [
         {
           value: "WAIT_PAY",
-          label: "待付款",
+          label: "待付款"
         },
         {
           value: "PAY",
-          label: "待发货",
+          label: "待发货"
         },
         {
           value: "WAIT_RECEIVED_GOODS",
-          label: "待收货",
+          label: "待收货"
         },
         {
           value: "RECEIVED_GOODS",
-          label: "待评价",
+          label: "待评价"
         },
         {
           value: "EVALUATED",
-          label: "交易完成",
+          label: "交易完成"
         },
         {
           value: "CANCEL",
-          label: "已取消",
+          label: "已取消"
         },
         {
           value: "WAIT_RETURNED_GOODS",
-          label: "待退货",
+          label: "待退货"
         },
         {
           value: "RETURNED_GOODS",
-          label: "已退货",
+          label: "已退货"
         },
         {
           value: "WAIT_REFUND",
-          label: "退款中",
+          label: "退款中"
         },
         {
           value: "REFUNDED",
-          label: "退款成功",
-        },
+          label: "退款成功"
+        }
       ],
       orderTypelist: [
         {
           value: "INTEGRAL_EXCHANGE",
-          label: "积分兑换",
+          label: "积分兑换"
         },
         {
           value: "DIRECT_BUY",
-          label: "直接购买",
+          label: "直接购买"
         },
         {
           value: "HEALTH_CONSULTATION",
-          label: "健康咨询",
-        },
+          label: "健康咨询"
+        }
       ],
       // 遮罩层
       loading: true,
@@ -762,24 +594,24 @@ export default {
         receiveAddress: null,
         phone: null,
         orderTime: null,
-        orderChannel: null,
+        orderChannel: null
       },
       queryexpressNo: {
         id: "",
-        expressNo: null,
+        expressNo: null
       },
       //权限查询
       getListByUserquery: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       refundinfo: {
-        id: "",
+        id: ""
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {}
     };
   },
   created() {
@@ -854,7 +686,7 @@ export default {
     /** 查询商品订单列表 */
     getList() {
       this.loading = true;
-      listGoodsOrder(this.queryParams).then((response) => {
+      listGoodsOrder(this.queryParams).then(response => {
         this.goodsOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -863,7 +695,7 @@ export default {
     // 查看商品信息
     seeOrder(row) {
       const id = row.orderNo;
-      getGoodsOrderlist(id).then((res) => {
+      getGoodsOrderlist(id).then(res => {
         this.orderList = res.data;
         this.innerorder = true;
         this.ratelist = {};
@@ -883,7 +715,7 @@ export default {
     // 确定按钮
     searchlogistics() {
       console.log(this.queryexpressNo);
-      editExpressNo(this.queryexpressNo).then((res) => {
+      editExpressNo(this.queryexpressNo).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("录入成功");
         }
@@ -900,7 +732,7 @@ export default {
     // 确认退款
     refund(id) {
       console.log(id);
-      goodsOrderRefundinfo(id).then((res) => {
+      goodsOrderRefundinfo(id).then(res => {
         this.refundlist = res.data;
         console.log(this.refundlist);
         this.innerrefund = true;
@@ -916,7 +748,7 @@ export default {
       obj.refundPrice = this.refundlist.godTotalPrice;
       obj.remark = this.refundlist.refundReasonRemark;
       obj.goodsStatus = this.refundlist.orderStatus;
-      weChatRefundOrderApply(obj).then((res) => {
+      weChatRefundOrderApply(obj).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("退款有延迟，请耐心等待");
         }
@@ -971,7 +803,7 @@ export default {
         receiveAddress: null,
         phone: null,
         orderTime: null,
-        orderChannel: null,
+        orderChannel: null
       };
       this.form = {
         pageNum: 1,
@@ -992,7 +824,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        orderStatus: "",
+        orderStatus: ""
       };
       this.resetForm("queryParams");
     },
@@ -1024,7 +856,7 @@ export default {
 
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1038,7 +870,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getGoodsOrder(id).then((response) => {
+      getGoodsOrder(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改商品订单";
@@ -1046,16 +878,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateGoodsOrder(this.form).then((response) => {
+            updateGoodsOrder(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addGoodsOrder(this.form).then((response) => {
+            addGoodsOrder(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1069,7 +901,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？')
-        .then(function () {
+        .then(function() {
           return delGoodsOrder(ids);
         })
         .then(() => {
@@ -1083,14 +915,14 @@ export default {
       this.download(
         "system/goodsOrder/export",
         {
-          ...this.getListByUserquery,
+          ...this.getListByUserquery
         },
         `goodsOrder_${new Date().getTime()}.xlsx`
       );
     },
     //权限列表
     info() {
-      getListByUser(this.getListByUserquery).then((res) => {
+      getListByUser(this.getListByUserquery).then(res => {
         this.total2 = res.total;
         this.nurseStationlist = res.rows;
         this.queryParams.nurseStationId = res.rows[0].id;
@@ -1101,13 +933,13 @@ export default {
     infos() {
       var queryFor = {
         pageNum: 1,
-        pageSize: 9999,
+        pageSize: 9999
       };
-      getListByUser(queryFor).then((res) => {
+      getListByUser(queryFor).then(res => {
         console.log(res);
         this.handstationlist = res.rows;
       });
-    },
-  },
+    }
+  }
 };
 </script>

From 906e621a126b2848d891ff83563d9f5a220fe72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 6 Mar 2023 17:22:48 +0800
Subject: [PATCH 9/9] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 87aa707..284fea7 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -68,7 +68,7 @@
           <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">交易完成</el-button>
           <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
           <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'">待退货</el-button>
-          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">退款成功</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">已退款</el-button>
           <el-button type="danger" v-if="scope.row.orderStatus == 'RETURNED_GOODS'">已退货</el-button>
         </template>
       </el-table-column>