From 4b666da24f6cd8c2ce3b4226cd0c2a8005316837 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 13 Apr 2024 18:34:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/baseInfo.js | 1 + .../js/api/devicePosition/deviceCentral.js | 49 ++++ src/assets/js/http.js | 6 +- .../deviceCentral/deviceCentral.vue | 242 ++++++++++++++++ .../deviceCentral/equipmentCentral.vue | 259 ------------------ .../attendanceManage/attendanceRules.vue | 79 +++++- .../components/basic-info.vue | 1 - 7 files changed, 370 insertions(+), 267 deletions(-) create mode 100644 src/assets/js/api/devicePosition/deviceCentral.js create mode 100644 src/views/projectFront/devicePosition/deviceCentral/deviceCentral.vue delete mode 100644 src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue diff --git a/src/assets/js/api/baseInfo.js b/src/assets/js/api/baseInfo.js index 3f2ed88f..045fd45f 100644 --- a/src/assets/js/api/baseInfo.js +++ b/src/assets/js/api/baseInfo.js @@ -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); //上传第三方平台 diff --git a/src/assets/js/api/devicePosition/deviceCentral.js b/src/assets/js/api/devicePosition/deviceCentral.js new file mode 100644 index 00000000..2b4deba9 --- /dev/null +++ b/src/assets/js/api/devicePosition/deviceCentral.js @@ -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); +} diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 2852905f..3257741d 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -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/' //嘉兴王江泾公用码头 diff --git a/src/views/projectFront/devicePosition/deviceCentral/deviceCentral.vue b/src/views/projectFront/devicePosition/deviceCentral/deviceCentral.vue new file mode 100644 index 00000000..5af19d0e --- /dev/null +++ b/src/views/projectFront/devicePosition/deviceCentral/deviceCentral.vue @@ -0,0 +1,242 @@ + + + diff --git a/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue b/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue deleted file mode 100644 index 29ce40ad..00000000 --- a/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceRules.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceRules.vue index f1fedfb6..7ce4c016 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceRules.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceRules.vue @@ -4,8 +4,29 @@ {{ $t("message.workType.add") }} +
+ 手动清零 + +
?
+ +
- 是否清零 +
+ 是否清零 + +
?
+ +
是 否 @@ -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; } diff --git a/src/views/supplierAdmin/qualificationApply/components/basic-info.vue b/src/views/supplierAdmin/qualificationApply/components/basic-info.vue index f5a179ac..9bedf76a 100644 --- a/src/views/supplierAdmin/qualificationApply/components/basic-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/basic-info.vue @@ -214,7 +214,6 @@