jiangping
2023-12-29 f9691d544e62d6c04dbfe45d05a6c7bc5e004291
admin/src/views/business/goodsorder.vue
@@ -3,7 +3,7 @@
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="用户" prop="openid">
        <el-input v-model="searchForm.openid" placeholder="请输入" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.openid" placeholder="请输入用户" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="订单编号" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入订单编号" @keypress.enter.native="search"></el-input>
@@ -11,8 +11,8 @@
      <el-form-item label="交易单号" prop="onlineOrderid">
        <el-input v-model="searchForm.onlineOrderid" placeholder="请输入交易单号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="是否结算" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择">
      <el-form-item label="是否结算" prop="closeStatus">
        <el-select v-model="searchForm.closeStatus" placeholder="请选择">
          <el-option
            label="未结算"
            :value="0">
@@ -30,8 +30,10 @@
          @change="selectDate"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
        </el-date-picker>
          end-placeholder="结束日期"
          format="yyyy-MM-dd"
          value-format="yyyy-MM-dd HH:mm:ss"
        ></el-date-picker>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -50,13 +52,19 @@
        border
      >
        <el-table-column prop="openid" label="用户" min-width="225px" align="center"></el-table-column>
        <el-table-column prop="id" label="订单编号" min-width="225px" align="center"></el-table-column>
        <el-table-column prop="id" label="订单编号" min-width="235px" align="center"></el-table-column>
        <el-table-column prop="onlineOrderid" label="交易单号" min-width="225px" align="center"></el-table-column>
        <el-table-column prop="money" label="押金(元)" min-width="80px" align="center"></el-table-column>
        <el-table-column prop="payDate" label="交押金时间" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="refundMoney" label="退押金(元)" min-width="80px" align="center"></el-table-column>
        <el-table-column prop="closeMoney" label="结算金额(元)" min-width="90px" align="center"></el-table-column>
        <el-table-column prop="closeDate" label="退款结算时间" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="payDate" label="交押金时间" min-width="145px" align="center"></el-table-column>
        <el-table-column prop="refundMoney" label="退押金(元)" min-width="90px" align="center"></el-table-column>
        <el-table-column prop="closeMoney" label="结算金额(元)" min-width="100px" align="center">
          <template slot-scope="{row}">
            <span v-if="row.closeMoney > row.money">{{row.money}}</span>
            <span v-else>{{row.closeMoney}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="closeDate" label="结算时间" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="refundDate" label="退款时间" min-width="140px" align="center"></el-table-column>
        <!-- <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
@@ -84,8 +92,8 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="showDetail(row)">订单详情</el-button>
            <el-button type="text" @click="statement(row)" v-if="row.status != 4" style="color: red">结算</el-button>
            <el-button type="text" @click="refenMoney(row)" v-else>退款</el-button>
            <el-button type="text" @click="statement(row)" v-if="row.status != 4 && (row.memberRidesStatus > 1 || !row.memberRidesStatus)" style="color: red">结算</el-button>
            <el-button type="text" @click="refenMoney(row)"  v-if="row.status == 4 && (row.refundMoney < row.money)">退款</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -108,6 +116,7 @@
import GoodsOrderDetail from '@/components/business/goodsOrderDetail'
import BackGoodsorderWindow from '@/components/business/backGoodsorderWindow'
import { getDetail, getGoodsorderCanBanlanceDTO, closerGoodsorder } from '@/api/business/goodsorder'
import { formatDateTime } from '@/utils/util'
export default {
  name: 'Goodsorder',
  extends: BaseTable,
@@ -127,6 +136,7 @@
        openid: '',
        money: '',
        status: '',
        closeStatus: '',
        preOrderid: '',
        onlineOrderid: '',
        payStatus: '',
@@ -136,9 +146,9 @@
        closeMoney: '',
        startDate: '',
        endDate: '',
      },
      value1: []
      value1: [new Date(), new Date()]
    }
  },
  created () {
@@ -148,11 +158,14 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
    this.search()
  },
  methods: {
    reset() {
      this.value1 = []
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.$refs.searchForm.resetFields()
      this.search()
    },
@@ -173,21 +186,22 @@
        .catch(err => {
          this.$tip.apiFailed(err)
        })
    },
    statement({id}) {
      this.$dialog.messageWaring('当前订单可能有未完成的骑行,确定强制结算?', '强制结算')
      this.$dialog.messageWaring('确定强制结算码?结算后订单自动完成', '强制结算')
        .then(() => {
          closerGoodsorder(id)
            .then(() => {
              this.$tip.apiSuccess('结算成功')
              this.search()
            })
            .catch(err => {
              this.$tip.apiFailed(err)
            })
        })
        .catch(() => {})
    },
    refenMoney({id}) {
      getGoodsorderCanBanlanceDTO({orderId:id})