MrShi

MrShi

2023-11-09 19d17f0f0fb02f46342d70b5180e40a0ad1b66d3

 admin/src/views/business/goodsorder.vue

@@ -57,7 +57,12 @@
        <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="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 +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 && (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>
@@ -141,7 +146,7 @@
        closeMoney: '',
        startDate: '',
        endDate: '',
        

      },
      value1: [new Date(), new Date()]
    }
@@ -181,7 +186,7 @@
        .catch(err => {
          this.$tip.apiFailed(err)
        })
      

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

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