fix: BUG修改
This commit is contained in:
kun
parent
de1f474e04
commit
4b666da24f
@ -5,6 +5,7 @@ import {post,get} from '../http'
|
||||
//-----------------------项目基础信息
|
||||
export const getProjectDetail = data => post('xmgl/project/getProjectInfoBySn', data); //通过id查询项目信息
|
||||
export const editProjectInfo = data => post('xmgl/project/edit', data); //编辑项目信息
|
||||
export const editClearData = data => post('xmgl/workerAttendancePresence/updateWorkerAttendanceZero', data); //手动清零
|
||||
|
||||
//上传第三方平台
|
||||
export const sendProjectInfo = data => post('xmgl/project/sendProjectInfo', data); //上传第三方平台
|
||||
|
||||
49
src/assets/js/api/devicePosition/deviceCentral.js
Normal file
49
src/assets/js/api/devicePosition/deviceCentral.js
Normal file
@ -0,0 +1,49 @@
|
||||
/* 劳务管理-工资发放 */
|
||||
import { post, get } from '../../http'
|
||||
import axios from 'axios'
|
||||
|
||||
// 企业列表
|
||||
export function enterpriseList (data) {
|
||||
return post('xmgl/enterpriseInfo/selectHierarchyEnterpriseList', data)
|
||||
}
|
||||
|
||||
// 班组列表
|
||||
export function teamList(data) {
|
||||
return post('xmgl/teamInfo/getTeamInfoList', data);
|
||||
}
|
||||
|
||||
// 部门列表
|
||||
export function departmentList(data) {
|
||||
return post('xmgl/departmentInfo/getDepartmentInfoList', data);
|
||||
}
|
||||
|
||||
// 分页查询工资发放记录信息
|
||||
export function payrollRecord(data) {
|
||||
return post('xmgl/workerWagesPayment/selectWorkerWagesPaymentPageList', data);
|
||||
}
|
||||
|
||||
|
||||
// 通过id查询工资发放详情信息
|
||||
export function payrollRecordDetailById(data) {
|
||||
return post('xmgl/workerWagesPayment/queryById', data);
|
||||
}
|
||||
|
||||
// 导出人员工资pdf
|
||||
export function exportSalaryPdf(params) {
|
||||
window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/salaryPdf?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
|
||||
}
|
||||
|
||||
// 导出工资列表excel
|
||||
export function exportSalaryExcel(params) {
|
||||
window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/excelProjectWages?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
|
||||
}
|
||||
|
||||
// 导入工资列表excel
|
||||
export function importWagesPaymentExcel(data) {
|
||||
return post('xmgl/workerWagesPayment/uploadWagesPaymentExcel', data);
|
||||
}
|
||||
|
||||
// 编辑工资发放记录信息
|
||||
export function updateWorkerWagesPayment(data) {
|
||||
return post('xmgl/workerWagesPayment/updateWorkerWagesPayment', data);
|
||||
}
|
||||
@ -82,10 +82,10 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
|
||||
axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
|
||||
|
||||
@ -0,0 +1,242 @@
|
||||
<template>
|
||||
<div class="fullHeight">
|
||||
<div class="searchBox whiteBlock">
|
||||
<!-- 仓库管理——工器具管理 -->
|
||||
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
|
||||
<!-- <el-form-item label="设备编号">
|
||||
<el-input clearable v-model="searchForm.devSn" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工器具名称">
|
||||
<el-input clearable v-model="searchForm.toolName" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工器具状态">
|
||||
<el-select clearable v-model="searchForm.toolStatus" placeholder="请选择">
|
||||
<el-option v-for="(item, index) in toolTypeOptions" :key="index" :label="item.label" :value="item.value"> </el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item>
|
||||
<el-button type="warning" plain @click="refresh">刷新</el-button>
|
||||
<el-button type="primary" size="medium" @click="add">新增</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="table_wrap whiteBlock">
|
||||
<el-table class="tables" :data="tableData">
|
||||
<el-table-column prop="deviceName" align="center" label="机械设备名称" width="280"></el-table-column>
|
||||
<el-table-column prop="deviceNumber" align="center" label="设备序号"></el-table-column>
|
||||
<el-table-column prop="deviceDriver" align="center" label="司机"></el-table-column>
|
||||
<el-table-column prop="timeOfAdd" align="center" label="新增时间"></el-table-column>
|
||||
<el-table-column align="center" label="操作" width="280">
|
||||
<template slot-scope="scope">
|
||||
<div class="tableBtns">
|
||||
<div @click="edit(scope.row)" class="operationText">
|
||||
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
|
||||
<span style="white-space: nowrap;">编辑</span>
|
||||
</div>
|
||||
<div @click="deleteDev(scope.row)" class="operationText">
|
||||
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
|
||||
<span style="white-space: nowrap;">删除</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
|
||||
:current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize"
|
||||
layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background >
|
||||
</el-pagination>
|
||||
</div>
|
||||
<!-- 新增-编辑-弹窗 -->
|
||||
<el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
|
||||
<div class="dialog_content">
|
||||
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input v-model="addEditForm.deviceName" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="司机" prop="deviceDriver">
|
||||
<el-input v-model="addEditForm.deviceDriver" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="新增时间" prop="timeOfAdd">
|
||||
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="addEditForm.timeOfAdd"
|
||||
type="datetime" placeholder="请选择时间" >
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<div class="dialog-footer">
|
||||
<el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium"
|
||||
>{{ $t('message.deviceManage.cancel') }}
|
||||
</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-check" @click="submit" size="medium"
|
||||
>{{ $t('message.deviceManage.save') }}
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { rtToolPageHistory, rtToolAdd, rtToolDelete, rtToolEdit, rtToolPage } from '@/assets/js/api/workTicketManage.js'
|
||||
import { } from '@/assets/js/api/devicePosition/deviceCentral.js'
|
||||
export default {
|
||||
mounted() {},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
dialogShow: false,
|
||||
pagInfo: {
|
||||
pageNo: 1, //页数
|
||||
pageSize: 10, //条数
|
||||
total: 0 //总条数
|
||||
},
|
||||
tableData: [
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
{deviceName: '压路机', deviceNumber: 'EMP21354656321321', deviceDriver: '李大鹏',timeOfAdd: '2024-03-13 00:00:00'},
|
||||
],
|
||||
addEditForm: {
|
||||
deviceName: '',
|
||||
deviceDriver: '',
|
||||
timeOfAdd: '',
|
||||
},
|
||||
addEditRules: {
|
||||
deviceName: [{ required: true, message: '必填', trigger: 'blur' }],
|
||||
deviceDriver: [{ required: true, message: '必填', trigger: 'blur' }]
|
||||
},
|
||||
searchForm: {}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getList() {
|
||||
// rtToolPage({
|
||||
// pageNo: this.pagInfo.pageNo,
|
||||
// pageSize: this.pagInfo.pageSize,
|
||||
// projectSn: this.$store.state.projectSn,
|
||||
// devSn: this.searchForm.devSn,
|
||||
// toolName: this.searchForm.toolName,
|
||||
// toolStatus: this.searchForm.toolStatus,
|
||||
// }).then(result => {
|
||||
// if (result.success) {
|
||||
// this.tableData = result.result.records
|
||||
// this.pagInfo.total = result.result.total
|
||||
// }
|
||||
// })
|
||||
},
|
||||
|
||||
add() {
|
||||
this.title = '新增'
|
||||
this.dialogShow = true
|
||||
this.close()
|
||||
},
|
||||
|
||||
edit(obj) {
|
||||
this.title = '编辑'
|
||||
this.dialogShow = true
|
||||
this.addEditForm = JSON.parse(JSON.stringify(obj))
|
||||
},
|
||||
submit() {
|
||||
let params = JSON.parse(JSON.stringify(this.addEditForm))
|
||||
params.projectSn = this.$store.state.projectSn
|
||||
this.$refs.addEditForm.validate(valid => {
|
||||
if (valid) {
|
||||
if (this.title == '新增') {
|
||||
rtToolAdd(params).then(result => {
|
||||
if (result.success) {
|
||||
this.$message.success(result.message)
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
} else if (this.title == '编辑') {
|
||||
rtToolEdit(params).then(result => {
|
||||
if (result.success) {
|
||||
this.$message.success(result.message)
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
}
|
||||
this.dialogShow = false
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
})
|
||||
},
|
||||
deleteDev(obj) {
|
||||
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
.then(() => {
|
||||
rtToolDelete({ id: obj.id }).then(res => {
|
||||
if (res.success) {
|
||||
this.getList()
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '删除成功!'
|
||||
})
|
||||
} else {
|
||||
this.$message({
|
||||
type: 'error',
|
||||
message: res.message
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.addEditForm = {}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addEditForm.clearValidate()
|
||||
})
|
||||
},
|
||||
SizeChange(val) {
|
||||
this.pagInfo.pageSize = val
|
||||
this.getList()
|
||||
},
|
||||
CurrentChange(val) {
|
||||
this.pagInfo.pageNo = val
|
||||
this.getList()
|
||||
},
|
||||
refresh() {
|
||||
this.searchForm = {}
|
||||
this.pagInfo.pageNo = 1 //页数
|
||||
this.pagInfo.pageSize = 10 //条数
|
||||
this.getList()
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.tables{
|
||||
min-height: 0;
|
||||
}
|
||||
.tables2 {
|
||||
min-height: auto;
|
||||
}
|
||||
.textStyle {
|
||||
width: 140px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.tableBtns {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-item: center;
|
||||
}
|
||||
</style>
|
||||
@ -1,259 +0,0 @@
|
||||
<template>
|
||||
<div class="fullHeight">
|
||||
<div class="searchBox whiteBlock">
|
||||
<!-- 仓库管理——工器具管理 -->
|
||||
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
|
||||
<!-- <el-form-item label="设备编号">
|
||||
<el-input clearable v-model="searchForm.devSn" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工器具名称">
|
||||
<el-input clearable v-model="searchForm.toolName" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工器具状态">
|
||||
<el-select clearable v-model="searchForm.toolStatus" placeholder="请选择">
|
||||
<el-option v-for="(item, index) in toolTypeOptions" :key="index" :label="item.label" :value="item.value"> </el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item>
|
||||
<el-button type="warning" plain @click="refresh">刷新</el-button>
|
||||
<el-button type="primary" size="medium" @click="add">新增</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="table_wrap whiteBlock">
|
||||
<vue-scroll style="height: 80%">
|
||||
<el-table class="tables" :data="tableData">
|
||||
<el-table-column prop="equipmentName" align="center" label="机械设备名称" width="280"></el-table-column>
|
||||
<el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
|
||||
<el-table-column prop="driverName" align="center" label="司机"></el-table-column>
|
||||
<el-table-column prop="createTime" align="center" label="新增时间"></el-table-column>
|
||||
<el-table-column align="center" label="操作" width="280">
|
||||
<template slot-scope="scope">
|
||||
<div class="tableBtns">
|
||||
<div @click="edit(scope.row)" class="operationText">
|
||||
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
|
||||
<span style="white-space: nowrap;">编辑</span>
|
||||
</div>
|
||||
<div @click="deleteDev(scope.row)" class="operationText">
|
||||
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
|
||||
<span style="white-space: nowrap;">删除</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</vue-scroll>
|
||||
<el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<!-- 新增-编辑-弹窗 -->
|
||||
<el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
|
||||
<div class="dialog_content">
|
||||
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
|
||||
<el-form-item label="设备名称" prop="equipmentName">
|
||||
<el-input v-model="addEditForm.equipmentName" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备序号" prop="devSn">
|
||||
<el-input v-model="addEditForm.devSn" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="司机" prop="driverId">
|
||||
<el-select v-model="addEditForm.driverId" placeholder="请选择" clearable :style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="新增时间" prop="createTime">
|
||||
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="addEditForm.createTime" type="datetime" placeholder="请选择时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<div class="dialog-footer">
|
||||
<el-button class="cancleBtn" @click="dialogShow = false" icon="el-icon-circle-close" size="medium">{{ $t('message.deviceManage.cancel') }}
|
||||
</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-check" @click="submit" size="medium">{{ $t('message.deviceManage.save') }}
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {
|
||||
getDeviceCentraliceCentralPageApi,
|
||||
addDeviceCentraliceCentralPageApi,
|
||||
editDeviceCentraliceCentralPageApi,
|
||||
deleteDeviceCentraliceCentralPageApi,
|
||||
getWorkerInfoListApi,
|
||||
} from '@/assets/js/api/devicePosition/equipmentPosition.js'
|
||||
export default {
|
||||
mounted() {},
|
||||
created() {
|
||||
this.getPage()
|
||||
this.getWorkerInfoList()
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
dialogShow: false,
|
||||
pagInfo: {
|
||||
pageNo: 1, //页数
|
||||
pageSize: 10, //条数
|
||||
total: 0, //总条数
|
||||
},
|
||||
tableData: [],
|
||||
addEditForm: {
|
||||
equipmentName: '',
|
||||
devSn: '',
|
||||
createTime: '',
|
||||
driverId: '',
|
||||
},
|
||||
addEditRules: {
|
||||
equipmentName: [{ required: true, message: '必填', trigger: 'blur' }],
|
||||
devSn: [{ required: true, message: '必填', trigger: 'blur' }],
|
||||
driverId: [{ required: true, message: '必填', trigger: 'blur' }],
|
||||
},
|
||||
searchForm: {},
|
||||
workerList: [],
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getPage() {
|
||||
getDeviceCentraliceCentralPageApi({
|
||||
pageNo: this.pagInfo.pageNo,
|
||||
pageSize: this.pagInfo.pageSize,
|
||||
projectSn: this.$store.state.projectSn,
|
||||
devSn: this.searchForm.devSn,
|
||||
projectSn: this.$store.state.projectSn,
|
||||
}).then((result) => {
|
||||
if (result.success) {
|
||||
this.tableData = result.result.records
|
||||
this.pagInfo.total = result.result.total
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
add() {
|
||||
this.title = '新增'
|
||||
this.dialogShow = true
|
||||
this.close()
|
||||
},
|
||||
|
||||
edit(obj) {
|
||||
this.title = '编辑'
|
||||
this.dialogShow = true
|
||||
this.addEditForm = JSON.parse(JSON.stringify(obj))
|
||||
},
|
||||
submit() {
|
||||
let params = JSON.parse(JSON.stringify(this.addEditForm))
|
||||
params.projectSn = this.$store.state.projectSn
|
||||
this.$refs.addEditForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.title == '新增') {
|
||||
addDeviceCentraliceCentralPageApi(params).then((result) => {
|
||||
if (result.success) {
|
||||
this.$message.success(result.message)
|
||||
this.getPage()
|
||||
}
|
||||
})
|
||||
} else if (this.title == '编辑') {
|
||||
editDeviceCentraliceCentralPageApi(params).then((result) => {
|
||||
if (result.success) {
|
||||
this.$message.success(result.message)
|
||||
this.getPage()
|
||||
}
|
||||
})
|
||||
}
|
||||
this.dialogShow = false
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
})
|
||||
},
|
||||
deleteDev(obj) {
|
||||
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
deleteDeviceCentraliceCentralPageApi({
|
||||
id: obj.id,
|
||||
projectSn: this.$store.state.projectSn,
|
||||
}).then((res) => {
|
||||
if (res.success) {
|
||||
this.getPage()
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '删除成功!',
|
||||
})
|
||||
} else {
|
||||
this.$message({
|
||||
type: 'error',
|
||||
message: res.message,
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除',
|
||||
})
|
||||
})
|
||||
},
|
||||
async getWorkerInfoList() {
|
||||
await getWorkerInfoListApi({
|
||||
pageNo: this.pagInfo.pageNo,
|
||||
// pageSize: this.pagInfo.pageSize,
|
||||
pageSize: 100000,
|
||||
projectSn: this.$store.state.projectSn,
|
||||
// personType: 1,
|
||||
inserviceType: 1,
|
||||
}).then((result) => {
|
||||
if (result.success) {
|
||||
this.workerList = result.result.records
|
||||
}
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.addEditForm = {}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addEditForm.clearValidate()
|
||||
})
|
||||
},
|
||||
SizeChange(val) {
|
||||
this.pagInfo.pageSize = val
|
||||
this.getPage()
|
||||
},
|
||||
CurrentChange(val) {
|
||||
this.pagInfo.pageNo = val
|
||||
this.getPage()
|
||||
},
|
||||
refresh() {
|
||||
this.searchForm = {}
|
||||
this.pagInfo.pageNo = 1 //页数
|
||||
this.pagInfo.pageSize = 10 //条数
|
||||
this.getPage()
|
||||
this.getWorkerInfoList()
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.tables {
|
||||
// min-height: 0;
|
||||
}
|
||||
.tables2 {
|
||||
min-height: auto;
|
||||
}
|
||||
.textStyle {
|
||||
width: 140px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.tableBtns {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-item: center;
|
||||
}
|
||||
</style>
|
||||
@ -4,8 +4,29 @@
|
||||
<el-button size="medium" type="primary" @click="addBefore">{{
|
||||
$t("message.workType.add")
|
||||
}}</el-button>
|
||||
<div class="operate-clear">
|
||||
<el-button size="medium" type="primary" plain @click="operateClear" style="margin-right: 5px;">手动清零</el-button>
|
||||
<el-popover
|
||||
placement="bottom-start"
|
||||
width="350"
|
||||
:visible-arrow="false"
|
||||
trigger="hover"
|
||||
content="有设备断电或者服务器关机的情况下，系统无法自动清零历史未出场人员记录时，可以点击手动清零进行清除。">
|
||||
<div slot="reference" class="question-icon">?</div>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="search-box">
|
||||
<span>是否清零</span>
|
||||
<div>
|
||||
<span>是否清零</span>
|
||||
<el-popover
|
||||
placement="bottom-start"
|
||||
width="365"
|
||||
:visible-arrow="false"
|
||||
trigger="hover"
|
||||
content="选择零点清零(是)之后，每晚00:00:00点自动清零历史未出场的人员记录，只统计今日出勒和今日在场人员;选择零点清零(否)之后，人员出勤和人员在场将会统计所有历史未出场人员记录以及今日出勤人员和今日在场人员记录。">
|
||||
<div slot="reference" class="question-icon">?</div>
|
||||
</el-popover>
|
||||
</div>
|
||||
<el-radio-group v-model="radioVal" @change="changeSelect">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
@ -183,7 +204,7 @@ import {
|
||||
workerAttendanceRuleEdit,
|
||||
workerAttendanceRuleDelete,
|
||||
} from "@/assets/js/api/laborPerson";
|
||||
import { getProjectDetail, editProjectInfo } from "@/assets/js/api/baseInfo";
|
||||
import { getProjectDetail, editProjectInfo, editClearData } from "@/assets/js/api/baseInfo";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -232,6 +253,30 @@ export default {
|
||||
this.getProjectDetailFn();
|
||||
},
|
||||
methods: {
|
||||
// 手动清零
|
||||
operateClear(){
|
||||
// promptToDelete此操作将永久删除该数据 tips提示 determine确 定 cancel取 消
|
||||
this.$confirm("此操作将清零，请确认是否继续？", this.$t('message.lifter.tips'), {
|
||||
confirmButtonText: this.$t('message.lifter.determine'),
|
||||
cancelButtonText: this.$t('message.lifter.cancel'),
|
||||
type: "warning",
|
||||
}).then(() => {
|
||||
let data = {
|
||||
projectSn: this.$store.state.projectSn,
|
||||
};
|
||||
editClearData(data).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success("操作成功");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: "info",
|
||||
message: "已取消",
|
||||
});
|
||||
});
|
||||
},
|
||||
// 切换清零配置
|
||||
changeSelect() {
|
||||
let reqeustData = {
|
||||
@ -365,13 +410,39 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.operate-clear{
|
||||
.flex();
|
||||
margin-left: 10px;
|
||||
.question-icon{
|
||||
border: 1px solid #676C7C;
|
||||
border-radius: 50%;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
text-align: center;
|
||||
line-height: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
.search-box {
|
||||
.flex();
|
||||
margin-left: 30px;
|
||||
span {
|
||||
margin-right: 8px;
|
||||
>div{
|
||||
.flex();
|
||||
margin-right: 10px;
|
||||
>span {
|
||||
margin-right: 2px;
|
||||
font-size: 14px;
|
||||
}
|
||||
.question-icon{
|
||||
border: 1px solid #676C7C;
|
||||
border-radius: 50%;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
text-align: center;
|
||||
line-height: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
/deep/.el-radio-group {
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
@ -214,7 +214,6 @@
|
||||
<el-input
|
||||
v-model="addInfoForm.socialCode"
|
||||
:placeholder="$t('message.companyDiagram.PleaseEnter')"
|
||||
type="number"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="开户行" prop="bankname">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user