Commit 8ead6146 authored by 盖献康's avatar 盖献康

bug

parent e2fc6a14
......@@ -161,7 +161,7 @@
</el-table-column>
<el-table-column label="预约状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">预约</span>
<span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">预约</span>
<span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span>
</template>
</el-table-column>
......@@ -225,11 +225,12 @@
:close-on-press-escape="false"
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="60px">
<el-row>
<el-col :span="8">
<el-form-item label="设备">
<el-form-item label="设备" label-width="38px">
<el-select
style="width: 175px"
v-model="form.equipmentIdList"
multiple
collapse-tags
......@@ -246,9 +247,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="9" label-width="100px">
<el-form-item label="检查日期" prop="checkItemsId">
<el-date-picker
style="width: 175px"
v-model="form.checkDate"
type="date"
placeholder="请选择检查日期"
......@@ -258,54 +260,56 @@
/>
</el-form-item>
</el-col>
<el-col v-show="currentCheckType === '2'" :span="7">
<el-form-item label="支出账户额" prop="shadowReport" label-width="120">
1200.00
<el-col v-show="currentCheckType === '2'" :span="6">
<el-form-item label="支出账户额" prop="shadowReport" label-width="120">
1200.00
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table
:data="deviceList"
style="width: 100%"
:header-cell-style="{background:'#E8E9E8'}"
empty-text="当前暂无可预约设备"
>
<el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column prop="checkTime" align="left" label="检查时段">
<template slot-scope="scope">
<span>{{ scope.row.checkTime.replace('-', '~') }}</span>
</template>
</el-table-column>
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column v-if="currentCheckType === '2'" prop="price" align="left" label="设备服务费">
<template slot-scope="scope">
<span>{{ scope.row.price || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
style="color: #5FB54B"
type="text"
@click="handleSubscribeDevice(scope.row)"
>立即预约
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="deviceTotal>0"
:total="deviceTotal"
:page.sync="deviceQueryParams.pageNum"
:limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice"
/>
<div class="dialog-class">
<el-table
:data="deviceList"
style="width: 100%"
:header-cell-style="{background:'#E8E9E8'}"
empty-text="当前暂无可预约设备"
>
<el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column prop="checkTime" align="left" label="检查时段">
<template slot-scope="scope">
<span>{{ scope.row.checkTime.replace('-', '~') }}</span>
</template>
</el-table-column>
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column v-if="currentCheckType === '2'" prop="price" align="left" label="设备服务费">
<template slot-scope="scope">
<span>{{ scope.row.price || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
style="color: #5FB54B"
type="text"
@click="handleSubscribeDevice(scope.row)"
>立即预约
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="deviceTotal>0"
:total="deviceTotal"
:page.sync="deviceQueryParams.pageNum"
:limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice"
/>
</div>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>-->
......@@ -798,6 +802,10 @@ export default {
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 0vh !important;
margin-top: 12vh !important;
}
.dialog-class {
height: 500px;
overflow-y: auto;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment