From 722633ea2e3a1fcacc2992aa5fb9992633b897f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 16 Aug 2023 20:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/SysRegisterService.java | 2 +- .../src/api/project/surProjectInsurance.js | 19 +- .../views/project/projectDeptWroks/index.vue | 8 +- .../projectDeptWroksDrawer.vue | 16 +- .../src/views/project/surProject/index.vue | 12 + .../surProjectAttendance/attendanceDrawer.vue | 30 +- .../project/surProjectAttendance/index.vue | 6 +- .../project/surProjectInsurance/index.vue | 180 +++++++-- .../surProjectInsurance/insuranceDrawer.vue | 376 ++++++++++++++++++ .../ProjectAttendanceController.java | 73 ++++ .../SurProjectInsuranceController.java | 26 +- .../project/domain/SurProjectDeptWroks.java | 16 +- .../project/domain/SurProjectInsurance.java | 165 +++++++- .../domain/SurProjectWorkAttendance.java | 4 +- .../mapper/SurProjectDeptWroksMapper.java | 9 + .../mapper/SurProjectInsuranceMapper.java | 22 +- .../SurProjectWorkAttendanceMapper.java | 8 + .../service/ISurProjectDeptWroksService.java | 8 + .../service/ISurProjectInsuranceService.java | 22 +- .../ISurProjectWorkAttendanceService.java | 8 + .../impl/SurProjectDeptWroksServiceImpl.java | 11 + .../impl/SurProjectInsuranceServiceImpl.java | 37 +- .../SurProjectWorkAttendanceServiceImpl.java | 11 + .../project/SurProjectDeptWroksMapper.xml | 19 + .../project/SurProjectInsuranceMapper.xml | 139 ++++++- .../SurProjectWorkAttendanceMapper.xml | 21 +- 26 files changed, 1124 insertions(+), 124 deletions(-) create mode 100644 ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue create mode 100644 yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index f2afe31f..3318ea74 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -80,7 +80,7 @@ public class SysRegisterService boolean regFlag = userService.registerUser(sysUser); if (!regFlag) { - msg = "注册失败,请联系系统管理人员"; + msg = "注册失败,请联系系统监理人员"; } else { diff --git a/ruoyi-ui/src/api/project/surProjectInsurance.js b/ruoyi-ui/src/api/project/surProjectInsurance.js index a7b20482..cc9f92e4 100644 --- a/ruoyi-ui/src/api/project/surProjectInsurance.js +++ b/ruoyi-ui/src/api/project/surProjectInsurance.js @@ -9,10 +9,19 @@ export function listSurProjectInsurance(query) { }) } -// 查询项目保险详细 -export function getSurProjectInsurance(projectId) { +// 查询项目保险列表 +export function listSurProjectInsurancev2(query) { return request({ - url: '/project/surProjectInsurance/' + projectId, + url: '/project/surProjectInsurance/listv2', + method: 'get', + params: query + }) +} + +// 查询项目保险详细 +export function getSurProjectInsurance(id) { + return request({ + url: '/project/surProjectInsurance/' + id, method: 'get' }) } @@ -36,9 +45,9 @@ export function updateSurProjectInsurance(data) { } // 删除项目保险 -export function delSurProjectInsurance(projectId) { +export function delSurProjectInsurance(id) { return request({ - url: '/project/surProjectInsurance/' + projectId, + url: '/project/surProjectInsurance/' + id, method: 'delete' }) } diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue index cef7c0e7..51eabd4f 100644 --- a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue +++ b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue @@ -75,7 +75,7 @@ - + @@ -97,7 +97,7 @@ - + - - + + diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue index f9535bb1..67ff20e8 100644 --- a/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue +++ b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue @@ -28,13 +28,13 @@ label="请输入劳务人员" > - + @@ -47,7 +47,7 @@ > -
+
确定 取消
@@ -69,6 +69,7 @@ export default { isOpen: false, project: null, title: "", + isUnit: true, nodes: [], form: { oldServicePersonnel: 0, @@ -95,6 +96,9 @@ export default { this.isOpen = false; }, show(project) { + this.form.servicePersonnel = 0; + this.form.supervisorPersonnel = 0; + this.form.contractorPersonnel = 0; this.project = project; this.title = project.projectName; this.isOpen = true; @@ -103,9 +107,13 @@ export default { unitType: 2, }).then((d) => { this.nodes = d.rows; - if (this.nodes.length > 0) { + if (d.rows.length > 0) { this.activeName = this.nodes[0].unitId + ""; + this.isUnit = true; this.loadData(); + } else { + this.$message.error("当前项目未分配总包单位，不能维护在册人员"); + this.isUnit = false; } }); }, diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index aa534759..9d303726 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -400,6 +400,12 @@ v-hasPermi="['work:emergencyDrill:list']" >项目应急演练 + 项目保险管理 +
@@ -770,6 +777,7 @@ import emergencyDrillDrawer from "../../work/emergencyDrill/emergencyDrillDrawer import surProjectSpecialDrawer from "../surProjectSpecial/surProjectSpecialDrawer.vue"; import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue"; import projectDeptWroksDrawer from "../projectDeptWroks/projectDeptWroksDrawer.vue"; +import insuranceDrawer from "../surProjectInsurance/insuranceDrawer.vue"; export default { name: "SurProject", @@ -784,6 +792,7 @@ export default { emergencyDrillDrawer, surProjectSpecialDrawer, projectDeptWroksDrawer, + insuranceDrawer, }, dicts: [ "sys_check_state", @@ -1017,6 +1026,9 @@ export default { case "handleProjectAttendance": this.$refs.attDrawer.show(row); break; + case "handleProjectInsurance": + this.$refs.insurance.show(row); + break; default: break; } diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue index b0a11820..9cd86092 100644 --- a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue @@ -33,7 +33,7 @@ >人 - + - + @@ -78,7 +78,7 @@ > -
+
确定 取消
@@ -106,6 +106,7 @@ export default { project: null, title: "", nodes: [], + isUnit: true, vform: { servicePersonnel: 0, supervisorPersonnel: 0, @@ -128,17 +129,22 @@ export default { methods: { doOk() { updateSurProjectAttendance(this.form).then((response) => { - this.$modal.msgSuccess("保存成功"); - this.isOpen = false; + if (response.code == 200) { + this.$modal.msgSuccess("保存成功"); + this.isOpen = false; + } else { + this.$message.error("操作失败，数据异常！请稍后再试！！！"); + this.isOpen = false; + } }); }, doCanel() { this.isOpen = false; }, show(project) { - this.form.servicePersonnel = null; - this.form.supervisorPersonnel = null; - this.form.contractorPersonnel = null; + this.form.servicePersonnel = 0; + this.form.supervisorPersonnel = 0; + this.form.contractorPersonnel = 0; this.project = project; this.title = project.projectName; this.isOpen = true; @@ -149,7 +155,13 @@ export default { this.nodes = d1.rows; if (this.nodes.length > 0) { this.activeName = this.nodes[0].unitId + ""; + this.isUnit = true; this.loadData(); + } else { + this.$message.error( + "当前项目未分配总包单位，未登记在册人员，今日出勤数据不能维护！" + ); + this.isUnit = false; } }); }, diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/index.vue b/ruoyi-ui/src/views/project/surProjectAttendance/index.vue index 53aef322..19f6acbe 100644 --- a/ruoyi-ui/src/views/project/surProjectAttendance/index.vue +++ b/ruoyi-ui/src/views/project/surProjectAttendance/index.vue @@ -96,7 +96,7 @@ - +