doum
2025-09-08 fa7ac16021db8d9a6a5bc214f50600420876325e
admin/src/views/business/goodsorder.vue
@@ -35,16 +35,10 @@
          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-form-item label="订单类型" prop="type">
        <el-select v-model="searchForm.type" placeholder="请选择">
          <el-option label="租车押金"  :value="0"> </el-option>
          <el-option label="套餐卡购买"  :value="1"> </el-option>
        </el-select>
      </el-form-item>
      <section>
@@ -67,8 +61,8 @@
        <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>
            <span v-if="row.type === 0">租车押金</span>
            <span v-if="row.type === 1">套餐卡购买</span>
          </template>
        </el-table-column>
        <el-table-column prop="onlineOrderid" label="交易单号" min-width="225px" align="center"></el-table-column>
@@ -165,12 +159,7 @@
        closeMoney: '',
        startDate: '',
        endDate: '',
<<<<<<< HEAD
        bikeType: ''
=======
        type: 0
>>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
      },
      value1: [new Date(), new Date()]
    }
@@ -226,7 +215,6 @@
            })
        })
        .catch(() => {})
    },
    refenMoney({id}) {
      getGoodsorderCanBanlanceDTO({orderId:id})