优化

MrShi

2025-03-19 8cdd0cc43846713bebbc7caa1f5f0fca84e267d6

 admin/src/views/business/goodsorder.vue

@@ -35,6 +35,18 @@
          value-format="yyyy-MM-dd HH:mm:ss"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="订单类型" prop="bikeType">
        <el-select v-model="searchForm.bikeType" placeholder="请选择">
          <el-option
            label="单车类型"
            :value="3">
          </el-option>
          <el-option
            label="电车类型"
            :value="4">
          </el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -53,11 +65,23 @@
      >
        <el-table-column prop="openid" 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 label="订单类型" min-width="100px" align="center">
          <template slot-scope="{row}">
            <span v-if="row.bikeType === 3">单车类型</span>
            <span v-if="row.bikeType === 4">电车类型</span>
          </template>
        </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="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"></el-table-column>
        <el-table-column prop="discountMoney" 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>

@@ -87,8 +111,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 && (row.memberRidesStatus>1 || !row.memberRidesStatus)" style="color: red">结算</el-button>
            <el-button type="text" @click="refenMoney(row)"  v-if="row.status == 4">退款</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>
@@ -111,7 +135,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'
import dayjs from 'dayjs'
export default {
  name: 'Goodsorder',
  extends: BaseTable,
@@ -137,11 +161,11 @@
        payStatus: '',
        payWay: '',
        payDate: '',
        type: '',
        type: 0,
        closeMoney: '',
        startDate: '',
        endDate: '',
        
        bikeType: ''
      },
      value1: [new Date(), new Date()]
    }
@@ -153,7 +177,8 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
    this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
    this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
    this.search()
  },
  methods: {
@@ -181,7 +206,7 @@
        .catch(err => {
          this.$tip.apiFailed(err)
        })
      

    },
    statement({id}) {
      this.$dialog.messageWaring('确定强制结算码？结算后订单自动完成', '强制结算')
@@ -189,13 +214,14 @@
          closerGoodsorder(id)
            .then(() => {
              this.$tip.apiSuccess('结算成功')
              this.search()
            })
            .catch(err => {
              this.$tip.apiFailed(err)
            })
        })
        .catch(() => {})
      

    },
    refenMoney({id}) {
      getGoodsorderCanBanlanceDTO({orderId:id})