sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev
姜玉琦 2024-12-04 22:54:29 +08:00
parent 9d3cbc5237
commit e55d2cd939
8 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -61,6 +61,15 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['project:checkDetection:export']"
>导出</el-button
>
</el-form-item>
</el-form>
@ -725,7 +734,7 @@ export default {
{
...this.queryParams,
},
`checkDetection_${new Date().getTime()}.xlsx`
`材料取样复试_${new Date().getTime()}.xlsx`
);
},
/** 选择见证人*/

11
ruoyi-ui/src/views/project/materialSeal/index.vue
View File

@ -58,6 +58,15 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['project:materialSeal:export']"
>导出</el-button
>
</el-form-item>
</el-form>
@ -586,7 +595,7 @@ export default {
{
...this.queryParams,
},
`materialSeal_${new Date().getTime()}.xlsx`
`材料封样_${new Date().getTime()}.xlsx`
);
},
/** 选择见证人*/

11
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -64,6 +64,15 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['project:projectChecking:export']"
>导出</el-button
>
</el-form-item>
</el-form>
@ -618,7 +627,7 @@ export default {
{
...this.queryParams,
},
`projectChecking_${new Date().getTime()}.xlsx`
`举牌验收_${new Date().getTime()}.xlsx`
);
},
/** 选择质量专员*/

11
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -63,6 +63,15 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['project:projectMeasure:export']"
>导出</el-button
>
</el-form-item>
</el-form>
@ -605,7 +614,7 @@ export default {
{
...this.queryParams,
},
`projectMeasure_${new Date().getTime()}.xlsx`
`实测实量_${new Date().getTime()}.xlsx`
);
},
/** 选择质量专员*/

24
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
View File

@ -21,15 +21,19 @@ public class SurProjectCheckDetection extends BaseEntity
private Long id;
/** 项目主键 */
@Excel(name = "项目主键")
private Long projectId;
/** 单位主键 */
@Excel(name = "单位主键")
private Long deptId;
@Excel(name = "项目名称")
private String projectName;
@Excel(name = "单位名称")
private String deptName;
/** 送检类型 */
@Excel(name = "送检类型")
@Excel(name = "送检类型",dictType = "check_detection_check_type")
private String checkType;
/** 材料名称 */
@ -45,19 +49,16 @@ public class SurProjectCheckDetection extends BaseEntity
private String sampleNum;
/** 提供合格证 */
@Excel(name = "提供合格证")
@Excel(name = "是否提供合格证",dictType = "sys_yes_no")
private String qualifiedFlag;
/** 代表数量 */
@Excel(name = "代表数量")
private String represenNum;
/** 取样人 */
@Excel(name = "取样人")
private String sampleUser;
/** 取样人名称 */
@Excel(name = "取样人名称")
private String sampleUserName;
/** 见证人 */
@ -78,19 +79,15 @@ public class SurProjectCheckDetection extends BaseEntity
private Date checkTime;
/** 送检状态 */
@Excel(name = "送检状态")
private String checkState;
/** 检测结果 */
@Excel(name = "检测结果")
private String detectionResult;
/** 检测报告 */
@Excel(name = "检测报告")
private String detectionFile;
/** 数据状态 */
@Excel(name = "数据状态")
private String isDel;
private String attachment;
@ -121,13 +118,12 @@ public class SurProjectCheckDetection extends BaseEntity
}
private String specimenPhoto;
/** 审核状态 */
@Excel(name = "审核状态")
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
private String checkTypeName;
private String projectName;
private String deptName;
private String createByName;
private String updateByName;

9
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
View File

@ -63,7 +63,6 @@ public class SurProjectChecking extends BaseEntity
private Long checkingNum;
/** 验收结果 */
@Excel(name = "验收结果")
private String checkResult;
/** 验收描述 */
@ -87,11 +86,9 @@ public class SurProjectChecking extends BaseEntity
private String superviseUserName;
/** 分包单位用户 */
@Excel(name = "分包单位用户")
private String groupDeptUser;
/** 分包单位用户名称 */
@Excel(name = "分包单位用户名称")
private String groupDeptUserName;
/** 验收时间 */
@ -100,19 +97,16 @@ public class SurProjectChecking extends BaseEntity
private Date checkingDate;
/** 验收附件 */
@Excel(name = "验收附件")
private String checkingFiles;
/** 数据状态 */
@Excel(name = "数据状态")
private Long isDel;
/** 审核状态 */
@Excel(name = "审核状态")
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
@Excel(name = "验收类型")
private String dataTypeLvl1;
public String getDataTypeLvl1() {
@ -131,7 +125,6 @@ public class SurProjectChecking extends BaseEntity
this.dataTypeLvl2 = dataTypeLvl2;
}
@Excel(name = "子验收类型")
private String dataTypeLvl2;
public void setId(Long id)

26
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java
View File

@ -33,11 +33,9 @@ public class SurProjectMaterialSeal extends BaseEntity
private String deptName;
/** 封样主图 */
@Excel(name = "封样主图")
private String mainImage;
/** 图片集合 */
@Excel(name = "图片集合")
private String imageUrls;
/** 封样名称 */
@ -62,25 +60,11 @@ public class SurProjectMaterialSeal extends BaseEntity
private Date sealDate;
/** 会签单 */
@Excel(name = "会签单")
private String signFiles;
/** 变更单 */
@Excel(name = "变更单")
private String alterationFiles;
/** 数据状态 */
@Excel(name = "数据状态")
private String isDel;
/** 审核状态 */
@Excel(name = "审核状态")
private String approveStatus;
/** 封样状态 */
@Excel(name = "封样状态")
private String materialResult;
/** 监理人 */
@Excel(name = "监理人")
private String witnessUser;
@ -89,6 +73,16 @@ public class SurProjectMaterialSeal extends BaseEntity
@Excel(name = "监理人名称")
private String witnessUserName;
/** 数据状态 */
private String isDel;
/** 审核状态 */
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
/** 封样状态 */
private String materialResult;
public void setId(Long id)
{
this.id = id;

11
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java
View File

@ -33,15 +33,13 @@ public class SurProjectMeasure extends BaseEntity
private String deptName;
/** 测量主图 */
@Excel(name = "测量主图")
private String mainImage;
/** 图片集合 */
@Excel(name = "图片集合")
private String imageUrls;
/** 测量类型 */
@Excel(name = "测量类型")
@Excel(name = "测量类型",dictType = "project_measure_type")
private String measureType;
/** 测量部位 */
@ -49,7 +47,7 @@ public class SurProjectMeasure extends BaseEntity
private String measurePosition;
/** 测量内容 */
@Excel(name = "测量内容")
@Excel(name = "测量内容",dictType = "project_measure_info_type")
private String measureInfo;
/** 测量时间 */
@ -62,11 +60,9 @@ public class SurProjectMeasure extends BaseEntity
private String measurePointPosition;
/** 测量结果 */
@Excel(name = "测量结果")
private String measureResult;
/** 测量文件 */
@Excel(name = "测量文件")
private String measureFiles;
/** 质量专员 */
@ -86,11 +82,10 @@ public class SurProjectMeasure extends BaseEntity
private String superviseUserName;
/** 数据状态 */
@Excel(name = "数据状态")
private String isDel;
/** 审核状态 */
@Excel(name = "审核状态")
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
private String measureTypeName;