zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

外出办事，改成临时外出

This commit is contained in:
lSun 2025-01-03 15:30:58 +08:00
parent 02ad2dda9b
commit 796db0b3b0
8 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/dashboard/topTwo.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="content"> <div class="content">
<div class="content-box"> <div class="content-box">
<div class="title-box"> <div class="title-box">
<div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休、外出办事异常情况</div> <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休、临时外出异常情况</div>
</div> </div>
<div class="list-box"> <div class="list-box">
<div class="listItem" style="background-color: #FFF7F1;" @click="toggleDialog(10)"> <div class="listItem" style="background-color: #FFF7F1;" @click="toggleDialog(10)">
@ -25,7 +25,7 @@ import * as echarts from 'echarts';
import { getHomePageData } from '@/api/dashboard' import { getHomePageData } from '@/api/dashboard'
export default { export default {
components: { components: {
}, },
name: 'topOne', name: 'topOne',
props: { props: {
@ -33,10 +33,10 @@ export default {
// required: true, // required: true,
type: Object, type: Object,
default:{ default:{
} }
}, },
}, },
data() { data() {
return { return {
@ -47,7 +47,7 @@ export default {
created() { created() {
}, },
mounted() { mounted() {
// this.getInitData() // this.getInitData()
}, },
methods: { methods: {
@ -57,7 +57,7 @@ export default {
}else if(v==11){ }else if(v==11){
this.$emit('openDialog', { order: v, isExamine:'1'}) this.$emit('openDialog', { order: v, isExamine:'1'})
} }
}, },
}, },
} }
@ -103,7 +103,7 @@ export default {
} }
} }
} }
</style> </style>

48
src/views/exceptionHandle/errorForm/index.vue
View File

