v1.0.2改版

.env.development

@@ -5,8 +5,8 @@ ENV = 'development'
 # VUE_APP_BASE_API = '/dev-api'
 # VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # VUE_APP_BASE_API = 'http://192.168.2.67:9104'
-VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
-# VUE_APP_BASE_API = 'http://192.168.2.103:9104'
+# VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+VUE_APP_BASE_API = 'http://192.168.2.103:9104'
 # VUE_APP_BASE_API = 'http://192.168.78.1:9104/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

src/api/order.js

@@ -154,3 +154,14 @@ export function orderAddNote(data) {
     data
   })
 }
+
+/**
+ * 撤销退款
+ */
+export function revokeApply(params) {
+  return request({
+    url: '/order/cmReturnedPurchase/revokeApply',
+    method: 'get',
+    params
+  })
+}

src/filters/index.js

@@ -1,5 +1,6 @@
 // import parseTime, formatTime and set to filter
-export { parseTime, formatTime } from '@/utils'
+export { parseTime, formatTime }
+  from '@/utils'
 
 /**
  * Show plural label if time is plural number
@@ -102,10 +103,13 @@ export function amountfilters(value) {
 export function orderStatusFilter(status) {
   const map = {
     '0': '待确认',
+    '1': '待支付',
+    '2': '交易中',
     '4': '交易完成',
     '5': '订单完成',
     '6': '已关闭',
     '7': '交易全退',
+    '8': '退货退款',
     '11': '待收款、待发货',
     '12': '待收款、部分发货',
     '13': '待收款、全部发货',

src/views/finance/payfinance-remit-record.vue

@@ -3,7 +3,7 @@
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto">
         <div class="refund-item">
-          <el-row :gutter="24" class="box-row">
+          <el-row v-if="dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
             <el-col
               :span="5"
             ><b>订单编号(ID)：</b> {{ dataOrder.order.newShopOrders[0].shopOrderNo }}({{
@@ -31,7 +31,7 @@
                 >{{ dataOrder.order.status | orderStatusFilter }}</el-tag>
               </template>
             </el-col>
-            <el-col :span="4">
+            <el-col v-if="dataOrder.order.newShopOrders.length > 0" :span="4">
               <b>收款状态：</b>
               <el-tag
                 v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 1"
@@ -49,7 +49,7 @@
                 size="small"
               >已收款</el-tag>
             </el-col>
-            <el-col :span="4">
+            <el-col v-if="dataOrder.order.newShopOrders.length > 0" :span="4">
               <b>付款状态：</b>
               <el-tag
                 v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 1"
@@ -80,7 +80,7 @@
               <b>地址：</b>
               {{ dataOrder.order.address }}</el-col>
           </el-row>
-          <el-row :gutter="24" class="box-row">
+          <el-row v-if="dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
             <el-col
               :span="5"
             ><b>订单金额：</b> ¥{{

src/views/order/list.vue

@@ -125,7 +125,7 @@
           @change="getList"
         />
       </div>
-      <div class="filter-control">
+      <div class="filter-control orderSource">
         <span>订单来源:</span>
         <el-select v-model="listQuery.organizeId" style="width:180px;" clearable @change="getList">
           <el-option label="【丽格集采联盟】平台" :value="4" />
@@ -301,12 +301,17 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
   .el-form-item{
     margin-bottom: 0
   }
   .date-box{
     margin-right:0;
   }
+  .orderSource {
+    ::v-deep .el-select {
+      width: 200px !important;
+    }
+  }
 </style>
 

src/views/order/refund.vue

@@ -101,7 +101,7 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="handleDetailes(row)">查看详情</el-button>
-          <el-button type="warning" size="mini" @click="revokeRefund(row)">撤销退款</el-button>
+          <el-button v-if="row.status == 2" type="warning" size="mini" @click="revokeRefund(row)">撤销退款</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { getRefundList } from '@/api/order'
+import { getRefundList, revokeApply } from '@/api/order'
 import pickerOptions from '@/utils/time-picker.js'
 export default {
   data() {
@@ -178,11 +178,18 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '撤销成功!'
-        })
+      }).then(async() => {
+        try {
+          await revokeApply({
+            organizeId: 4,
+            id: row.id,
+            orderId: row.orderId,
+            shopOrderId: row.shopOrderReturnedList[0].shopOrderId
+          })
+          this.getList()
+        } catch (error) {
+          console.log(error)
+        }
       }).catch(() => {})
     }
   }