admin/src/views/business/reportRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/views/meeting/bookings.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/views/operation/serviceCar/apprRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/views/platform/LogisticsRecord/subscribe.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
admin/src/views/business/reportRecord.vue
@@ -9,37 +9,69 @@ <div class="query_btns" style="margin: 16px 0 0" v-permissions="['business:visits:create', 'business:visits:exportExcel']"> <el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">新建</el-button> <el-button type="primary" :loading="exLoading" @click="exportExcel" v-permissions="['business:visits:exportExcel']">导出</el-button> <div class="main_app"> <div ref="QueryFormRef"> <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" /> </div> <div class="query_btns" style="margin: 16px 0 0" v-permissions="['business:visits:create', 'business:visits:exportExcel']"> <el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">新建</el-button> <el-button type="primary" :loading="exLoading" @click="exportExcel" v-permissions="['business:visits:exportExcel']">导出</el-button> </div> <el-table :max-height="tableHeight" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all> <el-table v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all > <el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column prop="carNos" label="入园车辆" min-width="100px"></el-table-column> <el-table-column prop="companyName" label="公司名称" min-width="100px"></el-table-column> <el-table-column prop="name" label="联系人信息" min-width="100px"></el-table-column> <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column> <el-table-column prop="receptMemberName" label="被访人" min-width="100px"></el-table-column> <el-table-column prop="carNos" label="入园车辆" min-width="100px" ></el-table-column> <el-table-column prop="companyName" label="公司名称" min-width="100px" ></el-table-column> <el-table-column prop="name" label="联系人信息" min-width="100px" ></el-table-column> <el-table-column prop="phone" label="手机号" min-width="100px" ></el-table-column> <el-table-column prop="receptMemberName" label="被访人" min-width="100px" ></el-table-column> <el-table-column label="拜访时间" min-width="160px"> <template slot-scope="{ row }"> <span>起:{{ row.starttime }}</span><br /> <span>起:{{ row.starttime }}</span ><br /> <span>止:{{ row.endtime }}</span> </template> </el-table-column> <el-table-column prop="reason" label="拜访事由" min-width="100"></el-table-column> <el-table-column prop="status" fixed="right" label="状态" align="center" min-width="100"> <el-table-column prop="reason" label="拜访事由" min-width="100" ></el-table-column> <el-table-column prop="status" fixed="right" label="状态" align="center" min-width="100" > <template slot-scope="{ row }"> <span style="color: rgba(245, 154, 35, 0.996)" v-if="row.status === 0">待提交审批</span> <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996)">处理中</span> <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996)">已同意</span> <span style="color: rgba(245, 154, 35, 0.996)" v-if="row.status === 0" >待提交审批</span > <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996)" >处理中</span > <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996)" >已同意</span > <span style="color: gray" v-if="row.status === 3">已拒绝</span> <span v-if="row.status === 4" style="color: gray">取消</span> <span v-if="row.status === 5" style="color: green">下发成功</span> @@ -51,16 +83,21 @@ </el-table-column> <el-table-column label="操作" align="center" width="180" fixed="right"> <template slot-scope="{ row }"> <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">查看详情</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="handleDetail(row)" v-permissions="['business:company:update']">查看详情</el-button> <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">删除</el-button> </template> </el-table-column> </el-table> <pagination class="mt10" @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> <ReportDetail v-if="isShowReport" ref="VisReportDetailRef" /> <OperaVisitsReportWindow @close="isShowEdit = false" @success="getList" v-if="isShowEdit" ref="operaVisitsWindowRef" /> <OperaVisitsReportWindow @close="isShowEdit = false" @success="getList" v-if="isShowEdit" ref="operaVisitsWindowRef" /> </div> </template> @@ -82,7 +119,6 @@ return { isShowEdit: false, exLoading: false, tableHeight: 400, isShowReport: false, activeTab: '0', @@ -120,11 +156,6 @@ }, created() { this.getList() }, mounted() { this.$nextTick(() => { this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300 }) }, methods: { exportExcel() { @@ -204,7 +235,6 @@ } </script> <style lang="scss" scoped></style> <style lang="scss" scoped> .table-pagination { padding: 16px 0; admin/src/views/meeting/bookings.vue
@@ -101,8 +101,7 @@ <template slot-scope="{ row }"> <template> <el-button type="text" @click="$refs.operaBookingsDetailWindow.open('会议详情', row)">查看详情</el-button> <el-button v-if="row.meetingStatus == '1' &&row.creator === userInfo.id " type="text" @click="$refs.operaBookingsWindow.open('编辑会议预约', row)">编辑</el-button> <el-button v-if="row.status == '0' &&row.creator === userInfo.id " type="text" @click="$refs.operaBookingsWindow.open('编辑会议预约', row)">编辑</el-button> <el-button type="text" v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')" @click="handleStart(row)">开始</el-button> @@ -110,8 +109,8 @@ @click="handleEnd(row)">结束</el-button> <el-button v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')" type="text" @click="cancelMeeting(row.id)">撤回</el-button> <el-button type="text" @click="deleteById(row)" class="red" v-permissions="['business:bookings:delete']">删除</el-button> </template> <!-- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">删除</el-button> --> </template> </el-table-column> </el-table> @@ -143,7 +142,7 @@ data() { return { date: [], userInfo: this.$store.state.userInfo, curUserInfo: this.$store.state.userInfo, // 搜索 searchForm: { roomId: '', admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,5 +1,5 @@ <template> <TableLayout :permissions="['business:empower:query']"> <TableLayout :permissions="['business:carusebook:query']"> <!-- 搜索表单 --> <el-form ref="searchForm" @@ -197,10 +197,8 @@ > <!-- <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.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> <!-- <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" v-permissions="['business:carusebook:delete']" @click="deleteById(row)" >删除</el-button> </template> </el-table-column> </el-table> @@ -325,15 +323,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) admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -41,7 +41,7 @@ <template v-slot="scope"> <el-button type="text" v-permissions="['business:platformbooks:detail']" @click="handleDetail(scope.row)">预约详情</el-button> <el-button type="text" class="red" v-permissions="['business:platformjob:delete']" @click="handleDel(scope.row)">删除</el-button> <el-button type="text" class="red" v-permissions="['business:platformbooks:delete']" @click="handleDel(scope.row)">删除</el-button> </template> </el-table-column> </el-table> server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -185,7 +185,7 @@ s.setCreator(user.getId()); s.setObjId(bookings.getId()); s.setType(MeetConstants.TWO); s.setObjType(MeetConstants.ZERO); s.setObjType(Constants.MultiFile.MEETING_BOOKS.getKey()); multifileJoinMapper.insert(s); }); }