@ -36,8 +36,8 @@
>导出数据</el-button> >导出数据</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="tableData" ref="multipleTable" row-key="id" > <el-table v-loading="loading" :data="tableData" ref="multipleTable" row-key="id" >
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
@ -56,7 +56,7 @@
<div v-else>{{ scope.row.errorRestCount}}</div> <div v-else>{{ scope.row.errorRestCount}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外出办事未审批条数" align="center" prop="errorOutCount" sortable> <el-table-column label="临时外出未审批条数" align="center" prop="errorOutCount" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.errorOutCount!=0" <div v-if="scope.row.errorOutCount!=0"
@click="openRecord(scope.row,title2)" style="color: #02a7f0; cursor: pointer"> @click="openRecord(scope.row,title2)" style="color: #02a7f0; cursor: pointer">
@ -65,9 +65,9 @@
<div v-else>{{ scope.row.errorOutCount}}</div> <div v-else>{{ scope.row.errorOutCount}}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -126,7 +126,7 @@
<span v-if="scope.row.examineStatus==3">{{ '待审核' }}</span> <span v-if="scope.row.examineStatus==3">{{ '待审核' }}</span>
<span v-else>{{ }}</span> <span v-else>{{ }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -138,7 +138,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="totalTwo>0" v-show="totalTwo>0"
:total="totalTwo" :total="totalTwo"
@ -163,7 +163,7 @@
> >
</el-input> </el-input>
<!-- <el-input v-model="form.content" placeholder="请输入" maxlength="20"/> --> <!-- <el-input v-model="form.content" placeholder="请输入" maxlength="20"/> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<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>
@ -172,13 +172,13 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listExceptionFormError,getDetailExceptionRest,getDetailExceptionOut,exportExceptionError,examineRemind} from "@/api/exceptionHandle/errorForm"; import { listExceptionFormError,getDetailExceptionRest,getDetailExceptionOut,exportExceptionError,examineRemind} from "@/api/exceptionHandle/errorForm";
import { downloadFile } from '@/utils/download' import { downloadFile } from '@/utils/download'
// import { getEngineeringList } from "@/api/select"; // import { getEngineeringList } from "@/api/select";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDept } from "@/api/system/dept"; import { listDept } from "@/api/system/dept";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
@ -186,7 +186,7 @@
dicts: ['sys_normal_disable','sys_voltage_level','sys_org_name','sys_pro_type','sys_pro_status', dicts: ['sys_normal_disable','sys_voltage_level','sys_org_name','sys_pro_type','sys_pro_status',
'sys_yz_manage','sys_sg_manage','sys_jl_manage','sys_device_type'], 'sys_yz_manage','sys_sg_manage','sys_jl_manage','sys_device_type'],
components: { components: {
Treeselect Treeselect
}, },
data() { data() {
return { return {
@ -211,7 +211,7 @@
// 弹出层标题 // 弹出层标题
title: "", title: "",
title1: "轮休未审批记录", title1: "轮休未审批记录",
title2: "外出办事未审批记录", title2: "临时外出未审批记录",
titleExamine:'', titleExamine:'',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
@ -282,7 +282,7 @@
// // 如果没有传递数据，搜索栏保持为空 // // 如果没有传递数据，搜索栏保持为空
// this.queryParams.attCurrentMonth = ''; // this.queryParams.attCurrentMonth = '';
// } // }
// }, // },
// watch: { // watch: {
// // 如果路由的参数发生变化，更新搜索栏内容 // // 如果路由的参数发生变化，更新搜索栏内容
@ -298,7 +298,7 @@
methods: { methods: {
disabledDate(time) { disabledDate(time) {
const str=this.queryRecord.attCurrentMonth+'-01'; const str=this.queryRecord.attCurrentMonth+'-01';
// 获取当前日期 // 获取当前日期
var currentDate = new Date(str); var currentDate = new Date(str);
// 获取当前月份的第一天 // 获取当前月份的第一天
@ -334,7 +334,7 @@
return `${year}-${month}-${day} ${weekday}`; // 组合成所需格式 return `${year}-${month}-${day} ${weekday}`; // 组合成所需格式
}, },
getDeptList(){ getDeptList(){
listDept().then(response => { listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "id"); this.deptOptions = this.handleTree(response.data, "id");
@ -352,7 +352,7 @@
}; };
}, },
handleSelect(value, instanceId) { handleSelect(value, instanceId) {
console.log('Selected:', value); console.log('Selected:', value);
// 在这里处理选择事件 // 在这里处理选择事件
this.queryParams.orgName=value.orgName; this.queryParams.orgName=value.orgName;
@ -405,7 +405,7 @@
this.queryRecord.attCurrentMonth = row.attCurrentMonth; this.queryRecord.attCurrentMonth = row.attCurrentMonth;
if(titleBoss=='轮休未审批记录'){ if(titleBoss=='轮休未审批记录'){
this.queryRecord.attStatis=1 this.queryRecord.attStatis=1
}else if(titleBoss=='外出办事未审批记录'){ }else if(titleBoss=='临时外出未审批记录'){
this.queryRecord.attStatis=2; this.queryRecord.attStatis=2;
} }
this.showRecord = true; this.showRecord = true;
@ -422,10 +422,10 @@
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
}else if(this.title=='外出办事未审批记录'){ }else if(this.title=='临时外出未审批记录'){
getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => {
this.tableDataRecord = response.rows; this.tableDataRecord = response.rows;
this.leaveType="外出办事" this.leaveType="临时外出"
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
@ -452,7 +452,7 @@
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.orgId = this.queryRecord.orgId; this.form.orgId = this.queryRecord.orgId;
this.form.title = this.leaveType+'异常数据'; this.form.title = this.leaveType+'异常数据';
this.form.leaveType=this.leaveType this.form.leaveType=this.leaveType
@ -479,14 +479,14 @@
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
exportExceptionError(this.queryParams).then(res => { exportExceptionError(this.queryParams).then(res => {
downloadFile({ fileName: `轮休外出办事异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' }) downloadFile({ fileName: `轮休临时外出异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
}) })
}, },
} }
}; };
</script> </script>
@ -513,4 +513,4 @@
display: none; display: none;
} }
} }
</style> </style>

4
src/views/process/outApply/index.vue
View File

@ -319,7 +319,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
leaveDate: undefined, leaveDate: undefined,
examineStatus: undefined examineStatus: undefined
}, },
@ -445,7 +445,7 @@ export default {
leaveEndDate: undefined, leaveEndDate: undefined,
leaveEndInterval:undefined, leaveEndInterval:undefined,
leaveDuration:undefined, leaveDuration:undefined,
leaveType:"外出办事", leaveType:"临时外出",
examineStatus:"0", examineStatus:"0",
isAgree: "0", isAgree: "0",
hostUserId:[], hostUserId:[],

6
src/views/process/outExam/index.vue
View File

@ -273,7 +273,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
userName: undefined, userName: undefined,
orgName: undefined, orgName: undefined,
}, },
@ -419,7 +419,7 @@ export default {
let param = { let param = {
id:this.form.id, id:this.form.id,
examineStatus:'1', examineStatus:'1',
leaveType:"外出办事", leaveType:"临时外出",
examineOpinion:this.form.examineOpinion, examineOpinion:this.form.examineOpinion,
orgName: name orgName: name
} }
@ -440,7 +440,7 @@ export default {
let param = { let param = {
id:this.form.id, id:this.form.id,
examineStatus:'2', examineStatus:'2',
leaveType:"外出办事", leaveType:"临时外出",
examineOpinion:this.form.examineOpinion, examineOpinion:this.form.examineOpinion,
orgName:name orgName:name
} }

2
src/views/process/requestReport/index.vue
View File

@ -476,7 +476,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
leaveDate: undefined, leaveDate: undefined,
examineStatus: '' examineStatus: ''
}, },

