| admin/src/layouts/TableLayout.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/userActionOther.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/visits.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/operation/serviceCar/apprRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
admin/src/layouts/TableLayout.vue
@@ -65,6 +65,9 @@ padding-top: 0; } } .danger-column{ color: red; } // 头部 .table-header { overflow: hidden; admin/src/views/business/userActionOther.vue
@@ -28,10 +28,10 @@ :data="tableData.list" stripe > <el-table-column prop="createName" label="操作人员"></el-table-column> <el-table-column prop="typeName" label="操作类型" /> <el-table-column prop="remark" label="操作内容" width="900"/> <el-table-column prop="createDate" label="操作时间"></el-table-column> <el-table-column prop="createName" align="center" width="150" label="操作人员"></el-table-column> <el-table-column prop="typeName" align="center" width="150" label="操作类型" class-name="danger-column"/> <el-table-column prop="remark" label="操作内容" min-width="900"/> <el-table-column prop="createDate" align="center" width="150" label="操作时间"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" admin/src/views/business/visits.vue
@@ -86,18 +86,16 @@ <span v-if="row.status === 9" style="color: gray">已失效</span> </template> </el-table-column> <el-table-column prop="remark" label="下发备注" min-width="100px"></el-table-column> <el-table-column v-if="containPermissions(['business:visits:update', 'business:visits:delete'])" label="操作" min-width="200" fixed="right"> <template slot-scope="{row}"> <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">离场</el-button> <!-- <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']" icon="el-icon-delete" style="color: red" v-if="row.status == 5">取消预约</el-button>--> <el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']" icon="el-icon-edit" v-if="row.status == 6">重新下发</el-button> <!-- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('详情', row.id)" icon="el-icon-view">详情</el-button> --> <el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']" icon="el-icon-edit" v-if="row.status == 6">重新下发</el-button> <el-button type="text" @click="handleDetail(row)" icon="el-icon-view">详情</el-button> <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">离场</el-button> <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">删除</el-button> <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">查询审批结果</el-button>--> </template> </el-table-column> </el-table> admin/src/views/operation/serviceCar/apprRecord.vue
@@ -56,7 +56,7 @@ <el-option label="市外用车" value="1"></el-option> </el-select> </el-form-item> <el-form-item label="出发时间" prop="startTime"> <el-form-item label="申请时间" prop="startTime"> <el-date-picker @change="seleTime" v-model="time" @@ -184,7 +184,7 @@ ></el-table-column> <el-table-column label="操作" min-width="160" min-width="180" align="center" fixed="right" > @@ -196,7 +196,10 @@ >查看详情</el-button > <!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >撤销</el-button> --> <el-button style="color: red" v-if=" (row.status === 0 || row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime() " type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >撤销</el-button> <el-button style="color: red" v-if="row.hasRole ==1" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >撤销</el-button> <!-- <el-button style="color: red" v-if="(row.status === 0 && row.creator == userInfo.id)||((row.status === 0 || row.status === 1 ) || ( row.status === 2 && new Date().getTime() < new Date(row.startTime).getTime() ))" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >撤销</el-button> --> <el-button style="color: red" type="text" icon="el-icon-delete" @click="deleteById(row)" >删除</el-button> </template> </el-table-column> @@ -254,6 +257,7 @@ components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow }, data () { return { // userInfo: this.$store.state.userInfo, // 搜索 searchForm: { memberName: '', @@ -283,7 +287,7 @@ 'field.main': 'id' }) // this.search() this.changeRadio('0') this.changeRadio(0) this.loadParams() }, methods: { @@ -321,15 +325,15 @@ }, changeRadio (e) { this.searchForm.radio = e if (e === '0') { if (e == 0) { this.searchForm.queryStartTime = timeForMat(0)[0] this.searchForm.queryEndTime = timeForMat(0)[1] this.time = timeForMat(0) } else if (e === '1') { } else if (e == 1) { this.searchForm.queryStartTime = timeForMat(6)[0] this.searchForm.queryEndTime = timeForMat(6)[1] this.time = timeForMat(6) } else if (e === '2') { } else if (e == 2) { this.searchForm.queryStartTime = timeForMat(29)[0] this.searchForm.queryEndTime = timeForMat(29)[1] this.time = timeForMat(29) @@ -361,15 +365,19 @@ }) }, seleTime (e) { this.searchForm.queryStartTime = e[0] this.searchForm.queryEndTime = e[1] this.searchForm.queryStartTime = null this.searchForm.queryEndTime = null if (e != null && e.length >= 2) { this.searchForm.queryStartTime = e[0] this.searchForm.queryEndTime = e[1] } this.searchForm.radio = null this.search() }, reset () { this.$refs.searchForm.resetFields() this.searchForm.radio = '0' this.changeRadio('0') this.searchForm.radio = 0 this.changeRadio(0) // this.search() } }
