Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-02-28 25908f5bd4a2dae4625b49d325525849feb676a4

 admin/src/views/business/bikeRepair.vue

@@ -34,7 +34,7 @@
          end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      

      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -77,7 +77,15 @@
        </el-table-column>
        <el-table-column label="操作" min-width="80px" fixed="right" align="center">
          <template slot-scope="{row}">
            <el-button v-if="row.status==0" type="text" @click="dealAction(row)">处理</el-button>
            <el-button v-if="row.status == 0" type="text" @click="dealAction(row)">处理</el-button>
            <el-popover
              v-else
              placement="bottom"
              width="200"
              trigger="click"
              :content="row.dealInfo">
              <el-button slot="reference" type="text">查看备注</el-button>
            </el-popover>
          </template>
        </el-table-column>
      </el-table>
@@ -99,7 +107,7 @@
import Pagination from '@/components/common/Pagination'
import OperaRepairDealWindow from '@/components/business/OperaRepairDealWindow'
import RepairDetailWindow from '@/components/business/RepairDetailWindow'
import { formatDateTime } from '@/utils/util'
import dayjs from 'dayjs'
import { getFileList } from '@/api/business/bikeRepair'
export default {
  name: 'BikeRepair',
@@ -142,7 +150,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: {
@@ -173,7 +182,7 @@
        .catch(e => {
          this.$tip.apiFailed(e)
        })
      

    }
  },
}