zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
shijing 2023-02-03 09:01:43 +08:00
parent e287df2393 fadcc97f3e
commit 317b75fd79
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/hrm/clock_record.vue
View File

@ -172,6 +172,12 @@ export default {
exportList(){
let that = this;
this.dLoading = true;
if(this.query.employee__belong_dept && this.query.year && this.query.month){
}else{
this.$message.warning("请选择部门和月份后导出")
this.dLoading = false;
}
let days = new Date(this.query.year, this.query.month , 0).getDate();
let weekList = ['姓名','星期'],daysList=['姓名','日期'],titleData = [];
for(var i = 1;i<= days;i++){

24
src/views/opm/opl.vue
View File

@ -22,19 +22,22 @@
</el-descriptions-item>
<el-descriptions-item label="属地部门:">
<span v-if="operationObj.dept_ter_">{{
operationObj.dept_ter_.name
operationObj.dept_ter_.name
}}</span>
</el-descriptions-item>
<el-descriptions-item label="业务部门:">
<span v-if="operationObj.dept_bus_">{{
operationObj.dept_bus_.name
operationObj.dept_bus_.name
}}</span>
</el-descriptions-item>
<el-descriptions-item label="协调员:">
<span v-if="operationObj.coordinator_">{{
operationObj.coordinator_.name
operationObj.coordinator_.name
}}</span>
</el-descriptions-item>
<el-descriptions-item label="监控设备:" v-if="operationObj.vchannels">
<span v-for="item in operationObj.vchannels_" :key="item.id">{{ item.name }}({{item.code}})/</span>
</el-descriptions-item>
</el-descriptions>
</el-card>
@ -55,12 +58,13 @@
<el-table-column label="流程状态" width="160">
<template #default="scope">
<span v-if="scope.row.ticket">{{ scope.row.ticket_.state_.name }}
-{{act_states[scope.row.ticket_.act_state]}}
-{{ act_states[scope.row.ticket_.act_state]}}
</span>
</template>
</el-table-column>
<el-table-column label="预计开始" prop="start_time" width="150"></el-table-column>
<el-table-column label="作业部门" prop="dept_do" width="150" :show-overflow-tooltip="true"><template #default="scope">
<el-table-column label="作业部门" prop="dept_do" width="150" :show-overflow-tooltip="true"><template
#default="scope">
{{ scope.row.dept_do_.name }}
</template></el-table-column>
<el-table-column label="作业负责人" prop="charger"><template #default="scope">
@ -72,11 +76,11 @@
<el-table-column label="操作" fixed="right" width="100">
<template #default="scope">
<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
</el-button>
<el-button v-if="operationObj.state === 10" link type="warning" size="small" v-auth="'opl.update'"
@click="table_edit(scope.row, scope.$index)">编辑
</el-button>
<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
</el-button>
<el-button v-if="operationObj.state === 10" link type="warning" size="small" v-auth="'opl.update'"
@click="table_edit(scope.row, scope.$index)">编辑
</el-button>
</template>
</el-table-column>
</scTable>