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/finance.js

@@ -35,7 +35,7 @@ export function getPayTypeList(query) {
  */
 export function getReceiptDetail(id) {
   return request({
-    url: '/order/organize/receipt/detail/' + id,
+    url: `/order/organize/receipt/detail/${id.orderId}/${id.shopOrderId}`,
     method: 'get'
   })
 }

src/router/modules/finance.js

@@ -8,106 +8,118 @@ const financeRouter = {
   name: 'Finance',
   meta: { title: '财务管理', icon: 'el-icon-printer' },
   alwaysShow: true,
-  children: [
-    {
-      path: 'list',
-      name: 'List',
-      component: () => import('@/views/finance/list'),
-      meta: { title: '收款列表', noCache: true, icon: 'el-icon-coin' }
-    },
-    {
-      path: 'details',
-      name: 'Details',
-      component: () => import('@/views/finance/details'),
-      meta: { title: '收款详情', noCache: true, icon: 'el-icon-coin' },
-      hidden: true
-    },
-    {
-      path: 'payment-list',
-      name: 'PaymentList',
-      component: () => import('@/views/finance/payment-list'),
-      meta: { title: '付款列表', noCache: true, icon: 'el-icon-bank-card' }
-    },
-    {
-      path: 'payment-details',
-      name: 'PaymentDetails',
-      component: () => import('@/views/finance/payment-details'),
-      meta: { title: '付款详情', noCache: true, icon: 'el-icon-bank-card' },
-      hidden: true
-    },
-    {
-      path: 'payment-record',
-      name: 'PaymentRecord',
-      component: () => import('@/views/finance/payment-record'),
-      meta: { title: '退/付款记录', noCache: true, icon: 'el-icon-bank-card' },
-      hidden: true
-    },
-    // {
-    //   path: 'payapply-list',
-    //   name: 'PayapplyList',
-    //   component: () => import('@/views/finance/payapply-list'),
-    //   meta: { title: '申请付款', noCache: true, icon: 'el-icon-wallet' }
-    // },
-    {
-      path: 'payapply-edit',
-      name: 'PayapplyEdit',
-      component: () => import('@/views/finance/payapply-edit'),
-      meta: { title: '提交付款单', noCache: true, icon: 'el-icon-wallet' },
-      hidden: true
-    },
-    {
-      path: 'paycents-list',
-      name: 'PaycentsList',
-      component: () => import('@/views/finance/paycents-list'),
-      meta: { title: '子订单手动分账', noCache: true, icon: 'el-icon-set-up' }
-    },
-    {
-      path: 'paysettle-list',
-      name: 'PaysettleList',
-      component: () => import('@/views/finance/paysettle-list'),
-      meta: { title: '子订单手动结算', noCache: true, icon: 'el-icon-set-up' }
-    },
-    {
-      path: 'paysettle-edit',
-      name: 'PaysettleEdit',
-      component: () => import('@/views/finance/paysettle-edit'),
-      meta: { title: '申请结算', noCache: true, icon: 'el-icon-odometer' },
-      hidden: true
-    },
-    {
-      path: 'paysettle-record',
-      name: 'PaysettleRecord',
-      component: () => import('@/views/finance/paysettle-record'),
-      meta: { title: '结算记录', noCache: true, icon: 'el-icon-odometer' },
-      hidden: true
-    },
-    {
-      path: 'payfinance-list',
-      name: 'PayfinanceList',
-      component: () => import('@/views/finance/payfinance-list'),
-      meta: { title: '订单财务信息', noCache: true, icon: 'el-icon-takeaway-box' }
-    },
-    {
-      path: 'shop-record',
-      name: 'ShopRecord',
-      component: () => import('@/views/finance/payfinance-shop-record'),
-      meta: { title: '供应商退/付款记录', noCache: true, icon: 'el-icon-takeaway-box' },
-      hidden: true
-    },
-    {
-      path: 'remit-record',
-      name: 'RemitRecord',
-      component: () => import('@/views/finance/payfinance-remit-record'),
-      meta: { title: '收付款记录', noCache: true, icon: 'el-icon-takeaway-box' },
-      hidden: true
-    },
-    {
-      path: 'refund-record',
-      name: 'RefundRecord',
-      component: () => import('@/views/finance/payfinance-refund-record'),
-      meta: { title: '退货/退款记录', noCache: true, icon: 'el-icon-takeaway-box' },
-      hidden: true
-    }
+  children: [{
+    path: 'list',
+    name: 'List',
+    component: () =>
+      import ('@/views/finance/list'),
+    meta: { title: '收款列表', noCache: true, icon: 'el-icon-coin' }
+  },
+  {
+    path: 'details',
+    name: 'Details',
+    component: () =>
+      import ('@/views/finance/details'),
+    meta: { title: '收款详情', noCache: true, icon: 'el-icon-coin' },
+    hidden: true
+  },
+  // {
+  //   path: 'payment-list',
+  //   name: 'PaymentList',
+  //   component: () => import('@/views/finance/payment-list'),
+  //   meta: { title: '付款列表', noCache: true, icon: 'el-icon-bank-card' }
+  // },
+  {
+    path: 'payment-details',
+    name: 'PaymentDetails',
+    component: () =>
+      import ('@/views/finance/payment-details'),
+    meta: { title: '付款详情', noCache: true, icon: 'el-icon-bank-card' },
+    hidden: true
+  },
+  {
+    path: 'payment-record',
+    name: 'PaymentRecord',
+    component: () =>
+      import ('@/views/finance/payment-record'),
+    meta: { title: '退/付款记录', noCache: true, icon: 'el-icon-bank-card' },
+    hidden: true
+  },
+  // {
+  //   path: 'payapply-list',
+  //   name: 'PayapplyList',
+  //   component: () => import('@/views/finance/payapply-list'),
+  //   meta: { title: '申请付款', noCache: true, icon: 'el-icon-wallet' }
+  // },
+  {
+    path: 'payapply-edit',
+    name: 'PayapplyEdit',
+    component: () =>
+      import ('@/views/finance/payapply-edit'),
+    meta: { title: '提交付款单', noCache: true, icon: 'el-icon-wallet' },
+    hidden: true
+  },
+  {
+    path: 'paycents-list',
+    name: 'PaycentsList',
+    component: () =>
+      import ('@/views/finance/paycents-list'),
+    meta: { title: '子订单手动分账', noCache: true, icon: 'el-icon-set-up' }
+  },
+  {
+    path: 'paysettle-list',
+    name: 'PaysettleList',
+    component: () =>
+      import ('@/views/finance/paysettle-list'),
+    meta: { title: '子订单手动结算', noCache: true, icon: 'el-icon-set-up' }
+  },
+  {
+    path: 'paysettle-edit',
+    name: 'PaysettleEdit',
+    component: () =>
+      import ('@/views/finance/paysettle-edit'),
+    meta: { title: '申请结算', noCache: true, icon: 'el-icon-odometer' },
+    hidden: true
+  },
+  {
+    path: 'paysettle-record',
+    name: 'PaysettleRecord',
+    component: () =>
+      import ('@/views/finance/paysettle-record'),
+    meta: { title: '结算记录', noCache: true, icon: 'el-icon-odometer' },
+    hidden: true
+  },
+  // {
+  //   path: 'payfinance-list',
+  //   name: 'PayfinanceList',
+  //   component: () =>
+  //     import ('@/views/finance/payfinance-list'),
+  //   meta: { title: '订单财务信息', noCache: true, icon: 'el-icon-takeaway-box' }
+  // },
+  {
+    path: 'shop-record',
+    name: 'ShopRecord',
+    component: () =>
+      import ('@/views/finance/payfinance-shop-record'),
+    meta: { title: '供应商退/付款记录', noCache: true, icon: 'el-icon-takeaway-box' },
+    hidden: true
+  },
+  {
+    path: 'remit-record',
+    name: 'RemitRecord',
+    component: () =>
+      import ('@/views/finance/payfinance-remit-record'),
+    meta: { title: '收付款记录', noCache: true, icon: 'el-icon-takeaway-box' },
+    hidden: true
+  },
+  {
+    path: 'refund-record',
+    name: 'RefundRecord',
+    component: () =>
+      import ('@/views/finance/payfinance-refund-record'),
+    meta: { title: '退货/退款记录', noCache: true, icon: 'el-icon-takeaway-box' },
+    hidden: true
+  }
   ]
 }
 

src/views/campaign/activity-edit.vue

@@ -157,7 +157,7 @@
               <el-table-column property="productName" label="商品名称" align="center" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag + '' | statusFilter">{{ storeStatus(row.validFlag) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">
@@ -188,6 +188,7 @@
 <script>
 import { saveActive, formActive } from '@/api/campaign'
 import goodDialog from './components/good-multi-dialog'
+import storeStatus from '@/views/mixins/storeStatus'
 const defaultImages = () => {
   return {
     image: '',
@@ -197,15 +198,7 @@ const defaultImages = () => {
 export default {
   name: 'ActivityEdit',
   components: { goodDialog },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'warning'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
   data() {
     const defaultForm = () => {
       return {

src/views/campaign/banner-edit.vue

@@ -61,7 +61,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag+'' | statusFilter">{{ storeStatus(row.validFlag) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
@@ -96,18 +96,12 @@
 <script>
 import { savePageBanner, formPageBanner, getActiveList } from '@/api/campaign'
 import goodDialog from './components/good-dialog'
+import storeStatus from '@/views/mixins/storeStatus'
+
 export default {
   name: 'BannerEdit',
   components: { goodDialog },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'warning'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
   data() {
     const defaultForm = () => {
       return {

src/views/campaign/category-edit.vue

@@ -61,7 +61,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag + '' | statusFilter">{{ storeStatus(row.validFlag) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
@@ -96,18 +96,12 @@
 <script>
 import { saveMenu, formMenu, getActiveList } from '@/api/campaign'
 import goodDialog from './components/good-dialog'
+import storeStatus from '@/views/mixins/storeStatus'
+
 export default {
   name: 'BannerEdit',
   components: { goodDialog },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'warning'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
   data() {
     const defaultForm = () => {
       return {

src/views/campaign/components/activity/index.vue

@@ -87,18 +87,12 @@
 <script>
 import { getCategory, switchClassify, saveCategorySort } from '@/api/goods-classify'
 import Pagination from '@/components/Pagination'
+import storeStatus from '@/views/mixins/storeStatus'
 
 export default {
   components: { Pagination },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
+
   data() {
     return {
       list: null,

src/views/campaign/components/good-multi-dialog.vue

@@ -81,7 +81,7 @@ export default {
       listQuery: {
         productName: '', // 商品名称
         shopName: '', // 供应商名称
-        validFlag: 1,
+        validFlag: 2,
         index: 1,
         organizeId: this.$store.getters.organizeId,
         pageSize: 10

src/views/campaign/special-edit.vue

@@ -58,7 +58,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag+'' | statusFilter">{{ storeStatus(row.validFlag) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
@@ -93,18 +93,11 @@
 <script>
 import { saveTheme, formTheme, getActiveList } from '@/api/campaign'
 import goodDialog from './components/good-dialog'
+import storeStatus from '@/views/mixins/storeStatus'
 export default {
   name: 'BannerEdit',
   components: { goodDialog },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'warning'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
   data() {
     const defaultForm = () => {
       return {

src/views/finance/details.vue

@@ -18,7 +18,7 @@
         <h1 style="font-size: 16px;color: #409EFF;">关联订单</h1>
         <div v-for="order in repacts.orderInfos" :key="order.orderId">
           <el-row :gutter="22" class="box-row">
-            <el-col :span="5"><b>订单编号：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
+            <el-col :span="5"><b>订单编号：</b> {{ order.shopOrders[0].shopOrderNo + '(' + order.shopOrders[0].shopOrderId + ')' }}</el-col>
             <el-col :span="5"><b>订单金额：</b> ¥{{ order.orderAmount | amountfilters }}</el-col>
             <el-col :span="4"><b>应收金额：</b> ¥{{ order.payableAmount | amountfilters }}</el-col>
             <el-col :span="4"><b>已收金额：</b> ¥{{ order.receiptAmount | amountfilters }}</el-col>
@@ -99,7 +99,7 @@ export default {
 
   },
   created() {
-    this.getReceiptDetail(this.$route.query.receiptId)
+    this.getReceiptDetail({ orderId: this.$route.query.receiptId, shopOrderId: this.$route.query.shopOrderId })
   },
   methods: {
     async getReceiptDetail(receiptId) {

src/views/finance/list.vue

@@ -131,12 +131,12 @@
       </el-table-column>
       <el-table-column label="关联订单号" align="center" prop="shopOrderNos">
         <template slot-scope="{ row }">
-          <p class="el-p-link" @click="handleOrderDetails(row)">{{ row.orderNo }}({{ row.orderId }})</p>
+          <p class="el-p-link" @click="handleOrderDetails(row)">{{ row.shopOrderNos }}({{ row.shopOrderId }})</p>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="120">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleToDetails(row.receiptId)">查看详情</el-button>
+          <el-button type="primary" size="mini" @click="handleToDetails(row)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -243,7 +243,7 @@ export default {
       return valueText
     },
     handleToDetails(receiptId) {
-      this.$router.push({ path: '/finance/details', query: { receiptId: receiptId }})
+      this.$router.push({ path: '/finance/details', query: { receiptId: receiptId.receiptId, shopOrderId: receiptId.shopOrderId }})
     },
     // 跳转订单详情
     handleOrderDetails(row) {

src/views/floor/edit.vue

@@ -69,8 +69,8 @@ export default {
   filters: {
     statusFilter(status) {
       const statusMap = {
-        1: 'success',
-        0: 'warning'
+        2: 'success',
+        3: 'warning'
       }
       return statusMap[status]
     }

src/views/goods/components/price-edit.vue

@@ -19,7 +19,7 @@
         <div class="text" v-text="product.shopName" />
       </el-form-item>
       <el-form-item label="商品状态:" prop="validFlag">
-        <el-select v-model="formData.validFlag" placeholder="请选择" disabled="true" @change="handleChange($event)">
+        <el-select v-model="formData.validFlag" placeholder="请选择" :disabled="true" @change="handleChange($event)">
           <el-option label="已上架" :value="2" />
           <el-option label="已下架" :value="3" />
         </el-select>
@@ -39,11 +39,11 @@
               <el-input v-model="row.minBuyNumber" disabled="true" @input="e => (row.name= checkedInput(e))" />
             </template> -->
           </el-table-column>
-          <el-table-column label="成本价" prop="name" align="center">
+          <!-- <el-table-column label="成本价" prop="name" align="center">
             <template slot-scope="{row}">
               <span> ¥{{ row.costPrice | toThousandFloatFilter }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="售价" prop="name" align="center">
             <template slot-scope="{row}">
               <span> ¥{{ row.price | toThousandFloatFilter }}</span>

src/views/goods/list.vue

@@ -36,6 +36,8 @@
           <el-option label="所有" value="" />
           <el-option label="已上架" value="2" />
           <el-option label="已下架" value="3" />
+          <el-option label="待审核" value="1" />
+          <el-option label="审核未通过" value="8" />
         </el-select>
       </div>
       <div class="filter-control">
@@ -96,8 +98,8 @@
         prop="validFlag"
       >
         <template slot-scope="{ row }">
-          <el-tag :type="row.validFlag | statusFilter">{{
-            row.validFlag * 1 === 2 ? "已上架" : "已下架"
+          <el-tag :type="(row.validFlag + '') | statusFilter">{{
+            storeStatus(row.validFlag)
           }}</el-tag>
         </template>
       </el-table-column>
@@ -114,6 +116,7 @@
             @click="handleEdit(row)"
           >查看详情</el-button>
           <el-button
+            v-if="row.validFlag * 1 === 2 || row.validFlag * 1 === 3"
             :type="row.validFlag * 1 === 2 ? 'warning' : 'primary'"
             size="mini"
             @click="handleSwitch(row)"
@@ -149,17 +152,10 @@
 <script>
 import { getList, switchGoods } from '@/api/goods'
 import PriceEdit from './components/price-edit'
+import storeStatus from '@/views/mixins/storeStatus'
 export default {
   components: { PriceEdit },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        1: 'success',
-        0: 'warning'
-      }
-      return statusMap[status]
-    }
-  },
+  mixins: [storeStatus],
   data: function() {
     return {
       pageNum: 0,
@@ -174,7 +170,7 @@ export default {
         organizeId: this.$store.getters.organizeId,
         productName: '',
         shopName: '',
-        validFlag: '' // '商品状态,1已上架,2已下架',
+        validFlag: ''
       },
       dialogData: {},
       dialogFormVisible: false,
@@ -207,7 +203,7 @@ export default {
     },
     handleSwitch(row) {
       // 操作上下架
-      if (row.validFlag === '1') {
+      if (row.validFlag === '2') {
         this.$confirm(
           '确定下架该商品吗？下架后该商品将不会再出现在联合丽格商城',
           '系统提示',

src/views/mixins/storeStatus.js

@@ -0,0 +1,33 @@
+// 商品状态标签管理
+
+export default {
+  data() {
+    return {}
+  },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        1: 'default',
+        2: 'success',
+        3: 'warning',
+        8: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  methods: {
+    // 商品状态管理
+    storeStatus(row) {
+      const status = {
+        0: '已删除',
+        1: '待审核',
+        2: '已上架',
+        3: '已下架',
+        8: '审核未通过',
+        9: '已隐身',
+        10: '已冻结'
+      }
+      return status[row]
+    }
+  }
+}

src/views/order/list.vue

@@ -104,14 +104,6 @@
           <el-option label="已退款" value="2" />
         </el-select>
       </div>
-      <div class="filter-control">
-        <span>待审核退款:</span>
-        <el-select v-model="listQuery.returnedPurchaseStatus" style="width:180px;" clearable @change="getList">
-          <el-option value="" label="所有" />
-          <el-option label="有" value="1" />
-          <el-option label="无" value="0" />
-        </el-select>
-      </div>
       <div class="filter-control">
         <span>下单时间:</span>
         <el-date-picker
@@ -186,12 +178,6 @@
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="待审核退款" align="center" prop="returnedPurchaseStatus">
-        <template slot-scope="{row}">
-          <el-tag v-if="row.returnedPurchaseStatus*1===1" type="warning" size="small">有</el-tag>
-          <el-tag v-else type="info" size="small">无</el-tag>
-        </template>
-      </el-table-column> -->
       <el-table-column label="订单金额" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
           ¥{{ row.payTotalFee | toThousandFloatFilter }}

src/views/order/refund-return.vue

@@ -64,11 +64,11 @@
             <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
             <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
             <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
-            <el-col :span="6"><b>退款审核状态:</b>
+            <!-- <el-col :span="6"><b>退款审核状态:</b>
               <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
               <el-tag v-if="refund.status*1===2" type="success" size="small">审核通过</el-tag>
               <el-tag v-if="refund.status*1===3" type="danger" size="small">审核不通过</el-tag>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="20"><b>退款方式:</b>

src/views/order/refund.vue

@@ -3,21 +3,49 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>退款编号:</span>
-        <el-input v-model="listQuery.returnedNo" style="width:180px;" placeholder="退款编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input
+          v-model="listQuery.returnedNo"
+          style="width: 180px"
+          placeholder="退款编号"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input
+          v-model="listQuery.orderId"
+          style="width: 180px"
+          placeholder="订单ID"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input
+          v-model="listQuery.orderNo"
+          style="width: 180px"
+          placeholder="订单编号"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input
+          v-model="listQuery.clubName"
+          style="width: 180px"
+          placeholder="机构名称"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
       </div>
-      <div class="filter-control">
+      <!-- <div class="filter-control">
         <span>退款审核状态:</span>
         <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
@@ -25,7 +53,7 @@
           <el-option label="审核通过" value="2" />
           <el-option label="审核不通过" value="3" />
         </el-select>
-      </div>
+      </div> -->
       <div class="filter-control">
         <span>申请时间:</span>
         <el-date-picker
@@ -50,35 +78,53 @@
       border
       fit
       highlight-current-row
-      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
     >
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
       <el-table-column label="订单编号(ID)" align="center" prop="orderNo" width="200">
-        <template slot-scope="{row}">{{ row.shopOrderReturnedList[0].shopOrderNo + '(' + row.shopOrderReturnedList[0].shopOrderId + ')' }}</template>
+        <template slot-scope="{ row }">{{
+          row.shopOrderReturnedList[0].shopOrderNo +
+            "(" +
+            row.shopOrderReturnedList[0].shopOrderId +
+            ")"
+        }}</template>
       </el-table-column>
       <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="退款金额" align="center" prop="refundFee" width="110">
-        <template slot-scope="{row}">¥{{ row.refundFee | toThousandFloatFilter }}</template>
+        <template
+          slot-scope="{ row }"
+        >¥{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
       <el-table-column label="退款方式" align="center" prop="returnedWay" min-width="130">
-        <template slot-scope="{row}">
-          <template v-if="row.returnedWay*1===4">未支付无退款</template>
-          <template v-else-if="row.returnedWay*1===1">
-            <p v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</p>
-            <p v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</p>
-            <p v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</p>
+        <template slot-scope="{ row }">
+          <template v-if="row.returnedWay * 1 === 4">未支付无退款</template>
+          <template v-else-if="row.returnedWay * 1 === 1">
+            <p v-if="row.refundBalanceFee * 1 !== 0">
+              余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}
+            </p>
+            <p v-if="row.refundOnlineFee * 1 !== 0">
+              线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}
+            </p>
+            <p v-if="row.refundOfflineFee * 1 !== 0">
+              线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}
+            </p>
           </template>
           <template v-else>----</template>
         </template>
       </el-table-column>
-      <el-table-column label="申请人" align="center" prop="applicationUserName" width="100">
-        <template slot-scope="{row}">
-          <span>{{ row.applicationUserName ? row.applicationUserName : '--' }}</span>
+      <el-table-column
+        label="申请人"
+        align="center"
+        prop="applicationUserName"
+        width="100"
+      >
+        <template slot-scope="{ row }">
+          <span>{{ row.applicationUserName ? row.applicationUserName : "--" }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="申请时间" prop="returnTime">
-        <template v-if="row.returnTime" slot-scope="{row}">
-          <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        <template v-if="row.returnTime" slot-scope="{ row }">
+          <span>{{ row.returnTime | parseTime("{y}-{m}-{d} {h}:{i}:{s}") }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="审核人" align="center" prop="reviewUserName" width="100">
@@ -99,15 +145,30 @@
         </template>
       </el-table-column> -->
       <el-table-column label="操作" align="center">
-        <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleDetailes(row)">查看详情</el-button>
-          <el-button v-if="row.status == 2" type="warning" size="mini" @click="revokeRefund(row)">撤销退款</el-button>
+        <template slot-scope="{ row }">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleDetailes(row)"
+          >查看详情</el-button>
+          <el-button
+            v-if="row.status == 2 && row.refundOnlineFee * 1 !== 0"
+            type="warning"
+            size="mini"
+            @click="revokeRefund(row)"
+          >撤销退款</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>10" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 10"
+      :total="total"
+      :page.sync="listQuery.index"
+      :limit.sync="listQuery.pageSize"
+      @pagination="getList"
+    />
     <template>
-      <el-backtop style="right: 40px; bottom: 40px;">
+      <el-backtop style="right: 40px; bottom: 40px">
         <i class="el-icon-upload2" />
       </el-backtop>
     </template>
@@ -140,9 +201,7 @@ export default {
       }
     }
   },
-  computed: {
-
-  },
+  computed: {},
   created() {
     this.getList()
   },
@@ -178,29 +237,31 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).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(() => {})
+      })
+        .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(() => {})
     }
   }
 }
 </script>
 
 <style scoped>
-  .el-form-item{
-    margin-bottom: 0;
-  }
-  .date-box{
-    margin-right:0;
-  }
+.el-form-item {
+  margin-bottom: 0;
+}
+.date-box {
+  margin-right: 0;
+}
 </style>