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

bug

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