diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
index 91aaa6c9..a4638197 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
@@ -262,7 +262,7 @@
-
+
@@ -361,8 +361,14 @@ export default {
form: {},
// 表单校验
rules: {
- projectId: [{ required: true, message: "项目主键不能为空", trigger: "blur" }],
- deptId: [{ required: true, message: "部门主键不能为空", trigger: "blur" }],
+ insuranceType: [{ required: true, message: "请选择保险类型", trigger: "blur" }],
+ companyName: [
+ { required: true, message: "请输入保险公司名称", trigger: "blur" },
+ { max: 20, message: "请输入", trigger: "blur" },
+ ],
+ insuranceNumber: [
+ { required: true, message: "请输入保险单编号", trigger: "blur" },
+ ],
},
};
},
@@ -442,6 +448,16 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ if (
+ this.form.insuranceFile != null &&
+ this.form.insuranceFile != "" &&
+ this.form.insuranceFile.length > 0
+ ) {
+ this.form.insuranceFile = this.form.insuranceFile[0].url;
+ } else {
+ this.$modal.msgWarning("请上传保险合同");
+ return false;
+ }
if (this.form.id != null) {
updateSurProjectInsurance(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
index 9a604f4c..435d38bf 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
@@ -30,7 +30,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['project:surProjectUserInfo:add']"
+ v-hasPermi="['project:surProjectInsurance:add']"
>办理保险
@@ -181,11 +181,12 @@ export default {
rules: {
insuranceType: [{ required: true, message: "请选择保险类型", trigger: "blur" }],
companyName: [
- { required: true, message: "请选择所属单位", trigger: "blur" },
+ { required: true, message: "请输入保险公司名称", trigger: "blur" },
{ max: 20, message: "请输入", trigger: "blur" },
],
- jobType: [{ required: true, message: "请选择职务类型", trigger: "blur" }],
- userIds: [{ required: true, message: "请选择项目人员", trigger: "blur" }],
+ insuranceNumber: [
+ { required: true, message: "请输入保险单编号", trigger: "blur" },
+ ],
},
surProjectInsuranceList: [],
activeName: "",
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
index aa4d0dbd..5bfa4fe0 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
@@ -58,8 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id
AND spi.insurance_type = sdd.dict_value
AND spi.is_del = 0
-
- left join sur_project_unit_info spui on spui.projectId = sp.id
left join sur_project_userinfo spu on spu.project_id = sp.id
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml
index 3524018a..11217b63 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and spwa.is_del=0
and spwa.project_id = #{projectId}
and spwa.dept_id = #{deptId}
- and DATE_FORMAT(spwa.work_date,'%Y-%m-%d')=DATE_FORMAT(#{workDate},'%Y-%m-%d')
+ and date(spwa.work_date)=date(#{workDate})
group by spwa.project_id
group by spwa.dept_id