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

提交代码

dev_xds
姜玉琦 2024-04-29 23:15:24 +08:00
parent 18d7c62c62
commit e0eef9ab44
8 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
View File

@ -116,7 +116,7 @@
/>
</el-form-item>
<el-form-item v-if="initData.subDeptScope" label="分包范围">
<dict-tag
<dict-tag class="mytags"
v-for="scope in initData.subDeptScope.split(',')"
:options="dict.type.flow_sub_dept_scope"
:value="scope"
@ -583,4 +583,8 @@ export default {
}
}
}
.mytags{
float:left;
margin-right: 6px;
}
</style>

45
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -23,8 +23,8 @@
<div class="canvas" ref="flowCanvas"></div>
<div class="maskLayer" />
</div>
<el-form-item label="所属项目" prop="businessKey">
<el-select
<el-form-item label="所属项目">
<!-- <el-select
v-model="form.businessKey"
placeholder="请选择所属项目"
style="width: 100%"
@ -39,7 +39,8 @@
:value="item.id"
>
</el-option>
</el-select>
</el-select> -->
<el-tag v-for="(item, index) in projectOptions" v-if="item.id==form.businessKey">{{item.projectName}}</el-tag>
</el-form-item>
<el-form-item label="发起单位">
{{ deptName }}
@ -128,6 +129,13 @@
v-model="form.files"
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
/>
<el-alert
v-if="fbAptitude"
title="请至少上传报审表，营业执照，安全生产许可证，资质证书，人员证书等！缺少相关附件可能被驳回申请。"
type="warning"
show-icon
>
</el-alert>
</el-form-item>
<el-form-item label="申请说明" prop="remark">
<el-input
@ -175,6 +183,7 @@ export default {
projectName: "",
files: "",
remark: "",
subDeptScope:[],
},
// 表单校验
rules: {
@ -262,14 +271,13 @@ export default {
methods: {
// 项目选择
projectChage(val) {
let projectName = "";
this.projectOptions.forEach((item) => {
if ((item.id = val)) {
projectName = item.projectName;
if (item.id == val) {
this.form.projectName = item.projectName;
return;
}
});
this.form.projectName = projectName;
},
doCanel() {
this.onOpen = false;
@ -314,6 +322,9 @@ export default {
const params = { procInsId: procInsId };
findFormDatasByProcInsId(params)
.then((res) => {
if(res.data.subDeptScope){
res.data.subDeptScope = res.data.subDeptScope.split(',');
}
this.form = res.data;
this.deptName = this.options.startDeptName;
this.nickName = this.options.startUserName;
@ -342,6 +353,25 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
let fbAptitudeParams = {};
if(this.fbAptitude){
if(this.form.subDeptScope.length==0){
this.$modal.msgError("请至少选择一个分包范围！");
return false;
}else{
fbAptitudeParams={
subDeptType:this.form.subDeptType,
subDeptScope:this.form.subDeptScope.toString(),
subDeptName:this.form.subDeptName,
subDeptAptitude:this.form.subDeptAptitude,
subDeptChairman:this.form.subDeptChairman,
subDeptSafetyCertificate:this.form.subDeptSafetyCertificate,
subDeptCustodian:this.form.subDeptCustodian,
subDeptCustodianCardId:this.form.subDeptCustodianCardId,
subDeptApproachDate:this.form.subDeptApproachDate
}
}
}
this.loading = true;
this.form.variables = {
businessKey: this.form.businessKey,
@ -349,6 +379,7 @@ export default {
files: this.form.files,
remark: this.form.remark,
INITIATOR: this.form.INITIATOR,
...fbAptitudeParams
};
complete(this.form).then((res) => {
this.$store.dispatch("settingAwaitNum");

32
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -102,11 +102,7 @@
placeholder="请输入分包单位项目经理"
/>
</el-form-item>
<el-form-item
v-if="fbAptitude"
label="身份证号"
prop="subDeptCustodianCardId"
>
<el-form-item v-if="fbAptitude" label="身份证号" prop="subDeptCustodianCardId">
<el-input
v-model="form.subDeptCustodianCardId"
placeholder="请输入分包单位项目经理身份证号"
@ -127,6 +123,13 @@
:limit="30"
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
/>
<el-alert
v-if="fbAptitude"
title="请至少上传报审表，营业执照，安全生产许可证，资质证书，人员证书等！缺少相关附件可能被驳回申请。"
type="warning"
show-icon
>
</el-alert>
</el-form-item>
<el-form-item label="申请说明" prop="remark">
<el-input
@ -136,7 +139,7 @@
rows="5"
/>
</el-form-item>
<div style="text-align: center;margin-bottom: 20px;">
<div style="text-align: center; margin-bottom: 20px">
<el-button type="primary" @click="submitForm">提交流程</el-button>
<el-button @click="doCanel">取 消</el-button>
</div>
@ -173,6 +176,7 @@ export default {
projectName: "",
files: "",
remark: "",
subDeptScope: [],
},
// 表单校验
rules: {
@ -275,14 +279,12 @@ export default {
},
// 项目选择
projectChage(val) {
let projectName = "";
this.projectOptions.forEach((item) => {
if ((item.id = val)) {
projectName = item.projectName;
if (item.id == val) {
this.form.projectName = item.projectName;
return;
}
});
this.form.projectName = projectName;
},
doCanel() {
this.onOpen = false;
@ -294,7 +296,7 @@ export default {
this.deptName = store.getters.dept.deptName;
this.nickName = store.getters.name;
//初始化流程类型
if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
if (options.flowKey == "flow_fbzzsp_fbszzsp") {
this.fbAptitude = true;
}
const self = this;
@ -330,6 +332,14 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.fbAptitude) {
if (this.form.subDeptScope.length == 0) {
this.$modal.msgError("请至少选择一个分包范围！");
return false;
} else {
this.form.subDeptScope = this.form.subDeptScope.toString();
}
}
this.loading = true;
definitionStart(this.options.id, JSON.stringify(this.form)).then((res) => {
this.$modal.msgSuccess(res.msg);

6
ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue
View File

@ -121,7 +121,7 @@
/>
</el-form-item>
<el-form-item v-if="initData.subDeptScope" label="分包范围">
<dict-tag
<dict-tag class="mytags"
v-for="scope in initData.subDeptScope.split(',')"
:options="dict.type.flow_sub_dept_scope"
:value="scope"
@ -788,4 +788,8 @@ export default {
font-size: 13px;
margin-top: 30px;
}
.mytags{
float:left;
margin-right: 6px;
}
</style>

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

@ -312,7 +312,7 @@
show-overflow-tooltip
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="验收结果" align="center" prop="checkResult">

5
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -77,7 +77,7 @@
</el-table-column>
<el-table-column label="验收时间" align="center" prop="checkingDate" width="140" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="验收结果" align="center" prop="checkResult" width="80">
@ -198,8 +198,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="验收时间" prop="checkingDate">
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="datetime" placeholder="选择日期时间"
default-time="10:00:00" value-format="yyyy-MM-dd HH:mm:ss">
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>

10
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java
View File

@ -60,7 +60,7 @@ public class ProjectViewController extends BaseBuildNodeController{
if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){
surProject.setDeptId(sysDeptService.getZGSDeptId(getDeptId()));
}
String key = "statistics.project.selectStatisticsProjectList-"+surProject.getProjectName()+"-"+surProject.getDeptId()+"-"+surProject.getProjectType()+"-"+surProject.getProjectNature();
String key = "statistics.project.selectStatisticsProjectList-"+surProject.getProjectName()+"-"+surProject.getDeptId()+"-"+surProject.getProjectType()+"-"+surProject.getProjectNature()+"-"+surProject.getParams().toString();
List<ProjectViewExport> list = redisCache.getCacheObject(key);
if(list!=null){
return getDataTable(list);
@ -80,7 +80,11 @@ public class ProjectViewController extends BaseBuildNodeController{
surProject.setDeptId(sysDeptService.getZGSDeptId(getDeptId()));
}
OutputStream outputStream = null;
List<ProjectViewExport> list = projectViewService.selectStatisticsProjectList(surProject);
String key = "statistics.project.selectStatisticsProjectList-"+surProject.getProjectName()+"-"+surProject.getDeptId()+"-"+surProject.getProjectType()+"-"+surProject.getProjectNature()+"-"+surProject.getParams().toString();
List<ProjectViewExport> list = redisCache.getCacheObject(key);
if(list==null){
list = projectViewService.selectStatisticsProjectList(surProject);
}
try {
response.reset();// 清空输出流
response.setContentType("application/octet-stream;charset=UTF-8");
@ -637,7 +641,7 @@ public class ProjectViewController extends BaseBuildNodeController{
if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){
surProject.setDeptId(sysDeptService.getZGSDeptId(getDeptId()));
}
String key = "statistics.project.selectStatisticsJlProjectList-"+surProject.getProjectName()+"-"+surProject.getDeptId()+"-"+surProject.getProjectType()+"-"+surProject.getProjectNature();
String key = "statistics.project.selectStatisticsJlProjectList-"+surProject.getProjectName()+"-"+surProject.getDeptId()+"-"+surProject.getProjectType()+"-"+surProject.getProjectNature()+"-"+surProject.getParams().toString();
List<ProjectViewJlExport> list = redisCache.getCacheObject(key);
if(list!=null){
return getDataTable(list);

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

@ -100,8 +100,8 @@ public class SurProjectChecking extends BaseEntity
private String groupDeptUserName;
/** 验收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkingDate;
/** 验收附件 */
@ -139,9 +139,6 @@ public class SurProjectChecking extends BaseEntity
@Excel(name = "子验收类型")
private String dataTypeLvl2;
public void setId(Long id)
{
this.id = id;