diff --git a/src/api/oms/aftersale.js b/src/api/oms/aftersale.js
index 93e5f40..23bce5e 100644
--- a/src/api/oms/aftersale.js
+++ b/src/api/oms/aftersale.js
@@ -61,3 +61,10 @@ export function dealWithAftersale(data){
     data: data
   })
 }
+
+export function viewLog(orderId){
+  return request({
+    url: `/oms/aftersale/log/` + orderId,
+    method: 'get'
+  })
+}
diff --git a/src/api/oms/order.js b/src/api/oms/order.js
index 4eb2e80..f276c96 100644
--- a/src/api/oms/order.js
+++ b/src/api/oms/order.js
@@ -70,3 +70,11 @@ export function deliverProduct(data){
     data: data
   })
 }
+
+// 查看订单操作日志
+export function viewLog(orderId){
+  return request({
+    url:`/oms/order/log/` + orderId,
+    method: 'get'
+  })
+}
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index ad437b9..3814590 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -72,6 +72,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)"
                      v-hasPermi="['oms:aftersale:query']">详情</el-button>
+          <el-button size="mini" type="text" @click="showLog(scope.row.orderId)"
+                     v-hasPermi="['oms:aftersale:log']">日志</el-button>
           <el-button size="mini" type="text"  @click="approve(scope.row.orderId, 1)"
                      v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意</el-button>
           <el-button size="mini" type="text"  @click="handleOpen(scope.row.orderId, 2)"
@@ -100,11 +102,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!--  日志  -->
+    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="1000px" append-to-body>
+      <el-table v-loading="logObj.loading" :data="logObj.logList">
+        <el-table-column label="最新状态" prop="orderStatus">
+          <template v-slot="scope">
+            <div>{{getLogEvent(scope.row.orderStatus)}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="note"/>
+        <el-table-column label="操作人" prop="operateMan"/>
+        <el-table-column label="时间" prop="createTime" width="180">
+          <template v-slot="scope">
+            <div>
+              {{ parseTime(scope.row.createTime, '')}}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listOmsAftersale, getOmsAftersale, delOmsAftersale, addOmsAftersale, updateOmsAftersale, exportOmsAftersale, dealWithAftersale } from "@/api/oms/aftersale";
+import { listOmsAftersale, getOmsAftersale, delOmsAftersale, addOmsAftersale, updateOmsAftersale, exportOmsAftersale, dealWithAftersale, viewLog } from "@/api/oms/aftersale";
 import dateUtil from '@/utils/DateUtil';
 
 export default {
@@ -159,6 +180,12 @@ export default {
         remark: [
           {required: true, message: '请输入拒绝理由', trigger: 'blur'}
         ]
+      },
+      logObj: {
+        title: '日志',
+        logList: null,
+        open: false,
+        loading: false
       }
     };
   },
@@ -369,6 +396,26 @@ export default {
         this.queryParams.endTime = null;
       }
     },
+    showLog(orderId){
+      this.logObj.loading = true
+      viewLog(orderId).then((response) => {
+        this.logObj.logList = response
+        this.logObj.open = true
+        this.logObj.loading = false
+      })
+    },
+    getLogEvent(status){
+      switch (status){
+        case 11:
+          return '用户申请售后';
+        case 12:
+          return '平台同意售后申请';
+        case 13:
+          return '售后完成';
+        case 14:
+          return '平台拒绝售后';
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 5f57662..559b001 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -118,8 +118,8 @@
       <el-table-column label="订单状态"  prop="status" width="270">
         <template v-slot="scope">
           <div>
-            <el-tag :type="getOrderTypeTag(scope.row.status)" style="margin-right: 10px">
-              {{ getOrderTypeText(scope.row.status) }}
+            <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
+              {{ getOrderStatusText(scope.row.status) }}
             </el-tag>
             <el-button
               size="mini"
@@ -151,6 +151,12 @@
             @click="goDetail(scope.row)"
             v-hasPermi="['oms:order:query']"
           >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="showLog(scope.row.id)"
+            v-hasPermi="['oms:order:log']"
+          >日志</el-button>
           <el-button
             size="mini"
             type="text"
@@ -205,13 +211,33 @@
         <el-button size="small" @click="cancelNote">取 消</el-button>
       </div>
     </el-dialog>
+    <!--  日志  -->
+    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="1000px" append-to-body>
+      <el-table v-loading="logObj.loading" :data="logObj.logList">
+        <el-table-column label="最新状态" prop="orderStatus">
+          <template v-slot="scope">
+            <div>{{getLogEvent(scope.row.orderStatus)}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="note"/>
+        <el-table-column label="操作人" prop="operateMan"/>
+        <el-table-column label="时间" prop="createTime" width="180">
+          <template v-slot="scope">
+            <div>
+              {{ parseTime(scope.row.createTime, '')}}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listOmsOrder, getOmsOrder, delOmsOrder, addOmsOrder, updateOmsOrder, exportOmsOrder, saveMerchantNote, deliverProduct } from "@/api/oms/order";
+import { listOmsOrder, getOmsOrder, delOmsOrder, addOmsOrder, updateOmsOrder, exportOmsOrder, saveMerchantNote, deliverProduct, viewLog } from "@/api/oms/order";
 import AddressSelector from "@/views/components/AddressSelector/index.vue";
 import dateUtil from '@/utils/DateUtil';
+import fa from "element-ui/src/locale/lang/fa";
 
 export default {
   name: "OmsOrder",
@@ -300,6 +326,12 @@ export default {
           merchantNote: null
         },
         open: false
+      },
+      logObj: {
+        title: '日志',
+        logList: null,
+        open: false,
+        loading: false
       }
     };
   },
@@ -459,7 +491,7 @@ export default {
         this.queryParams.endTime = null;
       }
     },
-    getOrderTypeTag(status){
+    getOrderStatusTag(status){
       switch (status){
         case 0:
         case 1:
@@ -474,7 +506,7 @@ export default {
           return 'danger';
       }
     },
-    getOrderTypeText(status){
+    getOrderStatusText(status){
       switch (status){
         case 0:
           return '待付款';
@@ -490,6 +522,22 @@ export default {
           return '无效订单';
       }
     },
+    getLogEvent(status){
+      switch (status){
+        case 0:
+          return '用户下单';
+        case 1:
+          return '用户支付成功';
+        case 2:
+          return '平台发货';
+        case 3:
+          return '用户确认收货';
+        case  4:
+          return '取消订单';
+        case 5:
+          return '无效订单';
+      }
+    },
     getPayTypeTag(type){
       switch (type){
         case 0:
@@ -571,6 +619,14 @@ export default {
       this.noteObj.open = false
       this.noteObj.form.id = null
       this.noteObj.form.merchantNote = null
+    },
+    showLog(orderId){
+      this.logObj.loading = true
+      viewLog(orderId).then((response) => {
+        this.logObj.logList = response
+        this.logObj.open = true
+        this.logObj.loading = false
+      })
     }
   }