diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index a2685b73..e9722df0 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -106,37 +106,68 @@ - - + + + - + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+
确 定 取 消
@@ -278,6 +343,12 @@ export default { qualifiedFlag: [ { required: true, message: "请选择是否提供合格证", trigger: "blur" }, ], + trustDeed:[ + {required:true,message:'请上传委托单',trigger:"blur"} + ], + specimenPhoto:[ + {required:true,message:'请上传样品照片',trigger:"blur"} + ], witnessUser: [ { required: true, message: "请选择监理单位监理专员", trigger: "blur" }, ], @@ -400,13 +471,19 @@ export default { this.files = []; this.resetForm("form"); }, + getDeptName(){ + let tmps=this.nodes.filter(d=>d.deptId==+this.unitActiveName); + return tmps.length>0?tmps[0].deptName:""; + }, /** 新增按钮操作 */ handleAdd() { + debugger this.reset(); this.credential = false; this.form.projectId = this.project.id; this.form.projectName = this.project.projectName; this.form.deptId = this.unitActiveName; + this.form.deptName=this.getDeptName(); this.open = true; this.title = "添加材料取样复试"; //查询单位人员 @@ -430,7 +507,14 @@ export default { this.reset(); const id = row.id || this.ids; getCheckDetection(id).then((response) => { - this.form = response.data; + let obj= response.data; + obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{ + return { + name:d, + url:d + } + }); + this.form = obj; this.files = this.form.credentialFile; this.open = true; this.title = "修改项目特种人员"; @@ -458,6 +542,7 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]"; if (this.form.id) { //已经上传过检测结果时，修改重新发起提交申请 if (this.form.checkState == "2") { @@ -533,3 +618,47 @@ export default { }, }; + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index df29f2f9..cc92cdd3 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -1,37 +1,16 @@ @@ -564,7 +379,7 @@ export default { indexDrawer, approveCheckDetectionDrawer, }, - dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"], + dicts: ["sys_yes_no", "project_check_status", "project_checking_result", "check_detection_check_type"], data() { return { // 遮罩层 @@ -607,7 +422,7 @@ export default { checkState: null, detectionResult: null, activeName: "jxz", - approveStatus:null, + approveStatus: null, }, // 表单参数 form: {}, @@ -635,6 +450,12 @@ export default { qualifiedFlag: [ { required: true, message: "请选择是否提供合格证", trigger: "blur" }, ], + trustDeed:[ + {required:true,message:'请上传委托单',trigger:"blur"} + ], + specimenPhoto:[ + {required:true,message:'请上传样品照片',trigger:"blur"} + ], witnessUser: [ { required: true, message: "请选择监理单位监理专员", trigger: "blur" }, ], @@ -656,7 +477,7 @@ export default { }, }; }, - created() { + created() { this.getList(); }, methods: { @@ -681,7 +502,10 @@ export default { } this.queryCount(this.queryParams); listCheckDetection(this.queryParams).then((response) => { - this.checkDetectionList = response.rows; + this.checkDetectionList = (response.rows||[]).map(d=>{ + d.attachmentFiles=this.$tryToJson(d.attachment,[]); + return d; + }); this.total = response.total; this.loading = false; }); @@ -758,7 +582,14 @@ export default { this.reset(); const id = row.id || this.ids; getCheckDetection(id).then((response) => { - this.form = response.data; + let obj= response.data; + obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{ + return { + name:d, + url:d + } + }); + this.form =obj; this.open = true; this.title = "修改材料取样复试"; }); @@ -785,6 +616,7 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]"; if (this.form.id != null) { updateCheckDetection(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); @@ -828,7 +660,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { @@ -859,15 +691,59 @@ export default { }, /** 审批日志 */ handleAuditinfo(row) { - row.title="材料取样复试"; - row.logType="1"; + row.title = "材料取样复试"; + row.logType = "1"; this.$refs.indexDrawer.show(row); }, /** 处理审批 */ - handleAudit(row){ - row.typeName="材料封样"; + handleAudit(row) { + row.typeName = "材料封样"; this.$refs.approveCheckDetectionDrawer.show(row); } }, }; - \ No newline at end of file + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index 5447a8c0..691ea27b 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -206,7 +206,7 @@ - + @@ -572,6 +572,17 @@ export default { z-index: 9; margin-top:-4px; } + .upload-file { + .upload-file-uploader{ + display: flex; + align-items: center; + margin-bottom: 0px; + line-height: 30px; + .el-upload__tip{ + margin-left: 8px; + } + } + } .upload-file-list { max-height: 120px; overflow-y: auto; diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java index 17b9af0a..ba862582 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java @@ -4,6 +4,7 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.sign.Md5Utils; @@ -58,22 +59,15 @@ public class ProjectCheckDetectionController extends BaseController { * @return */ @PostMapping("/getList") - public AjaxResult getList(@RequestBody SurProjectCheckDetection where){ + public TableDataInfo getList(@RequestBody SurProjectCheckDetection where){ Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - String key="bgscreen_checkDetection_getList_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId()+where - .getProType()+ Md5Utils.hash(where.getPrjIds()); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } - + startPage(); List list=checkDetectionService.getList(where); - redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return getDataTable(list); } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java index 6a0791b8..a91ca371 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java @@ -93,6 +93,34 @@ public class SurProjectCheckDetection extends BaseEntity @Excel(name = "数据状态") private String isDel; + private String attachment; + private String trustDeed; + + public String getAttachment() { + return attachment; + } + + public void setAttachment(String attachment) { + this.attachment = attachment; + } + + public String getTrustDeed() { + return trustDeed; + } + + public void setTrustDeed(String trustDeed) { + this.trustDeed = trustDeed; + } + + public String getSpecimenPhoto() { + return specimenPhoto; + } + + public void setSpecimenPhoto(String specimenPhoto) { + this.specimenPhoto = specimenPhoto; + } + + private String specimenPhoto; /** 审核状态 */ @Excel(name = "审核状态") private String approveStatus; diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index c841bcc7..ea1e1fb9 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -35,10 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name,u2.nick_name update_by_name + SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name + ,u2.nick_name update_by_name,spcd.attachment,spcd.trust_deed,spcd.specimen_photo FROM sur_project_check_detection spcd LEFT JOIN sur_project sp ON spcd.project_id = sp.id LEFT JOIN sys_dept sd ON sd.dept_id = spcd.dept_id @@ -159,6 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, remark, approve_status, + attachment, + trust_deed, + specimen_photo, #{projectId}, @@ -185,6 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{remark}, #{approveStatus}, + #{attachment}, + #{trustDeed}, + #{specimenPhoto}, @@ -215,6 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, remark = #{remark}, approve_status = #{approveStatus}, + attachment = #{attachment}, + trust_deed = #{trustDeed}, + specimen_photo = #{specimenPhoto}, where id = #{id}