修改

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
+            disabled
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
             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;