From 4c7362a05f5b9a7aab2a6c199dbd23a1e1cf0f07 Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Wed, 7 Dec 2022 18:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bxg/yxStoreAfterSales.js              | 11 ++-
 src/views/bxg/shop/afterSeals/checkDialog.vue | 72 +++++++++++++++----
 src/views/bxg/shop/afterSeals/index.vue       | 11 +--
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/src/api/bxg/yxStoreAfterSales.js b/src/api/bxg/yxStoreAfterSales.js
index c4dc6db..e15c731 100644
--- a/src/api/bxg/yxStoreAfterSales.js
+++ b/src/api/bxg/yxStoreAfterSales.js
@@ -8,6 +8,15 @@ export function getData(data) {
   })
 }
 
+export function getRefundInfo(data) {
+  return request({
+    url: '/bxg/api/yxStoreAfterSales/order/express',
+    method: 'post',
+    data
+  })
+}
+
+
 export function salesCheck(data) {
   return request({
     url: '/bxg/api/yxStoreAfterSales/salesCheck',
@@ -17,7 +26,7 @@ export function salesCheck(data) {
 }
 
 export function rebackMoney(params) {
-  return request({
+  return request({   //打款退钱
     url: '/bxg/api/yxStoreAfterSales/makeMoney',
     method: 'post',
     params
diff --git a/src/views/bxg/shop/afterSeals/checkDialog.vue b/src/views/bxg/shop/afterSeals/checkDialog.vue
index 4fd33d1..fa29ff4 100644
--- a/src/views/bxg/shop/afterSeals/checkDialog.vue
+++ b/src/views/bxg/shop/afterSeals/checkDialog.vue
@@ -25,11 +25,11 @@
             <b>用户未上传图片</b>
           </div>
           <div v-else>
-            <el-image 
+            <el-image
               v-for="(item,index) in checkForm.explainImg.split(',')"
               :key="index"
               style="width: 100px; height: 100px"
-              :src="item" 
+              :src="item"
               :preview-src-list="[item]">
             </el-image>
           </div>
@@ -83,6 +83,18 @@
         </el-form-item>
       </el-form>
     </div>
+    <div v-if="serviceType === 1&& (this.checkForm.state===2||this.checkForm.state===3)">
+      <span>退货物流查看</span>
+      <el-timeline :reverse="reverse">
+        <el-timeline-item
+          v-for="(activity, index) in activities"
+          :key="index"
+          :timestamp="activity.acceptTime">
+          {{activity.AcceptStation}}
+        </el-timeline-item>
+      </el-timeline>
+      <span v-if="this.activities==null">{{this.reason}}</span>
+    </div>
     <div slot="footer" class="dialog-footer">
       <el-button class="refuse" type="danger" v-if="isShow" :loading="loading" @click="submit(1)">拒绝</el-button>
       <el-button class="check" type="primary" v-if="isShow" :loading="loading" @click="submit(0)">确认</el-button>
@@ -91,7 +103,7 @@
 </template>
 
 <script>
-import {salesCheck} from '@/api/bxg/yxStoreAfterSales.js'
+import {getRefundInfo, salesCheck} from '@/api/bxg/yxStoreAfterSales.js'
 export default {
   props: {
   },
@@ -110,6 +122,8 @@ export default {
         phoneNumber: '', // 手机号
         address: '' // 地址
       },
+      activities:[],
+      reason:'',
       rules: {
         consignee: [{ required: true, message: '请输入收货人', trigger: 'blur' }],
         phoneNumber: [{ required: true, message: '请输入收货人手机号', trigger: 'blur' }],
@@ -117,12 +131,31 @@ export default {
       },
     }
   },
+  mounted() {
+    //查看退货的物流信息
+    this.getRefundInfo()
+  },
   methods: {
+    getRefundInfo(){
+      let data={
+        //订单编号
+       orderCode:this.checkForm.orderCode,
+        //快递公司编码
+        shipperCode:this.checkForm.shipperCode,
+        //物流单号
+       logisticCode:this.checkForm.deliverySn
+      }
+      getRefundInfo(data).then(res=>{
+          console.log('res',res)
+        this.activities=res.Traces
+        this.reason=res.Reason
+      })
+    },
     cancel() {
       this.visible = false
       this.$refs['form'].resetFields()
     },
-    async submit(type) {
+     submit(type) {
       this.loading = true
       if (this.serviceType === 0) {
         this.form.consignee = ''
@@ -130,15 +163,26 @@ export default {
         this.form.address = ''
       }
       this.form.approvalStatus = type // 0成功 1失败
-      var res = await salesCheck(this.form)
-      if (res) {
-        this.$message.success('审核成功')
-        this.visible = false
-        this.$emit('checkSuccess')
-      } else {
-        this.$message.error(res.message || '审核失败！')
-      }
-      this.loading = false
+      // var res =  salesCheck(this.form)
+      // if (res) {
+      //   this.$message.success('审核成功')
+      //   this.visible = false
+      //   this.$emit('checkSuccess')
+      // } else {
+      //   this.$message.error(res.message || '审核失败！')
+      // }
+      // this.loading = false
+       salesCheck(this.form).then(res => {
+         if (res) {
+           this.$message.success('审核成功')
+           this.visible = false
+           this.$emit('checkSuccess')
+         } else {
+           this.$message.error(res.message || '审核失败！')
+         }
+       }).finally(
+         this.loading = false
+       )
     }
   }
 }
@@ -168,4 +212,4 @@ export default {
   .refuse{}
   .check{}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/bxg/shop/afterSeals/index.vue b/src/views/bxg/shop/afterSeals/index.vue
index 1931cb7..2c019cb 100644
--- a/src/views/bxg/shop/afterSeals/index.vue
+++ b/src/views/bxg/shop/afterSeals/index.vue
@@ -54,7 +54,7 @@
     </div>
     <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
     <!-- <crudOperation :permission="permission" /> -->
-    
+
     <!--表格渲染-->
     <el-table
     ref="table"
@@ -83,7 +83,8 @@
       <el-table-column prop="state" label="状态" width="100px" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.state === 0" :style="'color: #E6A23C'">等待审核</span>
-          <span v-if="scope.row.state === 1" :style="'color: #409EFF'">等待用户发货</span>
+          <span v-if="scope.row.state === 1&&scope.row.serviceType===1" :style="'color: #409EFF'">等待用户发货</span>
+          <span v-if="scope.row.state === 1&&scope.row.serviceType===0" :style="'color: #409EFF'">退款中</span>
           <span v-if="scope.row.state === 2" :style="'color: #F56C6C'">用户已发货</span>
           <span v-if="scope.row.state === 3" :style="'color: #909399'">退款成功</span>
         </template>
@@ -194,7 +195,7 @@ export default {
       this.params = {
         page: this.page,
         size: this.size,
-        
+
         serviceType: this.query.type || '', // 查询类型
         salesState: this.query.salesState || 0, // 售后状态
         state: this.query.state,
@@ -214,6 +215,7 @@ export default {
     // 审核
     checkItem(row, type) {
       this.$refs.addForm.checkForm = row
+      this.$refs.addForm.getRefundInfo()
       this.$refs.addForm.serviceType = row.serviceType
 
       this.$refs.addForm.form.salesId = row.id
@@ -229,7 +231,8 @@ export default {
     // 退款
     async rebackItem() {
       var res = await rebackMoney(this.rebackQuery)
-      if (res) {
+      console.log(res,'res')
+      if (res.status!=500) {
         this.$message.success('提交退款成功！')
         this.rebackVisible = false
         this.toQuery()