Merge remote-tracking branch 'origin/master'

src/api/oms/aftersale.js

@@ -52,3 +52,12 @@ export function exportOmsAftersale(query) {
     params: query
   })
 }
+
+// 售后订单操作
+export function dealWithAftersale(data){
+  return request({
+    url: '/oms/aftersale/dealWith',
+    method: 'post',
+    data: data
+  })
+}

src/config/business.js

@@ -2,5 +2,5 @@ export const dict_types = ["sys_user_sex",
   "sys_show_hide", "sys_normal_disable", "sys_job_status", "sys_job_group", "sys_yes_no", "sys_notice_type", "sys_notice_status",
   "sys_oper_type", "sys_common_status", "wms_item_type", "wms_carrier_level", "wms_supplier_level", "wms_receipt_type", "wms_receipt_status",
   "wms_shipment_type", "wms_shipment_status", "wms_movement_type", "wms_movement_status",
-  "pms_publish_status", 'sku_sort_list', 'sys_show_status','oms_pay_type','oms_order_status'
+  "pms_publish_status", 'sku_sort_list', 'sys_show_status','oms_pay_type','oms_order_status','oms_aftersale_status','oms_aftersale_type'
 ];

src/layout/index.vue

@@ -122,6 +122,6 @@ export default {
     box-shadow: -1px 0 12px 0 var(--gray-5);
     transition: all .28s;
     background-color: white;
-    z-index: 1;
+    z-index: 100;
   }
 </style>

src/router/index.js