6
src/views/process/workReport/index.vue
View File

@ -49,7 +49,7 @@
</el-table-column> </el-table-column>
<el-table-column label="临时外出人数" align="center" width="180"> <el-table-column label="临时外出人数" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="clickable" @click="handleClick('外出办事',scope.row)" style="color: blue; cursor: pointer;"> <span class="clickable" @click="handleClick('临时外出',scope.row)" style="color: blue; cursor: pointer;">
{{ scope.row.outNum }} {{ scope.row.outNum }}
</span> </span>
</template> </template>
@ -123,7 +123,7 @@
<el-table-column label="开始时间" align="center" prop="startDate" width="160"/> <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
<el-table-column label="结束时间" align="center" prop="endDate" width="160"/> <el-table-column label="结束时间" align="center" prop="endDate" width="160"/>
<el-table-column label="时长（天）" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/> <el-table-column label="时长（天）" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')"> <el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '临时外出')">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span> <span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已通过</span> <span v-else-if="scope.row.examineStatus === '1'">已通过</span>
@ -586,7 +586,7 @@ export default {
this.open = true; this.open = true;
if (type==='轮休'){ if (type==='轮休'){
this.title = "轮休人员"; this.title = "轮休人员";
} else if (type==='外出办事'){ } else if (type==='临时外出'){
this.title = "临时外出人员"; this.title = "临时外出人员";
} else if (type==='出差报备'){ } else if (type==='出差报备'){
this.title = "出差人员"; this.title = "出差人员";

1
src/views/report/monthReport/index.vue
View File

@ -475,6 +475,7 @@ export default {
this.title = "工作时间外出次数"; this.title = "工作时间外出次数";
this.queryRecordOutCount.userId = row.userId; this.queryRecordOutCount.userId = row.userId;
this.queryRecordOutCount.attCurrentDay = row.attCurrentDay; this.queryRecordOutCount.attCurrentDay = row.attCurrentDay;
this.queryRecordOutCount.attCurrentMonth = row.attCurrentMonth;
this.showOutCount = true; this.showOutCount = true;
this.getOutCountList(); this.getOutCountList();
}, },

2
src/views/system/messages/index.vue
View File

@ -117,7 +117,7 @@
updateStatus(param).then(response => { updateStatus(param).then(response => {
if(row.type.indexOf('月异常考勤统计')>-1){//month if(row.type.indexOf('月异常考勤统计')>-1){//month
this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}}) this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}})
}else if(row.type.indexOf('月轮休外出办事异常统计')>-1){//month }else if(row.type.indexOf('月轮休临时外出异常统计')>-1){//month
this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} }) this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} })
}else if(row.type.indexOf('项目部角色未配置')>-1){//项目经理 }else if(row.type.indexOf('项目部角色未配置')>-1){//项目经理
this.$router.replace({ path: '/process/pro/rolesRemind',query:{param:value}}) this.$router.replace({ path: '/process/pro/rolesRemind',query:{param:value}})