|
@@ -115,34 +115,34 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="bookingworkticketList" :span-method="mergeMethod" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
|
|
|
|
- <el-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" :formatter="floorLocationFormat"/>
|
|
|
- <el-table-column label=" 作业开始时间" align="center" prop="workStartTime" width="100">
|
|
|
+ <el-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" width="80" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" width="100" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" width="100" :formatter="floorLocationFormat"/>
|
|
|
+ <el-table-column label=" 作业开始时间" align="center" prop="workStartTime" width="90">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.bookingworkticket.workStartTime, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="作业结束时间" align="center" prop="workEndTime" width="100">
|
|
|
+ <el-table-column label="作业结束时间" align="center" prop="workEndTime" width="90">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.bookingworkticket.workEndTime, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column label="作业类型" align="center" prop="workType" :formatter="workTypeFormat"/>
|
|
|
- <el-table-column label="风险等级" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
|
|
|
- <el-table-column label="作业内容描述" align="center" prop="workDescription" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createdate" width="100">
|
|
|
+ <el-table-column label="作业类型" align="center" prop="workType" width="110" :formatter="workTypeFormat"/>
|
|
|
+ <el-table-column label="风险等级" align="center" prop="riskLevel" width="60" :formatter="riskLevelFormat"/>
|
|
|
+ <el-table-column label="作业内容描述" align="center" prop="workDescription" width="160":show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="80" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="80" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" width="80" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" width="100" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="创建时间" align="center" prop="createdate" width="90">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
|
|
|
- <el-table-column label="票号" align="center" prop="reservationNumber" width="180">
|
|
|
+ <el-table-column label="票号" align="center" prop="reservationNumber" width="170">
|
|
|
<template slot-scope="scope">
|
|
|
<span> {{scope.row.reservationNumber}}</span>
|
|
|
<el-button
|
|
@@ -169,7 +169,7 @@
|
|
|
v-if="scope.row.bookingworkticket.status== 0"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
+ icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
>删除</el-button>
|
|
|
<el-button
|