@@ -180,7 +180,7 @@ export const dynamicRoutes = [
     path: '/order',
     component: Layout,
     hidden: true,
-    permissions: ['manager:oms:order:query'],
+    permissions: ['oms:order:query'],
     children: [
       {
         path: 'detail',
@@ -189,7 +189,21 @@ export const dynamicRoutes = [
         meta: { title: '订单详情' }
       }
     ]
+  },
+  {
+    path: '/aftersale',
+    component: Layout,
+    hidden: true,
+    permissions: ['oms:aftersale:query'],
+    children: [
+      {
+        path: 'detail',
+        component: () => import('@/views/oms/aftersale/detail'),
+        name: 'aftersaleOrderDetail',
+        meta: { title: '售后订单详情' }
       }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错

src/views/oms/aftersale/detail.vue

@@ -0,0 +1,255 @@
+<template>
+    <div class="order_detail_wrapper">
+        <el-main v-loading="loading">
+            <el-card>
+                <el-descriptions title="订单信息" :column="2" border label-class-name="my-label" contentClassName="my-content">
+                    <template slot="extra">
+                        <el-button size="small" @click="$router.back()">返回</el-button>
+                    </template>
+                    <el-descriptions-item label="订单号">{{ orderDetail.orderSn }}</el-descriptions-item>
+                    <el-descriptions-item label="用户昵称">{{ orderDetail.nickName }}</el-descriptions-item>
+                    <el-descriptions-item label="用户手机号">{{ orderDetail.phone }}</el-descriptions-item>
+                    <el-descriptions-item label="下单时间">{{ parseTime(orderDetail.createTime, '')
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="支付方式">{{ getPayType(orderDetail) }}</el-descriptions-item>
+                    <el-descriptions-item label="支付时间">{{ parseTime(orderDetail.payTime, '')
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="订单状态">{{ getOrderStatus(orderDetail) }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <div slot="header" style="font-size: 16px;font-weight: bold;">售后信息</div>
+                <el-table :data="refundInfoList">
+                    <el-table-column label="售后单号" prop="id" width="150"></el-table-column>
+                    <el-table-column label="售后类型" prop="applyRefundType" width="80">
+                        <template slot-scope="{row}">
+                            <span>{{ getAftersaleType(row) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请售后时间" prop="applyRefundTime" width="180">
+                        <template slot-scope="{row}">
+                            <span>
+                                {{ parseTime(row.applyRefundTime, '') }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="退款金额" prop="refundAmount">
+                        <template v-slot="scope">
+                            ￥<span>{{ scope.row.refundAmount }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请原因" prop="reason"></el-table-column>
+<!--                    <el-table-column label="凭证" prop="proofPics">-->
+<!--                        <template slot-scope="{row}">-->
+<!--                            <el-image class="small-img circle-img" :src="row.proofPics"-->
+<!--                                :preview-src-list="[row.proofPics]" />-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+                    <el-table-column label="申请状态" prop="refundStatus" width="110">
+                        <template slot-scope="{row}">
+                            <span>{{ getAftersaleStatus(row) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="平台拒绝理由" prop="remark"></el-table-column>
+<!--                    <el-table-column label="退货快递号" prop="expressNo"></el-table-column>-->
+                    <el-table-column label="操作">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="text" icon="el-icon-edit"
+                                @click="handleWatch(scope.row)">查看</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+                <el-descriptions title="收货信息" :column="2" border label-class-name="my-label" contentClassName="my-content">
+                    <el-descriptions-item label="收货人姓名">{{ addressInfo.name }}</el-descriptions-item>
+                    <el-descriptions-item label="收货人手机号">{{ addressInfo.userPhone }}</el-descriptions-item>
+                    <el-descriptions-item label="收货区域">{{ addressInfo.area }}</el-descriptions-item>
+                    <el-descriptions-item label="详细地址">{{ getHiddenDetailAddress(addressInfo.address) }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <div slot="header" style="font-size: 16px;font-weight: bold;">商品信息</div>
+                <el-table :data="products">
+                    <el-table-column label="商品图片" prop="pic">
+                        <template slot-scope="{row}"><el-image class="small-img circle-img" :src="row.pic"
+                                :preview-src-list="[row.pic]" /></template>
+                    </el-table-column>
+                    <el-table-column label="商品ID" prop="productId"></el-table-column>
+                    <el-table-column label="商品名称" prop="productName"></el-table-column>
+                    <el-table-column label="商品规格" align="center" prop="spData" width="180">
+                      <template slot-scope="scope">
+                        <div v-for="(item,key) in JSON.parse(scope.row.spData)">{{ key }}：{{ item }}</div>
+                      </template>
+                    </el-table-column>
+                  <el-table-column label="价格" prop="salePrice"></el-table-column>
+                  <el-table-column label="购买数量" prop="buyNum"></el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+              <el-descriptions title="物流信息" :column="3" border label-class-name="my-label" contentClassName="my-content">
+                <el-descriptions-item label="发货时间">{{ parseTime(orderDetail.deliveryTime, '')
+                  }}</el-descriptions-item>
+                <el-descriptions-item label="快递单号">{{ orderDetail.expressNo }}</el-descriptions-item>
+                <el-descriptions-item label="物流公司">{{ orderDetail.expressNo ? '顺丰速运' : '' }}</el-descriptions-item>
+<!--                <el-descriptions-item label="物流公司">{{ orderDetail.expressName }}</el-descriptions-item>-->
+              </el-descriptions>
+            </el-card>
+            <!-- 售后详细信息 -->
+            <el-dialog title="售后详细信息" :visible.sync="open" width="1100px" append-to-body>
+                <el-descriptions :column="2" border label-class-name="my-label" contentClassName="my-content">
+                    <el-descriptions-item label="售后单号">{{ refundInfoDetail.id }}</el-descriptions-item>
+                    <el-descriptions-item label="售后类型">{{ getAftersaleType(refundInfoDetail) }}</el-descriptions-item>
+                    <el-descriptions-item label="申请售后时间">{{ parseTime(refundInfoDetail.applyRefundTime,'') }}</el-descriptions-item>
+                    <el-descriptions-item label="退款金额">￥{{ refundInfoDetail.refundAmount }}</el-descriptions-item>
+                    <el-descriptions-item label="申请原因">{{ refundInfoDetail.reason }}</el-descriptions-item>
+<!--                    <el-descriptions-item label="凭证">-->
+<!--                        <el-image class="small-img circle-img" :src="refundInfoDetail.proofPics"-->
+<!--                                :preview-src-list="[refundInfoDetail.proofPics]" />-->
+<!--                    </el-descriptions-item>-->
+                    <el-descriptions-item label="申请状态">{{ getAftersaleStatus(refundInfoDetail) }}</el-descriptions-item>
+                    <el-descriptions-item label="平台拒绝理由">{{ refundInfoDetail.remark }}</el-descriptions-item>
+                    <el-descriptions-item label="退货快递号">{{ refundInfoDetail.expressNo }}</el-descriptions-item>
+                    <el-descriptions-item label="物流公司">{{ getExpressName(refundInfoDetail) }}</el-descriptions-item>
+                </el-descriptions>
+            </el-dialog>
+        </el-main>
+    </div>
+</template>
+
+<script>
+import { getOmsAftersale } from "@/api/oms/aftersale";
+
+export default {
+    name: "OmsAftersaleDetail",
+    dicts: ['oms_order_status', 'oms_pay_type', "oms_aftersale_type", "oms_aftersale_status"],
+    data() {
+        return {
+            products: [],
+            orderDetail: {},
+            addressInfo: {},
+            // aliLogisticsInfoList: [],
+            refundInfoList: [],
+            loading: false,
+            experssList: [],
+            open: false,
+            refundInfoDetail: {},
+            aliLogisticsInfoList: []
+        }
+    },
+    created() {
+        const { id } = this.$route.query
+        this.queryDetail(id).then((expressNo) => {
+            // this.getLogistic(expressNo)
+        })
+    },
+    computed: {
+        orderStatusMap() {
+            let obj = this.dict.type.oms_order_status.map(item => [item.value, item.label])
+            let map = new Map(obj)
+            return map;
+        },
+        payTypeMap() {
+            let obj = this.dict.type.oms_pay_type.map(item => [item.value, item.label])
+            let map = new Map(obj)
+            return map
+        },
+        aftersaleTypeMap() {
+            let obj = this.dict.type.oms_aftersale_type.map(item => [item.value, item.label])
+            let map = new Map(obj)
+            return map;
+        },
+        aftersaleStatusMap() {
+            let obj = this.dict.type.oms_aftersale_status.map(item => [item.value, item.label])
+            let map = new Map(obj)
+            return map;
+        },
+        expressMap() {
+            let obj = this.experssList.map(item => [item.expressCode, item.expressName])
+            let map = new Map(obj)
+            return map
+        }
+    },
+    methods: {
+        queryDetail(id) {
+            this.loading = true
+            return new Promise(resolve =>
+                getOmsAftersale(id).then(res => {
+                    const { productList, addressInfo, refundInfoList } = res;
+                    this.orderDetail = res;
+                    this.products = productList
+                    this.refundInfoList = refundInfoList
+                    this.addressInfo = addressInfo || {}
+                    this.loading = false
+                })
+            )
+        },
+        getOrderStatus(row) {
+            return this.orderStatusMap.get(row.status + '')
+        },
+        getPayType(row) {
+            return this.payTypeMap.get(row.payType + '')
+        },
+        getAftersaleType(row) {
+            return this.aftersaleTypeMap.get(row.applyRefundType + '')
+        },
+        getAftersaleStatus(row) {
+            return this.aftersaleStatusMap.get(row.refundStatus + '')
+        },
+        getExpressName(row) {
+            return this.expressMap.get(row.expressName + '')
+        },
+        handleWatch(row) {
+            this.refundInfoDetail = row
+            // if(this.refundInfoDetail.allLogistics){
+            //     this.aliLogisticsInfoList = JSON.parse(refundInfoDetail.allLogistics)
+            // }
+            this.open = true
+        },
+        cancel() {
+            this.open = false;
+            this.refundInfoDetail = {};
+        }
+    }
+}
+</script>
+
+<style lang="stylus">
+  .order_detail_wrapper
+    > .el-card + .el-card
+      margin-top 1rem
+
+    .el-form-item
+      margin-bottom 0
+
+      .el-form-item__content, .el-form-item__label
+        line-height 2
+
+  .my-label
+    width 100px
+  .my-content
+    width 400px
+.popperOptions[x-placement^=left] .popper__arrow::after{
+    border-left-color: #565D6B;
+}
+.popperOptions[x-placement^=right] .popper__arrow::after{
+    border-right-color: #565D6B;
+}
+.popperOptions[x-placement^=bottom] .popper__arrow::after{
+    border-bottom-color: #565D6B;
+}
+.popperOptions[x-placement^=top] .popper__arrow::after{
+    border-top-color: #565D6B;
+}
+.popperOptions{
+    background-color: #565D6B;
+    color: #FFFFFF;
+    border: #565D6B;
+}
+.el-timeline-item__content {
+    color: #fff;
+}
+.el-timeline-item__timestamp {
+    color: #fff;
+}
+  </style>

src/views/oms/aftersale/index.vue

@@ -1,137 +1,85 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="MEMBER_ID" prop="memberId">
+      <el-form-item label="申请状态" prop="status">
-        <el-input
+        <el-select v-model="queryParams.status" placeholder="请选择申请状态" clearable size="small">
-          v-model="queryParams.memberId"
+          <el-option v-for="(item, index) in dict.type.oms_aftersale_status" :label="item.label" :value="item.value" />
-          placeholder="请输入MEMBER_ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单id" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款金额" prop="returnAmount">
-        <el-input
-          v-model="queryParams.returnAmount"
-          placeholder="请输入退款金额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="售后类型：1：退款，2：退货退款" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择售后类型：1：退款，2：退货退款" clearable size="small">
-              <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" prop="status">
+      <el-form-item label="售后类型" prop="type">
-        <el-select v-model="queryParams.status" placeholder="请选择申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" clearable size="small">
+        <el-select v-model="queryParams.type" placeholder="请选择售后类型" clearable size="small">
-              <el-option label="请选择字典生成" value="" />
+          <el-option v-for="(item, index) in dict.type.oms_aftersale_type" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="处理时间" prop="handleTime">
+      <el-form-item label="订单号" prop="orderSn">
-        <el-date-picker
+        <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"
-            clearable
+                  @keyup.enter.native="handleQuery" />
-            size="small"
-            v-model="queryParams.handleTime"
-            type="datetime"
-            value-format="yyyy-MM-ddTHH:mm:ss"
-            placeholder="选择处理时间">
-        </el-date-picker>
       </el-form-item>
-      <el-form-item label="退货数量" prop="quantity">
+      <el-form-item label="售后单号" prop="id">
-        <el-input
+        <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small"
-          v-model="queryParams.quantity"
+                  @keyup.enter.native="handleQuery" />
-          placeholder="请输入退货数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <template v-if="showMoreCondition">
+      <el-form-item label="会员手机号" prop="userPhone">
-      <el-form-item label="原因" prop="reason">
+        <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
-        <el-input
+                  @keyup.enter.native="handleQuery" />
-          v-model="queryParams.reason"
-          placeholder="请输入原因"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="处理人员" prop="handleMan">
+      <el-form-item label="创建时间" prop="Time">
-        <el-input
+        <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
-          v-model="queryParams.handleMan"
+                        range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请输入处理人员"
+                        start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" align="right"
-          clearable
+                        @change="handleChange">
-          size="small"
+        </el-date-picker>
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-    </template>
       <el-form-item class="flex_one tr">
         <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 :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oms:aftersale:add']"
-        >新增</el-button>
-      </el-col>
-      </el-col>
-    </el-row>
-
     <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
+      <el-table-column label="订单号" align="center" prop="orderSn" width="200"/>
-      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="售后单号" align="center" prop="id" width="160"/>
-      <el-table-column label="退款金额" align="center" prop="returnAmount" />
+      <el-table-column label="申请状态" align="center" prop="aftersaleStatus" width="80">
-      <el-table-column label="售后类型：1：退款，2：退货退款" align="center" prop="type" />
+        <template v-slot="scope">
-      <el-table-column label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" align="center" prop="status" />
+          <el-tag effect="plain" size="medium" :type="getAftersaleStatusTag(scope.row)">{{
+              getAftersaleStatusText(scope.row) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户信息" align="center" prop="nickName" width="120">
+        <template v-slot="scope">
+          <div>{{ scope.row.nickName }}</div>
+          <div>{{ scope.row.phone }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="退款金额" align="center" prop="applyReturnAmount" width="120"/>
+      <el-table-column label="售后类型" align="center" prop="applyRefundType" width="80">
+        <template v-slot="scope">
+          <el-tag effect="plain" size="medium" :type="getAftersaleTypeTag(scope.row)">{{
+              getAftersaleTypeText(scope.row) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请时间" align="center" prop="applyRefundTime" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyRefundTime, '')}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="处理时间" align="center" prop="handleTime" width="180" >
         <template slot-scope="scope">
             <span>{{ parseTime(scope.row.handleTime, '')}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="退货数量" align="center" prop="quantity" />
+      <el-table-column label="原因" align="center" prop="reason" width="220"/>
-      <el-table-column label="原因" align="center" prop="reason" />
+      <el-table-column label="处理备注" align="center" prop="note" width="150"/>
-      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="处理人员" align="center" prop="handleMan" width="100"/>
-      <el-table-column label="凭证图片，以逗号隔开" align="center" prop="proofPics" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
-      <el-table-column label="处理备注" align="center" prop="handleNote" />
-      <el-table-column label="处理人员" align="center" prop="handleMan" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)"
-            size="mini"
+                     v-hasPermi="['oms:aftersale:query']">详情</el-button>
-            type="text"
+          <el-button size="mini" type="text"  @click="approve(scope.row.orderId, 1)"
-            icon="el-icon-edit"
+                     v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意</el-button>
-            @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text"  @click="handleOpen(scope.row.orderId, 2)"
-            v-hasPermi="['oms:aftersale:edit']"
+                     v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">拒绝</el-button>
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oms:aftersale:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -144,57 +92,15 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改订单售后对话框 -->
+    <!-- 拒绝对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="updateForm" :model="updateOrderForm" label-width="100px" :rules="rules">
-        <el-form-item label="MEMBER_ID" prop="memberId">
+        <el-form-item label="拒绝理由" prop="remark">
-          <el-input v-model="form.memberId" placeholder="请输入MEMBER_ID" />
+          <el-input v-model="updateOrderForm.remark" placeholder="请输入拒绝理由" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="订单id" prop="orderId">
-          <el-input v-model="form.orderId" placeholder="请输入订单id" />
-        </el-form-item>
-        <el-form-item label="退款金额" prop="returnAmount">
-          <el-input v-model="form.returnAmount" placeholder="请输入退款金额" />
-        </el-form-item>
-        <el-form-item label="售后类型：1：退款，2：退货退款" prop="type">
-          <el-select v-model="form.type" placeholder="请选择售后类型：1：退款，2：退货退款">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="处理时间" prop="handleTime">
-          <el-date-picker clearable size="small"
-                        v-model="form.handleTime"
-                        type="datetime"
-                        value-format="yyyy-MM-ddTHH:mm:ss"
-                        placeholder="选择处理时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="退货数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入退货数量" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reason">
-          <el-input v-model="form.reason" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="凭证图片，以逗号隔开" prop="proofPics">
-          <el-input v-model="form.proofPics" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="处理备注" prop="handleNote">
-          <el-input v-model="form.handleNote" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="处理人员" prop="handleMan">
-          <el-input v-model="form.handleMan" placeholder="请输入处理人员" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitUpdate('updateForm')">确定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -202,12 +108,17 @@
 </template>
 
 <script>
-import { listOmsAftersale, getOmsAftersale, delOmsAftersale, addOmsAftersale, updateOmsAftersale, exportOmsAftersale } from "@/api/oms/aftersale";
+import { listOmsAftersale, getOmsAftersale, delOmsAftersale, addOmsAftersale, updateOmsAftersale, exportOmsAftersale, dealWithAftersale } from "@/api/oms/aftersale";
+import dateUtil from '@/utils/DateUtil';
 
 export default {
   name: "OmsAftersale",
+  dicts: ["oms_aftersale_type", "oms_aftersale_status"],
   data() {
     return {
+      pickerOptions: {
+        shortcuts: dateUtil.getTimeShort2()
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -225,35 +136,34 @@ export default {
       // 订单售后表格数据
       omsAftersaleList: [],
       // 弹出层标题
-      title: "",
+      title: "拒绝售后",
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        memberId: null,
+        orderSn: null,
-        orderId: null,
-        returnAmount: null,
         type: null,
         status: null,
-        handleTime: null,
+        userPhone: null,
-        quantity: null,
+        Time: [],
-        reason: null,
+        startTime: null,
-        description: null,
+        endTime: null
-        proofPics: null,
-        handleNote: null,
-        handleMan: null,
       },
       // 表单参数
       form: {},
-      // 表单校验
+      showMoreCondition: false,
-      rules: {
+      updateOrderForm: {
-        memberId: [
+        orderId: null,
-          { required: true, message: "MEMBER_ID不能为空", trigger: "blur" }
+        optType: null,
-        ],
+        remark: null
       },
-      showMoreCondition: false
+      rules: {
+        remark: [
+          {required: true, message: '请输入拒绝理由', trigger: 'blur'}
+        ]
+      }
     };
   },
   created() {
@@ -262,6 +172,10 @@ export default {
   methods: {
     /** 查询订单售后列表 */
     getList() {
+      if (this.queryParams.Time){
+        this.queryParams.startTime = this.queryParams.Time[0]
+        this.queryParams.endTime = this.queryParams.Time[1]
+      }
       this.loading = true;
       const {pageNum, pageSize} = this.queryParams;
       const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
@@ -273,11 +187,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
@@ -373,7 +282,97 @@ export default {
         this.$download.download(response);
         this.exportLoading = false;
       }).catch(() => {});
+    },
+    /** 售后详情 */
+    handleDetail(orderId){
+      const id = orderId
+      this.$router.push({ path: '/aftersale/detail', query: { id } })
+    },
+    /** 同意售后 */
+    approve(orderId, type){
+      this.updateOrderForm.orderId = orderId
+      this.updateOrderForm.optType = type
+      dealWithAftersale(this.updateOrderForm).then((response) => {
+        this.cancel()
+        this.$message.success('操作成功')
+        this.getList()
+      })
+    },
+    /** 拒绝 */
+    handleOpen(orderId, type){
+      this.updateOrderForm.orderId = orderId
+      this.updateOrderForm.optType = type
+      this.open = true
+    },
+    getAftersaleStatusTag(row) {
+      switch (row.aftersaleStatus) {
+        case 0:
+          return 'info'
+        case 1:
+          return 'primary'
+        case 2:
+          return 'success'
+        case 3:
+          return 'danger'
+        case 4:
+          return 'warning'
+      }
+    },
+    getAftersaleStatusText(row) {
+      switch (row.aftersaleStatus) {
+        case 0:
+          return '待处理'
+        case 1:
+          return '退货中'
+        case 2:
+          return '已完成'
+        case 3:
+          return '已拒绝'
+        case 4:
+          return '已关闭'
+      }
+    },
+    getAftersaleTypeTag(row) {
+      switch (row.applyRefundType) {
+        case 1:
+          return 'primary'
+        case 2:
+          return 'warning'
+      }
+    },
+    getAftersaleTypeText(row) {
+      switch (row.applyRefundType) {
+        case 1:
+          return '退款'
+        case 2:
+          return '退货退款'
+      }
+    },
+    cancel() {
+      this.open = false;
+      this.updateOrderForm = {
+        orderId: null,
+        optType: null,
+        remark: null
       }
+    },
+    submitUpdate(formName){
+      this.$refs[formName].validate(valid => {
+        if(valid){
+          dealWithAftersale(this.updateOrderForm).then((response) => {
+            this.cancel()
+            this.$message.success('操作成功')
+            this.getList()
+          })
+        }
+      })
+    },
+    handleChange(value) {
+      if (!value) {
+        this.queryParams.startTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
   }
 };
 </script>

src/views/oms/order/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
       <el-form-item label="订单状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value"/>
+          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value" v-if="item.value < 11"/>
         </el-select>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderSn">

src/views/oms/orderOperateHistory/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="订单id" prop="orderId">
+      <el-form-item label="订单号" prop="orderId">
         <el-input
-          v-model="queryParams.orderId"
+          v-model="queryParams.orderSn"
-          placeholder="请输入订单id"
+          placeholder="请输入订单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -31,9 +31,8 @@
     </el-form>
 
     <el-table v-loading="loading" :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="订单号" align="center" prop="orderSn" />
-<!--      <el-table-column label="操作人" align="center" prop="operateMan" />-->
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template v-slot="scope">
           <el-tag :type="getOrderTypeTag(scope.row.orderStatus)" style="margin-right: 10px">
@@ -133,7 +132,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        orderId: null,
+        orderSn: null,
         operateMan: null,
         orderStatus: null,
         note: null,
@@ -284,6 +283,14 @@ export default {
           return '已关闭';
         case 5:
           return '无效订单';
+        case 11:
+          return '售后待处理';
+        case 12:
+          return '退货中';
+        case 13:
+          return '售后已完成';
+        case 14:
+          return '售后已拒绝';
       }
     }
   }