提交代码
姜玉琦
parent
3532bc3f04
commit
a485269f95
|
|
@ -10,6 +10,8 @@ public enum PublicStateEnum {
|
||||||
OK("0", "正常"),
|
OK("0", "正常"),
|
||||||
DISABLE("1", "停用"),
|
DISABLE("1", "停用"),
|
||||||
DELETED("2", "删除"),
|
DELETED("2", "删除"),
|
||||||
|
HG("1","合格"),
|
||||||
|
BHG("2","不合格"),
|
||||||
USERTYPE_JFJL("21", "甲方经理"),
|
USERTYPE_JFJL("21", "甲方经理"),
|
||||||
/**********************************项目验收***************************************/
|
/**********************************项目验收***************************************/
|
||||||
PROJECT_CHECK_TYPE_JPYS("1", "举牌验收"),
|
PROJECT_CHECK_TYPE_JPYS("1", "举牌验收"),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询项目审核信息列表
|
||||||
|
export function listProjectAuditinfo(query) {
|
||||||
|
return request({
|
||||||
|
url: '/project/projectAuditinfo/findList',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 统计项目审核信息
|
||||||
|
export function findAuditCount(query) {
|
||||||
|
return request({
|
||||||
|
url: '/project/projectAuditinfo/findAuditCount',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -156,12 +156,13 @@ export default {
|
||||||
this.queryParams.params["beginDate"] = this.daterangeCheckTime[0];
|
this.queryParams.params["beginDate"] = this.daterangeCheckTime[0];
|
||||||
this.queryParams.params["endDate"] = this.daterangeCheckTime[1];
|
this.queryParams.params["endDate"] = this.daterangeCheckTime[1];
|
||||||
}
|
}
|
||||||
// todoList(this.queryParams).then(response => {
|
//重新刷新代办任务
|
||||||
// this.todoList = response.data.records;
|
|
||||||
// this.total = response.data.total;
|
|
||||||
// this.loading = false;
|
|
||||||
// });
|
|
||||||
this.$store.dispatch('settingAwaitNum');
|
this.$store.dispatch('settingAwaitNum');
|
||||||
|
myAwaitFlowTaskList(this.queryParams).then(response => {
|
||||||
|
this.todoList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
},
|
},
|
||||||
// 跳转到处理页面
|
// 跳转到处理页面
|
||||||
handleProcess(row){
|
handleProcess(row){
|
||||||
|
|
@ -179,16 +180,6 @@ export default {
|
||||||
this.$refs.approveDrawer.show(row);
|
this.$refs.approveDrawer.show(row);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// this.$router.push({ path: '/flowable/task/todo/detail/index',
|
|
||||||
// query: {
|
|
||||||
// procInsId: row.procInsId,
|
|
||||||
// executionId: row.executionId,
|
|
||||||
// deployId: row.deployId,
|
|
||||||
// taskId: row.taskId,
|
|
||||||
// taskName: row.taskName,
|
|
||||||
// startUser: row.startUserName + '-' + row.startDeptName,
|
|
||||||
// }})
|
|
||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-paperclip"
|
icon="el-icon-paperclip"
|
||||||
@click="handledownload(scope.row)"
|
@click="handleDownload(scope.row)"
|
||||||
v-hasPermi="['project:surProjectSpecial:list']"
|
v-hasPermi="['project:surProjectSpecial:list']"
|
||||||
>下载检测报告</el-button
|
>下载检测报告</el-button
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -172,15 +172,16 @@
|
||||||
:data="checkDetectionList"
|
:data="checkDetectionList"
|
||||||
@selection-change="handleSelectionChange" stripe
|
@selection-change="handleSelectionChange" stripe
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="项目名称"
|
label="项目名称"
|
||||||
align="center"
|
align="center"
|
||||||
prop="projectName"
|
prop="projectName"
|
||||||
fixed="left"
|
|
||||||
width="200"
|
width="200"
|
||||||
show-overflow-tooltip
|
>
|
||||||
/>
|
<template slot-scope="scope">
|
||||||
|
<div>{{ scope.row.projectName }}</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="单位名称"
|
label="单位名称"
|
||||||
align="center"
|
align="center"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,227 @@
|
||||||
|
<template>
|
||||||
|
<div class="projectect-attendance-drawer">
|
||||||
|
<el-drawer
|
||||||
|
v-if="isOpen"
|
||||||
|
:visible.sync="isOpen"
|
||||||
|
ref="drawer"
|
||||||
|
direction="rtl"
|
||||||
|
@close="closeCallBack"
|
||||||
|
size="50%"
|
||||||
|
>
|
||||||
|
<template slot="title">
|
||||||
|
<div>{{ title + " 【提交审批】" }}</div>
|
||||||
|
</template>
|
||||||
|
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
|
||||||
|
<el-form-item label="项目名称">
|
||||||
|
{{dataInfo.projectName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="送检类型">
|
||||||
|
<dict-tag
|
||||||
|
:options="dict.type.check_detection_check_type"
|
||||||
|
:value="dataInfo.checkType"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="合格证">
|
||||||
|
<el-tag v-if="dataInfo.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
|
||||||
|
<el-tag v-if="dataInfo.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="材料名称">
|
||||||
|
{{ dataInfo.materialName }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="取样数量">
|
||||||
|
{{ dataInfo.sampleNum }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="使用部位">
|
||||||
|
{{ dataInfo.usePosition }}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="监理专员">
|
||||||
|
{{ dataInfo.witnessUserName }}
|
||||||
|
<el-tag type="info" size="mini">{{ dataInfo.witnessUser }}</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交用户">
|
||||||
|
{{ dataInfo.createBy }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交单位">
|
||||||
|
{{ dataInfo.deptName }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="实验室名称">
|
||||||
|
<span>{{ dataInfo.laboratoryName }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="送检时间">
|
||||||
|
<span>{{ parseTime(dataInfo.checkTime, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="检测报告" v-if="dataInfo.checkState == '2'">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-paperclip"
|
||||||
|
@click="handleDownload()"
|
||||||
|
>下载检测报告</el-button
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="送检结果" prop="detectionResult">
|
||||||
|
<el-radio
|
||||||
|
v-model="form.detectionResult"
|
||||||
|
v-for="dict in dict.type.project_checking_result"
|
||||||
|
:label="dict.value"
|
||||||
|
:key="dict.value"
|
||||||
|
border
|
||||||
|
size="small"
|
||||||
|
>{{ dict.label }}</el-radio
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="审批意见" prop="comment">
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
placeholder="请输入审批意见（200字内）"
|
||||||
|
v-model="form.comment"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<div style="text-align: center">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</el-drawer>
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="showViewer"
|
||||||
|
:on-close="closeViewer"
|
||||||
|
:url-list="previewList"
|
||||||
|
style="z-index: 2050"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
getCheckDetection,
|
||||||
|
updateCheckDetection,
|
||||||
|
} from "@/api/project/checkDetection";
|
||||||
|
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "approveCheckDetectionDrawer",
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
closeCallBack: {
|
||||||
|
type: Function,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
showViewer: false,
|
||||||
|
open: false,
|
||||||
|
isOpen: false,
|
||||||
|
dataInfo: {},
|
||||||
|
title: "",
|
||||||
|
form: {},
|
||||||
|
rules: {
|
||||||
|
detectionResult: [{ required: true, message: "请选择送检结果", trigger: "blur" }],
|
||||||
|
comment: [
|
||||||
|
{ required: true, message: "请输入审批意见", trigger: "blur" },
|
||||||
|
{ max: 200, message: "审批意见最多200字符", trigger: "blur" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
previewList: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {},
|
||||||
|
mounted() {},
|
||||||
|
methods: {
|
||||||
|
getImageUrl(url) {
|
||||||
|
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
|
||||||
|
},
|
||||||
|
onPreview(urls) {
|
||||||
|
this.previewList = [];
|
||||||
|
urls.split(",").forEach((item) => {
|
||||||
|
this.previewList.push(process.env.VUE_APP_BASE_API + item);
|
||||||
|
});
|
||||||
|
this.showViewer = true;
|
||||||
|
},
|
||||||
|
closeViewer() {
|
||||||
|
this.showViewer = false;
|
||||||
|
},
|
||||||
|
show(options) {
|
||||||
|
this.title = options.typeName;
|
||||||
|
this.isOpen = true;
|
||||||
|
this.form={};
|
||||||
|
this.form.id=options.id;
|
||||||
|
getCheckDetection(options.id)
|
||||||
|
.then((res) => {
|
||||||
|
this.dataInfo = res.data;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
// 结果状态同步到审批状态
|
||||||
|
let msg = "合格";
|
||||||
|
if(this.form.detectionResult=="1"){
|
||||||
|
this.form.approveStatus="4";
|
||||||
|
}else{
|
||||||
|
msg = "不合格";
|
||||||
|
this.form.approveStatus="3";
|
||||||
|
}
|
||||||
|
this.$confirm('是否确认审批'+msg+'?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
this.loading=true;
|
||||||
|
updateCheckDetection(this.form).then(res => {
|
||||||
|
this.$modal.msgSuccess("审批成功");
|
||||||
|
this.loading = false;
|
||||||
|
//关闭并刷新列表
|
||||||
|
this.$refs.drawer.closeDrawer();
|
||||||
|
});
|
||||||
|
}).catch(() => {
|
||||||
|
console.log("取消操作");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 下载附件 */
|
||||||
|
handleDownload() {
|
||||||
|
let files = this.dataInfo.measureFiles.split(",");
|
||||||
|
files.forEach((item) => {
|
||||||
|
this.$download.resource(item);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,200 @@
|
||||||
|
<template>
|
||||||
|
<div class="projectect-attendance-drawer">
|
||||||
|
<el-drawer
|
||||||
|
v-if="isOpen"
|
||||||
|
:visible.sync="isOpen"
|
||||||
|
ref="drawer"
|
||||||
|
direction="rtl"
|
||||||
|
@close="closeCallBack"
|
||||||
|
size="50%"
|
||||||
|
>
|
||||||
|
<template slot="title">
|
||||||
|
<div>{{ title + " 【提交审批】" }}</div>
|
||||||
|
</template>
|
||||||
|
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
|
||||||
|
<el-form-item label="项目名称">
|
||||||
|
{{dataInfo.projectName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="验收图片">
|
||||||
|
<el-image
|
||||||
|
ref="preview"
|
||||||
|
v-for="img in dataInfo.imageUrls.split(',')"
|
||||||
|
:src="getImageUrl(img)"
|
||||||
|
style="width: 120px; height: 120px; margin-right: 15px"
|
||||||
|
@click="onPreview(img)"
|
||||||
|
></el-image>
|
||||||
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="质量专员">
|
||||||
|
{{ dataInfo.qualityUserName }}
|
||||||
|
<el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="监理专员">
|
||||||
|
{{ dataInfo.superviseUserName }}
|
||||||
|
<el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="工序部位">
|
||||||
|
<span>{{ dataInfo.checkWorkingPosition }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="验收描述">
|
||||||
|
<span>{{ dataInfo.intro }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交用户">
|
||||||
|
{{ dataInfo.createBy }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交单位">
|
||||||
|
{{ dataInfo.deptName }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="验收时间">
|
||||||
|
<span>{{ parseTime(dataInfo.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="验收结果" prop="checkResult">
|
||||||
|
<el-radio
|
||||||
|
v-model="form.checkResult"
|
||||||
|
v-for="dict in dict.type.project_checking_result"
|
||||||
|
:label="dict.value"
|
||||||
|
:key="dict.value"
|
||||||
|
border
|
||||||
|
size="small"
|
||||||
|
>{{ dict.label }}</el-radio
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="审批意见" prop="comment">
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
placeholder="请输入审批意见（200字内）"
|
||||||
|
v-model="form.comment"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<div style="text-align: center">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</el-drawer>
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="showViewer"
|
||||||
|
:on-close="closeViewer"
|
||||||
|
:url-list="previewList"
|
||||||
|
style="z-index: 2050"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
getProjectChecking,
|
||||||
|
updateProjectChecking,
|
||||||
|
} from "@/api/project/projectChecking";
|
||||||
|
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "approveCheckingDrawer",
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
closeCallBack: {
|
||||||
|
type: Function,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
showViewer: false,
|
||||||
|
open: false,
|
||||||
|
isOpen: false,
|
||||||
|
dataInfo: {
|
||||||
|
imageUrls:""
|
||||||
|
},
|
||||||
|
title: "",
|
||||||
|
form: {},
|
||||||
|
rules: {
|
||||||
|
checkResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
|
||||||
|
comment: [
|
||||||
|
{ required: true, message: "请输入审批意见", trigger: "blur" },
|
||||||
|
{ max: 200, message: "审批意见最多200字符", trigger: "blur" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
previewList: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {},
|
||||||
|
mounted() {},
|
||||||
|
methods: {
|
||||||
|
getImageUrl(url) {
|
||||||
|
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
|
||||||
|
},
|
||||||
|
onPreview(urls) {
|
||||||
|
this.previewList = [];
|
||||||
|
urls.split(",").forEach((item) => {
|
||||||
|
this.previewList.push(process.env.VUE_APP_BASE_API + item);
|
||||||
|
});
|
||||||
|
this.showViewer = true;
|
||||||
|
},
|
||||||
|
closeViewer() {
|
||||||
|
this.showViewer = false;
|
||||||
|
},
|
||||||
|
show(options) {
|
||||||
|
this.title = options.typeName;
|
||||||
|
this.isOpen = true;
|
||||||
|
this.form={};
|
||||||
|
this.form.id=options.id;
|
||||||
|
getProjectChecking(options.id)
|
||||||
|
.then((res) => {
|
||||||
|
this.dataInfo = res.data;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
// 结果状态同步到审批状态
|
||||||
|
let msg = "合格";
|
||||||
|
if(this.form.checkResult=="1"){
|
||||||
|
this.form.approveStatus="4";
|
||||||
|
}else{
|
||||||
|
msg = "不合格";
|
||||||
|
this.form.approveStatus="3";
|
||||||
|
}
|
||||||
|
this.$confirm('是否确认审批'+msg+'?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
this.loading=true;
|
||||||
|
updateProjectChecking(this.form).then(res => {
|
||||||
|
this.$modal.msgSuccess("审批成功");
|
||||||
|
this.loading = false;
|
||||||
|
//关闭并刷新列表
|
||||||
|
this.$refs.drawer.closeDrawer();
|
||||||
|
});
|
||||||
|
}).catch(() => {
|
||||||
|
console.log("取消操作");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,223 @@
|
||||||
|
<template>
|
||||||
|
<div class="projectect-attendance-drawer">
|
||||||
|
<el-drawer
|
||||||
|
v-if="isOpen"
|
||||||
|
:visible.sync="isOpen"
|
||||||
|
ref="drawer"
|
||||||
|
direction="rtl"
|
||||||
|
@close="closeCallBack"
|
||||||
|
size="50%"
|
||||||
|
>
|
||||||
|
<template slot="title">
|
||||||
|
<div>{{ title + " 【提交审批】" }}</div>
|
||||||
|
</template>
|
||||||
|
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
|
||||||
|
<el-form-item label="项目名称">
|
||||||
|
{{dataInfo.projectName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="封样图片">
|
||||||
|
<el-image
|
||||||
|
ref="preview"
|
||||||
|
v-for="img in dataInfo.imageUrls.split(',')"
|
||||||
|
:src="getImageUrl(img)"
|
||||||
|
style="width: 120px; height: 120px; margin-right: 15px"
|
||||||
|
@click="onPreview(img)"
|
||||||
|
></el-image>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="封样名称">
|
||||||
|
{{ dataInfo.materialName }}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="使用部位">
|
||||||
|
{{ dataInfo.usePosition }}
|
||||||
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="指定品牌">
|
||||||
|
{{ dataInfo.contractBrand }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="拟用品牌">
|
||||||
|
{{ dataInfo.useBrand }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交用户">
|
||||||
|
{{ dataInfo.createBy }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交单位">
|
||||||
|
{{ dataInfo.deptName }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="封样时间">
|
||||||
|
<span>{{ parseTime(dataInfo.sealDate, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="会签单" v-if="dataInfo.signFiles != null">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-paperclip"
|
||||||
|
@click="handleDownload(dataInfo.signFiles)"
|
||||||
|
>下载会签单</el-button
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="变更单" v-if="dataInfo.alterationFiles != null">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-paperclip"
|
||||||
|
@click="handleDownload(dataInfo.alterationFiles)"
|
||||||
|
>下载变更单</el-button
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="封样结果" prop="materialResult">
|
||||||
|
<el-radio
|
||||||
|
v-model="form.materialResult"
|
||||||
|
v-for="dict in dict.type.project_checking_result"
|
||||||
|
:label="dict.value"
|
||||||
|
:key="dict.value"
|
||||||
|
border
|
||||||
|
size="small"
|
||||||
|
>{{ dict.label }}</el-radio
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="审批意见" prop="comment">
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
placeholder="请输入审批意见（200字内）"
|
||||||
|
v-model="form.comment"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<div style="text-align: center">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</el-drawer>
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="showViewer"
|
||||||
|
:on-close="closeViewer"
|
||||||
|
:url-list="previewList"
|
||||||
|
style="z-index: 2050"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
getMaterialSeal,
|
||||||
|
updateMaterialSeal,
|
||||||
|
} from "@/api/project/materialSeal";
|
||||||
|
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "approveMeasureDrawer",
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
closeCallBack: {
|
||||||
|
type: Function,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
showViewer: false,
|
||||||
|
open: false,
|
||||||
|
isOpen: false,
|
||||||
|
dataInfo: {
|
||||||
|
imageUrls:""
|
||||||
|
},
|
||||||
|
title: "",
|
||||||
|
form: {},
|
||||||
|
rules: {
|
||||||
|
materialResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
|
||||||
|
comment: [
|
||||||
|
{ required: true, message: "请输入审批意见", trigger: "blur" },
|
||||||
|
{ max: 200, message: "审批意见最多200字符", trigger: "blur" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
previewList: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {},
|
||||||
|
mounted() {},
|
||||||
|
methods: {
|
||||||
|
getImageUrl(url) {
|
||||||
|
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
|
||||||
|
},
|
||||||
|
onPreview(urls) {
|
||||||
|
this.previewList = [];
|
||||||
|
urls.split(",").forEach((item) => {
|
||||||
|
this.previewList.push(process.env.VUE_APP_BASE_API + item);
|
||||||
|
});
|
||||||
|
this.showViewer = true;
|
||||||
|
},
|
||||||
|
closeViewer() {
|
||||||
|
this.showViewer = false;
|
||||||
|
},
|
||||||
|
show(options) {
|
||||||
|
this.title = options.typeName;
|
||||||
|
this.isOpen = true;
|
||||||
|
this.form={};
|
||||||
|
this.form.id=options.id;
|
||||||
|
getMaterialSeal(options.id)
|
||||||
|
.then((res) => {
|
||||||
|
this.dataInfo = res.data;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
},
|
||||||
|
/** 下载附件 */
|
||||||
|
handleDownload(val) {
|
||||||
|
let files = val.split(",");
|
||||||
|
files.forEach((item) => {
|
||||||
|
this.$download.resource(item);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
// 结果状态同步到审批状态
|
||||||
|
let msg = "合格";
|
||||||
|
if(this.form.materialResult=="1"){
|
||||||
|
this.form.approveStatus="4";
|
||||||
|
}else{
|
||||||
|
msg = "不合格";
|
||||||
|
this.form.approveStatus="3";
|
||||||
|
}
|
||||||
|
this.$confirm('是否确认审批'+msg+'?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
this.loading=true;
|
||||||
|
updateMaterialSeal(this.form).then(res => {
|
||||||
|
this.$modal.msgSuccess("审批成功");
|
||||||
|
this.loading = false;
|
||||||
|
//关闭并刷新列表
|
||||||
|
this.$refs.drawer.closeDrawer();
|
||||||
|
});
|
||||||
|
}).catch(() => {
|
||||||
|
console.log("取消操作");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,224 @@
|
||||||
|
<template>
|
||||||
|
<div class="projectect-attendance-drawer">
|
||||||
|
<el-drawer
|
||||||
|
v-if="isOpen"
|
||||||
|
:visible.sync="isOpen"
|
||||||
|
ref="drawer"
|
||||||
|
direction="rtl"
|
||||||
|
@close="closeCallBack"
|
||||||
|
size="50%"
|
||||||
|
>
|
||||||
|
<template slot="title">
|
||||||
|
<div>{{ title + " 【提交审批】" }}</div>
|
||||||
|
</template>
|
||||||
|
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
|
||||||
|
<el-form-item label="项目名称">
|
||||||
|
{{dataInfo.projectName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="测量图片">
|
||||||
|
<el-image
|
||||||
|
ref="preview"
|
||||||
|
v-for="img in dataInfo.imageUrls.split(',')"
|
||||||
|
:src="getImageUrl(img)"
|
||||||
|
style="width: 120px; height: 120px; margin-right: 15px"
|
||||||
|
@click="onPreview(img)"
|
||||||
|
></el-image>
|
||||||
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="测量类型">
|
||||||
|
<dict-tag
|
||||||
|
:options="dict.type.project_measure_type"
|
||||||
|
:value="dataInfo.measureType"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="测量内容">
|
||||||
|
<dict-tag
|
||||||
|
:options="dict.type.project_measure_info_type"
|
||||||
|
:value="dataInfo.measureInfo"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="测量部位">
|
||||||
|
{{ dataInfo.measurePosition }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="测量点位">
|
||||||
|
{{ dataInfo.measurePointPosition }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="质量专员">
|
||||||
|
{{ dataInfo.qualityUserName }}
|
||||||
|
<el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="监理专员">
|
||||||
|
{{ dataInfo.superviseUserName }}
|
||||||
|
<el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交用户">
|
||||||
|
{{ dataInfo.createBy }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="提交单位">
|
||||||
|
{{ dataInfo.deptName }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="测量时间">
|
||||||
|
<span>{{ parseTime(dataInfo.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="测量结果" prop="measureResult">
|
||||||
|
<el-radio
|
||||||
|
v-model="form.measureResult"
|
||||||
|
v-for="dict in dict.type.project_checking_result"
|
||||||
|
:label="dict.value"
|
||||||
|
:key="dict.value"
|
||||||
|
border
|
||||||
|
size="small"
|
||||||
|
>{{ dict.label }}</el-radio
|
||||||
|
>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="审批意见" prop="comment">
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
placeholder="请输入审批意见（200字内）"
|
||||||
|
v-model="form.comment"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<div style="text-align: center">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</el-drawer>
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="showViewer"
|
||||||
|
:on-close="closeViewer"
|
||||||
|
:url-list="previewList"
|
||||||
|
style="z-index: 2050"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
getProjectMeasure,
|
||||||
|
updateProjectMeasure,
|
||||||
|
} from "@/api/project/projectMeasure";
|
||||||
|
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "approveMeasureDrawer",
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
closeCallBack: {
|
||||||
|
type: Function,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
showViewer: false,
|
||||||
|
open: false,
|
||||||
|
isOpen: false,
|
||||||
|
dataInfo: {
|
||||||
|
imageUrls:""
|
||||||
|
},
|
||||||
|
title: "",
|
||||||
|
form: {},
|
||||||
|
rules: {
|
||||||
|
measureResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
|
||||||
|
comment: [
|
||||||
|
{ required: true, message: "请输入审批意见", trigger: "blur" },
|
||||||
|
{ max: 200, message: "审批意见最多200字符", trigger: "blur" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
previewList: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {},
|
||||||
|
mounted() {},
|
||||||
|
methods: {
|
||||||
|
getImageUrl(url) {
|
||||||
|
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
|
||||||
|
},
|
||||||
|
onPreview(urls) {
|
||||||
|
this.previewList = [];
|
||||||
|
urls.split(",").forEach((item) => {
|
||||||
|
this.previewList.push(process.env.VUE_APP_BASE_API + item);
|
||||||
|
});
|
||||||
|
this.showViewer = true;
|
||||||
|
},
|
||||||
|
closeViewer() {
|
||||||
|
this.showViewer = false;
|
||||||
|
},
|
||||||
|
show(options) {
|
||||||
|
this.title = options.typeName;
|
||||||
|
this.isOpen = true;
|
||||||
|
this.form={};
|
||||||
|
this.form.id=options.id;
|
||||||
|
getProjectMeasure(options.id)
|
||||||
|
.then((res) => {
|
||||||
|
this.dataInfo = res.data;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
// 结果状态同步到审批状态
|
||||||
|
let msg = "合格";
|
||||||
|
if(this.form.measureResult=="1"){
|
||||||
|
this.form.approveStatus="4";
|
||||||
|
}else{
|
||||||
|
msg = "不合格";
|
||||||
|
this.form.approveStatus="3";
|
||||||
|
}
|
||||||
|
this.$confirm('是否确认审批'+msg+'?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
this.loading=true;
|
||||||
|
updateProjectMeasure(this.form).then(res => {
|
||||||
|
this.$modal.msgSuccess("审批成功");
|
||||||
|
this.loading = false;
|
||||||
|
//关闭并刷新列表
|
||||||
|
this.$refs.drawer.closeDrawer();
|
||||||
|
});
|
||||||
|
}).catch(() => {
|
||||||
|
console.log("取消操作");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,330 @@
|
||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form
|
||||||
|
:model="queryParams"
|
||||||
|
ref="queryForm"
|
||||||
|
size="small"
|
||||||
|
:inline="true"
|
||||||
|
v-show="showSearch"
|
||||||
|
label-width="68px"
|
||||||
|
>
|
||||||
|
<el-form-item label="所属项目" prop="businessKey" v-if="showPro">
|
||||||
|
<el-select
|
||||||
|
v-model="queryParams.businessKey"
|
||||||
|
placeholder="请选择所属项目"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in projectOptions"
|
||||||
|
:key="index"
|
||||||
|
:label="item.projectName"
|
||||||
|
:value="item.id"
|
||||||
|
>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="单位名称" prop="deptName">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.deptName"
|
||||||
|
placeholder="请输入单位名称"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="审批类型" prop="category">
|
||||||
|
<el-select v-model="queryParams.category" placeholder="请选择审批类型" clearable>
|
||||||
|
<el-option
|
||||||
|
v-for="dict in dict.type.project_approve_type"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="提交人" prop="createBy">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.createBy"
|
||||||
|
placeholder="请输入提交人/电话"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="提交时间">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="daterangeTime"
|
||||||
|
style="width: 240px"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
></el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<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-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||||
|
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
|
||||||
|
<el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
|
||||||
|
<el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane
|
||||||
|
></el-tabs>
|
||||||
|
<el-table
|
||||||
|
v-loading="loading"
|
||||||
|
:data="auditInfoList"
|
||||||
|
border stripe
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
label="项目名称"
|
||||||
|
align="center"
|
||||||
|
prop="projectName"
|
||||||
|
fixed="left"
|
||||||
|
width="250"
|
||||||
|
show-overflow-tooltip
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="审批类型"
|
||||||
|
align="center"
|
||||||
|
prop="typeName"
|
||||||
|
width="250"
|
||||||
|
show-overflow-tooltip
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="提交人"
|
||||||
|
align="center"
|
||||||
|
prop="nick_name"
|
||||||
|
width="250"
|
||||||
|
show-overflow-tooltip
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="提交单位"
|
||||||
|
align="center"
|
||||||
|
prop="dept_name"
|
||||||
|
width="250"
|
||||||
|
show-overflow-tooltip
|
||||||
|
/>
|
||||||
|
<el-table-column label="提交时间" align="center" prop="create_time" width="180">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ parseTime(scope.row.create_time, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="审批状态" align="center" prop="approve_status">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approve_status" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="操作"
|
||||||
|
align="center"
|
||||||
|
fixed="right"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
|
width="200"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button
|
||||||
|
v-if="scope.row.approve_status == 1"
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-edit-outline"
|
||||||
|
@click="handleApprove(scope.row)"
|
||||||
|
v-hasPermi="['project:projectAuditinfo:edit']"
|
||||||
|
>处理</el-button
|
||||||
|
>
|
||||||
|
<el-button
|
||||||
|
v-if="scope.row.approve_status != null"
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-tickets"
|
||||||
|
@click="handleAuditinfo(scope.row)"
|
||||||
|
>流程日志</el-button
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total > 0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNum"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<indexDrawer ref="indexDrawer"/>
|
||||||
|
<approveMeasureDrawer ref="approveMeasureDrawer" :closeCallBack="getList"/>
|
||||||
|
<approveCheckingDrawer ref="approveCheckingDrawer" :closeCallBack="getList"/>
|
||||||
|
<approveMaterialSealDrawer ref="approveMaterialSealDrawer" :closeCallBack="getList"/>
|
||||||
|
<approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList"/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
listProjectAuditinfo,
|
||||||
|
findAuditCount,
|
||||||
|
} from "@/api/project/projectAuditinfo";
|
||||||
|
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
|
||||||
|
import approveMeasureDrawer from "./approveMeasureDrawer.vue";
|
||||||
|
import approveCheckDetectionDrawer from "./approveCheckDetectionDrawer.vue";
|
||||||
|
import approveCheckingDrawer from "./approveCheckingDrawer.vue";
|
||||||
|
import approveMaterialSealDrawer from "./approveMaterialSealDrawer.vue";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "projectAuditinfo",
|
||||||
|
components: {
|
||||||
|
indexDrawer,
|
||||||
|
approveMeasureDrawer,
|
||||||
|
approveCheckingDrawer,
|
||||||
|
approveMaterialSealDrawer,
|
||||||
|
approveCheckDetectionDrawer
|
||||||
|
},
|
||||||
|
dicts: ["project_approve_type","project_check_status"],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
// 显示搜索条件
|
||||||
|
showSearch: true,
|
||||||
|
// 总条数
|
||||||
|
total: 0,
|
||||||
|
// 表格数据
|
||||||
|
auditInfoList: [],
|
||||||
|
// 时间范围
|
||||||
|
daterangeTime: [],
|
||||||
|
// 查询参数
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
projectId: null,
|
||||||
|
projectName: null,
|
||||||
|
deptId: null,
|
||||||
|
deptName: null,
|
||||||
|
checkType: null,
|
||||||
|
materialName: null,
|
||||||
|
usePosition: null,
|
||||||
|
sampleNum: null,
|
||||||
|
sampleUserName: null,
|
||||||
|
witnessUserName: null,
|
||||||
|
laboratoryName: null,
|
||||||
|
checkTime: null,
|
||||||
|
checkState: null,
|
||||||
|
detectionResult: null,
|
||||||
|
activeName: "await"
|
||||||
|
},
|
||||||
|
activeName: "await",
|
||||||
|
// 表单参数
|
||||||
|
form: {},
|
||||||
|
// 表单校验
|
||||||
|
rules: {},
|
||||||
|
showPro:false,
|
||||||
|
projectOptions:[],
|
||||||
|
tabs: {
|
||||||
|
all: "全部数据（0）",
|
||||||
|
await: "待审批（0）",
|
||||||
|
finished: "已审批（0）",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.queryParams.activeName = this.activeName;
|
||||||
|
this.getList();
|
||||||
|
this.initMyProject();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
// 页签点击
|
||||||
|
handleClick() {
|
||||||
|
this.queryParams.activeName = this.activeName;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
/** 查询材料取样复试列表 */
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
this.queryParams.params = {};
|
||||||
|
if (null != this.daterangeTime && "" != this.daterangeTime) {
|
||||||
|
this.queryParams.params["beginDate"] = this.daterangeTime[0];
|
||||||
|
this.queryParams.params["endDate"] = this.daterangeTime[1];
|
||||||
|
}
|
||||||
|
this.queryCount(this.queryParams);
|
||||||
|
//重新刷新代办任务
|
||||||
|
this.$store.dispatch('settingAwaitNum');
|
||||||
|
listProjectAuditinfo(this.queryParams).then((response) => {
|
||||||
|
this.auditInfoList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
queryCount(query) {
|
||||||
|
findAuditCount(query).then((response) => {
|
||||||
|
if (response && response.data) {
|
||||||
|
this.tabs.await = "送检中（" + response.data.await + "）";
|
||||||
|
this.tabs.finished = "已完成（" + response.data.finished + "）";
|
||||||
|
this.tabs.all = "全部数据（" + (response.data.await + response.data.finished) + "）";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 查询和我相关的项目信息
|
||||||
|
initMyProject() {
|
||||||
|
// 获取项目列表的接口
|
||||||
|
this.$api.publics.getMyProjectList({}).then((response) => {
|
||||||
|
this.projectOptions = response.rows;
|
||||||
|
if (response.rows.length > 1) {
|
||||||
|
this.showPro = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 处理
|
||||||
|
handleApprove(row){
|
||||||
|
if(row.type=="1"){
|
||||||
|
this.$refs.approveCheckDetectionDrawer.show(row);
|
||||||
|
}else if(row.type=="2"){
|
||||||
|
this.$refs.approveMeasureDrawer.show(row);
|
||||||
|
}else if(row.type=="3"){
|
||||||
|
this.$refs.approveCheckingDrawer.show(row);
|
||||||
|
}else if(row.type=="4"){
|
||||||
|
this.$refs.approveMaterialSealDrawer.show(row);
|
||||||
|
}else{
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {},
|
||||||
|
// 表单重置
|
||||||
|
reset() {},
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
handleQuery() {
|
||||||
|
this.queryParams.pageNum = 1;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
resetQuery() {
|
||||||
|
this.daterangeTime = [];
|
||||||
|
this.resetForm("queryForm");
|
||||||
|
this.handleQuery();
|
||||||
|
},
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
handleAdd() {},
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
handleUpdate(row) {},
|
||||||
|
/** 登记结果按钮操作 */
|
||||||
|
handleUpdateResult(row) {},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {},
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
handleDelete(row) {},
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
handleExport() {},
|
||||||
|
/** 流程日志 */
|
||||||
|
handleAuditinfo(row) {
|
||||||
|
row.title=row.typeName;
|
||||||
|
row.logType=row.type;
|
||||||
|
this.$refs.indexDrawer.show(row);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
@ -100,6 +100,7 @@
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="审批状态" prop="approveStatus">
|
<el-form-item label="审批状态" prop="approveStatus">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.approveStatus"
|
v-model="queryParams.approveStatus"
|
||||||
|
|
@ -114,7 +115,6 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
||||||
>搜索</el-button
|
>搜索</el-button
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,129 @@
|
||||||
|
package com.yanzhu.jh.project.controller;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.ruoyi.system.domain.FlowTaskEntity;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PutMapping;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import com.ruoyi.common.annotation.Log;
|
||||||
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.enums.BusinessType;
|
||||||
|
import com.yanzhu.jh.project.domain.SurProjectAuditinfo;
|
||||||
|
import com.yanzhu.jh.project.service.ISurProjectAuditinfoService;
|
||||||
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 项目审核信息Controller
|
||||||
|
*
|
||||||
|
* @author JiangYuQi
|
||||||
|
* @date 2023-09-20
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/project/projectAuditinfo")
|
||||||
|
public class SurProjectAuditinfoController extends BaseController
|
||||||
|
{
|
||||||
|
@Autowired
|
||||||
|
private ISurProjectAuditinfoService surProjectAuditinfoService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询项目审核信息列表
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:list')")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(SurProjectAuditinfo surProjectAuditinfo)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
List<SurProjectAuditinfo> list = surProjectAuditinfoService.selectSurProjectAuditinfoList(surProjectAuditinfo);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询项目审核信息列表
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:list')")
|
||||||
|
@GetMapping("/findList")
|
||||||
|
public TableDataInfo findList(FlowTaskEntity flowTaskEntity)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
flowTaskEntity.setAssigneeName(getUsername());
|
||||||
|
return getDataTable(surProjectAuditinfoService.selectMyAwaitFlowTask(flowTaskEntity));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统计审核信息
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:list')")
|
||||||
|
@GetMapping("/findAuditCount")
|
||||||
|
public AjaxResult findAuditCount(FlowTaskEntity flowTaskEntity)
|
||||||
|
{
|
||||||
|
flowTaskEntity.setAssigneeName(getUsername());
|
||||||
|
return success(surProjectAuditinfoService.queryCount(flowTaskEntity));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出项目审核信息列表
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:export')")
|
||||||
|
@Log(title = "项目审核信息", businessType = BusinessType.EXPORT)
|
||||||
|
@PostMapping("/export")
|
||||||
|
public void export(HttpServletResponse response, SurProjectAuditinfo surProjectAuditinfo)
|
||||||
|
{
|
||||||
|
List<SurProjectAuditinfo> list = surProjectAuditinfoService.selectSurProjectAuditinfoList(surProjectAuditinfo);
|
||||||
|
ExcelUtil<SurProjectAuditinfo> util = new ExcelUtil<SurProjectAuditinfo>(SurProjectAuditinfo.class);
|
||||||
|
util.exportExcel(response, list, "项目审核信息数据");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取项目审核信息详细信息
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:query')")
|
||||||
|
@GetMapping(value = "/{id}")
|
||||||
|
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||||
|
{
|
||||||
|
return success(surProjectAuditinfoService.selectSurProjectAuditinfoById(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增项目审核信息
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:add')")
|
||||||
|
@Log(title = "项目审核信息", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping
|
||||||
|
public AjaxResult add(@RequestBody SurProjectAuditinfo surProjectAuditinfo)
|
||||||
|
{
|
||||||
|
return toAjax(surProjectAuditinfoService.insertSurProjectAuditinfo(surProjectAuditinfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改项目审核信息
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:edit')")
|
||||||
|
@Log(title = "项目审核信息", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping
|
||||||
|
public AjaxResult edit(@RequestBody SurProjectAuditinfo surProjectAuditinfo)
|
||||||
|
{
|
||||||
|
return toAjax(surProjectAuditinfoService.updateSurProjectAuditinfo(surProjectAuditinfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除项目审核信息
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('project:projectAuditinfo:remove')")
|
||||||
|
@Log(title = "项目审核信息", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/{ids}")
|
||||||
|
public AjaxResult remove(@PathVariable Long[] ids)
|
||||||
|
{
|
||||||
|
return toAjax(surProjectAuditinfoService.deleteSurProjectAuditinfoByIds(ids));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,6 +3,7 @@ package com.yanzhu.jh.project.mapper;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.ruoyi.system.domain.FlowTaskEntity;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectAuditinfo;
|
import com.yanzhu.jh.project.domain.SurProjectAuditinfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -70,4 +71,12 @@ public interface SurProjectAuditinfoMapper
|
||||||
public int deleteSurProjectAuditinfoByIds(Long[] ids);
|
public int deleteSurProjectAuditinfoByIds(Long[] ids);
|
||||||
|
|
||||||
public int batch(List<SurProjectAuditinfo> surProjectAuditinfoList);
|
public int batch(List<SurProjectAuditinfo> surProjectAuditinfoList);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询我的代办
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public List<Map<String,Object>> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.yanzhu.jh.project.service;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.ruoyi.system.domain.FlowTaskEntity;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectAuditinfo;
|
import com.yanzhu.jh.project.domain.SurProjectAuditinfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,4 +70,27 @@ public interface ISurProjectAuditinfoService
|
||||||
*/
|
*/
|
||||||
public int deleteSurProjectAuditinfoById(Long id);
|
public int deleteSurProjectAuditinfoById(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询我的代办
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public Map<String,Object> findMyTask(FlowTaskEntity flowTaskEntity);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询我的审批
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public List<Map<String,Object>> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统计我的审批
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public Map<String,Object> queryCount(FlowTaskEntity flowTaskEntity);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,14 @@
|
||||||
package com.yanzhu.jh.project.service.impl;
|
package com.yanzhu.jh.project.service.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.ruoyi.common.enums.PublicStateEnum;
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
|
import com.ruoyi.system.domain.FlowTaskEntity;
|
||||||
|
import com.ruoyi.system.mapper.FlowBusinessKeyMapper;
|
||||||
import com.yanzhu.jh.project.domain.*;
|
import com.yanzhu.jh.project.domain.*;
|
||||||
import com.yanzhu.jh.project.mapper.*;
|
import com.yanzhu.jh.project.mapper.*;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -24,11 +28,14 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
|
||||||
private SurProjectAuditinfoMapper surProjectAuditinfoMapper;
|
private SurProjectAuditinfoMapper surProjectAuditinfoMapper;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper;
|
private FlowBusinessKeyMapper flowBusinessKeyMapper;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SurProjectCheckingMapper surProjectCheckingMapper;
|
private SurProjectCheckingMapper surProjectCheckingMapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SurProjectMaterialSealMapper surProjectMaterialSealMapper;
|
private SurProjectMaterialSealMapper surProjectMaterialSealMapper;
|
||||||
|
|
||||||
|
|
@ -121,4 +128,121 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
|
||||||
return surProjectAuditinfoMapper.deleteSurProjectAuditinfoById(id);
|
return surProjectAuditinfoMapper.deleteSurProjectAuditinfoById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询我的代办
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public Map<String,Object> findMyTask(FlowTaskEntity flowTaskEntity) {
|
||||||
|
Map<String,Object> dataMap = new HashMap<>();
|
||||||
|
List<Map<String, Object>> todoList = flowBusinessKeyMapper.selectMyAwaitFlowTask(flowTaskEntity);
|
||||||
|
if(todoList!=null){
|
||||||
|
dataMap.put("todo",todoList.size());
|
||||||
|
}else{
|
||||||
|
dataMap.put("todo",0);
|
||||||
|
}
|
||||||
|
List<Map<String, Object>> approveList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
|
||||||
|
if(approveList!=null){
|
||||||
|
dataMap.put("approve",approveList.size());
|
||||||
|
}else{
|
||||||
|
dataMap.put("approve",0);
|
||||||
|
}
|
||||||
|
return dataMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询我的审批
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public List<Map<String,Object>> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity) {
|
||||||
|
return surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统计我的审批
|
||||||
|
*
|
||||||
|
* @param flowTaskEntity 查询条件
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public Map<String,Object> queryCount(FlowTaskEntity flowTaskEntity) {
|
||||||
|
Map<String,Object> dataMap = new HashMap<>();
|
||||||
|
flowTaskEntity.setActiveName("await");
|
||||||
|
List<Map<String, Object>> awaitList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
|
||||||
|
if(awaitList!=null){
|
||||||
|
dataMap.put("await",awaitList.size());
|
||||||
|
}else{
|
||||||
|
dataMap.put("await",0);
|
||||||
|
}
|
||||||
|
flowTaskEntity.setActiveName("finished");
|
||||||
|
List<Map<String, Object>> finishedList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity);
|
||||||
|
if(finishedList!=null){
|
||||||
|
dataMap.put("finished",finishedList.size());
|
||||||
|
}else{
|
||||||
|
dataMap.put("finished",0);
|
||||||
|
}
|
||||||
|
return dataMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void init(){
|
||||||
|
List<SurProjectAuditinfo> list = new ArrayList<>();
|
||||||
|
List<SurProjectCheckDetection> surProjectCheckDetectionList = surProjectCheckDetectionMapper.selectSurProjectCheckDetectionList(new SurProjectCheckDetection());
|
||||||
|
List<SurProjectChecking> surProjectCheckingList = surProjectCheckingMapper.selectSurProjectCheckingList(new SurProjectChecking());
|
||||||
|
List<SurProjectMaterialSeal> surProjectMaterialSealList = surProjectMaterialSealMapper.selectSurProjectMaterialSealList(new SurProjectMaterialSeal());
|
||||||
|
List<SurProjectMeasure> surProjectMeasureList = surProjectMeasureMapper.selectSurProjectMeasureList(new SurProjectMeasure());
|
||||||
|
if(surProjectCheckDetectionList!=null && surProjectCheckDetectionList.size()>0){
|
||||||
|
for(SurProjectCheckDetection surProjectCheckDetection:surProjectCheckDetectionList){
|
||||||
|
SurProjectAuditinfo a = new SurProjectAuditinfo();
|
||||||
|
a.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode());
|
||||||
|
a.setFromId(surProjectCheckDetection.getId());
|
||||||
|
a.setApproveStatus("1");
|
||||||
|
a.setComment("提交申请");
|
||||||
|
a.setCreateBy(surProjectCheckDetection.getCreateBy());
|
||||||
|
a.setCreateTime(surProjectCheckDetection.getCreateTime());
|
||||||
|
list.add(a);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(surProjectCheckingList!=null && surProjectCheckingList.size()>0){
|
||||||
|
for(SurProjectChecking surProjectChecking:surProjectCheckingList){
|
||||||
|
SurProjectAuditinfo a = new SurProjectAuditinfo();
|
||||||
|
a.setFromType(PublicStateEnum.AUDIT_TYPE_JPYS.getCode());
|
||||||
|
a.setFromId(surProjectChecking.getId());
|
||||||
|
a.setApproveStatus("1");
|
||||||
|
a.setComment("提交申请");
|
||||||
|
a.setCreateBy(surProjectChecking.getCreateBy());
|
||||||
|
a.setCreateTime(surProjectChecking.getCreateTime());
|
||||||
|
list.add(a);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(surProjectMaterialSealList!=null && surProjectMaterialSealList.size()>0){
|
||||||
|
for(SurProjectMaterialSeal surProjectMaterialSeal:surProjectMaterialSealList){
|
||||||
|
SurProjectAuditinfo a = new SurProjectAuditinfo();
|
||||||
|
a.setFromType(PublicStateEnum.AUDIT_TYPE_CLFY.getCode());
|
||||||
|
a.setFromId(surProjectMaterialSeal.getId());
|
||||||
|
a.setApproveStatus("1");
|
||||||
|
a.setComment("提交申请");
|
||||||
|
a.setCreateBy(surProjectMaterialSeal.getCreateBy());
|
||||||
|
a.setCreateTime(surProjectMaterialSeal.getCreateTime());
|
||||||
|
list.add(a);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(surProjectMeasureList!=null && surProjectMeasureList.size()>0){
|
||||||
|
for(SurProjectMeasure surProjectMeasure:surProjectMeasureList){
|
||||||
|
SurProjectAuditinfo a = new SurProjectAuditinfo();
|
||||||
|
a.setFromType(PublicStateEnum.AUDIT_TYPE_SCSL.getCode());
|
||||||
|
a.setFromId(surProjectMeasure.getId());
|
||||||
|
a.setApproveStatus("1");
|
||||||
|
a.setComment("提交申请");
|
||||||
|
a.setCreateBy(surProjectMeasure.getCreateBy());
|
||||||
|
a.setCreateTime(surProjectMeasure.getCreateTime());
|
||||||
|
list.add(a);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
surProjectAuditinfoMapper.batch(list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ import com.yanzhu.jh.project.mapper.SurProjectCheckDetectionMapper;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
|
import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
|
||||||
import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService;
|
import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 材料送检Service业务层处理
|
* 材料送检Service业务层处理
|
||||||
*
|
*
|
||||||
|
|
@ -62,6 +64,7 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
|
public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
|
||||||
{
|
{
|
||||||
surProjectCheckDetection.setCheckState(PublicStateEnum.CHECK_STATE_SJ.getCode());
|
surProjectCheckDetection.setCheckState(PublicStateEnum.CHECK_STATE_SJ.getCode());
|
||||||
|
|
@ -80,6 +83,7 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
|
public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
|
||||||
{
|
{
|
||||||
if(surProjectCheckDetection.getUpdateBy()==null){
|
if(surProjectCheckDetection.getUpdateBy()==null){
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ import com.yanzhu.jh.project.mapper.SurProjectCheckingMapper;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectChecking;
|
import com.yanzhu.jh.project.domain.SurProjectChecking;
|
||||||
import com.yanzhu.jh.project.service.ISurProjectCheckingService;
|
import com.yanzhu.jh.project.service.ISurProjectCheckingService;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目验收Service业务层处理
|
* 项目验收Service业务层处理
|
||||||
*
|
*
|
||||||
|
|
@ -102,6 +104,7 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int insertSurProjectChecking(SurProjectChecking surProjectChecking)
|
public int insertSurProjectChecking(SurProjectChecking surProjectChecking)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -136,9 +139,12 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int updateSurProjectChecking(SurProjectChecking surProjectChecking)
|
public int updateSurProjectChecking(SurProjectChecking surProjectChecking)
|
||||||
{
|
{
|
||||||
|
if(surProjectChecking.getImageUrls()!=null){
|
||||||
surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]);
|
surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]);
|
||||||
|
}
|
||||||
if(surProjectChecking.getUpdateBy()==null){
|
if(surProjectChecking.getUpdateBy()==null){
|
||||||
surProjectChecking.setUpdateBy(SecurityUtils.getUsername());
|
surProjectChecking.setUpdateBy(SecurityUtils.getUsername());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,8 @@ import com.yanzhu.jh.project.mapper.SurProjectMaterialSealMapper;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectMaterialSeal;
|
import com.yanzhu.jh.project.domain.SurProjectMaterialSeal;
|
||||||
import com.yanzhu.jh.project.service.ISurProjectMaterialSealService;
|
import com.yanzhu.jh.project.service.ISurProjectMaterialSealService;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 材料封样Service业务层处理
|
* 材料封样Service业务层处理
|
||||||
*
|
*
|
||||||
|
|
@ -62,6 +64,7 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int insertSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal)
|
public int insertSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal)
|
||||||
{
|
{
|
||||||
if(surProjectMaterialSeal.getCreateBy()==null){
|
if(surProjectMaterialSeal.getCreateBy()==null){
|
||||||
|
|
@ -95,12 +98,15 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int updateSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal)
|
public int updateSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal)
|
||||||
{
|
{
|
||||||
if(surProjectMaterialSeal.getUpdateBy()==null){
|
if(surProjectMaterialSeal.getUpdateBy()==null){
|
||||||
surProjectMaterialSeal.setUpdateBy(SecurityUtils.getUsername());
|
surProjectMaterialSeal.setUpdateBy(SecurityUtils.getUsername());
|
||||||
}
|
}
|
||||||
|
if(surProjectMaterialSeal.getImageUrls()!=null){
|
||||||
surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]);
|
surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]);
|
||||||
|
}
|
||||||
surProjectMaterialSeal.setUpdateTime(DateUtils.getNowDate());
|
surProjectMaterialSeal.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
|
||||||
//操作日志
|
//操作日志
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,8 @@ import com.yanzhu.jh.project.mapper.SurProjectMeasureMapper;
|
||||||
import com.yanzhu.jh.project.domain.SurProjectMeasure;
|
import com.yanzhu.jh.project.domain.SurProjectMeasure;
|
||||||
import com.yanzhu.jh.project.service.ISurProjectMeasureService;
|
import com.yanzhu.jh.project.service.ISurProjectMeasureService;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 实测实量Service业务层处理
|
* 实测实量Service业务层处理
|
||||||
*
|
*
|
||||||
|
|
@ -61,6 +63,7 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int insertSurProjectMeasure(SurProjectMeasure surProjectMeasure)
|
public int insertSurProjectMeasure(SurProjectMeasure surProjectMeasure)
|
||||||
{
|
{
|
||||||
if(surProjectMeasure.getCreateBy()==null){
|
if(surProjectMeasure.getCreateBy()==null){
|
||||||
|
|
@ -94,13 +97,15 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public int updateSurProjectMeasure(SurProjectMeasure surProjectMeasure)
|
public int updateSurProjectMeasure(SurProjectMeasure surProjectMeasure)
|
||||||
{
|
{
|
||||||
if(surProjectMeasure.getCreateBy()==null){
|
if(surProjectMeasure.getCreateBy()==null){
|
||||||
surProjectMeasure.setUpdateBy(SecurityUtils.getUsername());
|
surProjectMeasure.setUpdateBy(SecurityUtils.getUsername());
|
||||||
}
|
}
|
||||||
|
if(surProjectMeasure.getImageUrls()!=null){
|
||||||
surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]);
|
surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]);
|
||||||
|
}
|
||||||
surProjectMeasure.setUpdateTime(DateUtils.getNowDate());
|
surProjectMeasure.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
|
||||||
//操作日志
|
//操作日志
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import com.ruoyi.common.core.text.Convert;
|
||||||
import com.ruoyi.common.enums.PublicStateEnum;
|
import com.ruoyi.common.enums.PublicStateEnum;
|
||||||
import com.ruoyi.common.enums.SysRoleEnum;
|
import com.ruoyi.common.enums.SysRoleEnum;
|
||||||
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
import com.ruoyi.system.domain.FlowTaskEntity;
|
||||||
import com.ruoyi.system.service.ISysDeptService;
|
import com.ruoyi.system.service.ISysDeptService;
|
||||||
import com.ruoyi.system.service.ISysUserService;
|
import com.ruoyi.system.service.ISysUserService;
|
||||||
import com.yanzhu.jh.project.domain.SurProject;
|
import com.yanzhu.jh.project.domain.SurProject;
|
||||||
|
|
@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 公共服务Controller
|
* 公共服务Controller
|
||||||
|
|
@ -166,4 +169,24 @@ PublicsController extends BaseController {
|
||||||
{
|
{
|
||||||
return success(surProjectAuditinfoService.selectProjectAuditinfoList(surProjectAuditinfo));
|
return success(surProjectAuditinfoService.selectProjectAuditinfoList(surProjectAuditinfo));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询代办任务
|
||||||
|
*/
|
||||||
|
@GetMapping("/findTask")
|
||||||
|
public AjaxResult findTask()
|
||||||
|
{
|
||||||
|
FlowTaskEntity flowTaskEntity = new FlowTaskEntity();
|
||||||
|
flowTaskEntity.setNowRole(Convert.toStr(getUserFirstRole()));
|
||||||
|
if(SysRoleEnum.ZGS.getCode().equals(flowTaskEntity.getNowRole())){
|
||||||
|
flowTaskEntity.setNowDept(Convert.toStr(deptService.getZGSDeptId(getDeptId())));
|
||||||
|
}else{
|
||||||
|
flowTaskEntity.setNowDept(Convert.toStr(getDeptId()));
|
||||||
|
}
|
||||||
|
flowTaskEntity.setNowUser(Convert.toStr(SecurityUtils.getUserId()));
|
||||||
|
flowTaskEntity.setRoleIds(SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList()));
|
||||||
|
flowTaskEntity.setAssigneeName(getUsername());
|
||||||
|
flowTaskEntity.setActiveName("await");
|
||||||
|
return success(surProjectAuditinfoService.findMyTask(flowTaskEntity));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
order by pa.create_time desc
|
order by pa.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectMyAwaitFlowTask" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="map">
|
||||||
|
select a.id,sp.id as projectId,sp.projectName,a.approve_status,a.type,a.typeName,u.nick_name,d.dept_name,a.create_time,a.witness_user
|
||||||
|
from vw_project_audit_all a
|
||||||
|
left join sur_project sp on sp.id = a.project_id
|
||||||
|
left JOIN sys_user u on a.create_by = u.user_name
|
||||||
|
left JOIN sys_dept d on d.dept_id = u.dept_id
|
||||||
|
where a.witness_user like concat('%', #{assigneeName}, '%')
|
||||||
|
<if test='activeName == "await"'> and a.approve_status='1'</if>
|
||||||
|
<if test='activeName == "finished"'> and a.approve_status in ('3','4')</if>
|
||||||
|
<if test="businessKey != null and businessKey != ''"> and sp.id = #{businessKey}</if>
|
||||||
|
<if test="businessKeyName != null and businessKeyName != ''"> and sp.projectName like concat('%', #{businessKeyName}, '%')</if>
|
||||||
|
<if test="startDeptName != null and startDeptName != ''"> and d.dept_name like concat('%', #{startDeptName}, '%')</if>
|
||||||
|
<if test="startUserName != null and startUserName != ''"> and (u.nick_name like concat('%', #{startUserName}, '%') or u.user_name like concat('%', #{startUserName}, '%'))</if>
|
||||||
|
<if test="category != null and category != ''"> and a.type = #{category}</if>
|
||||||
|
<if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and a.create_time between #{params.beginDate} and #{params.endDate}</if>
|
||||||
|
order by a.create_time desc
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="selectSurProjectAuditinfoById" parameterType="Long" resultMap="SurProjectAuditinfoResult">
|
<select id="selectSurProjectAuditinfoById" parameterType="Long" resultMap="SurProjectAuditinfoResult">
|
||||||
<include refid="selectSurProjectAuditinfoVo"/>
|
<include refid="selectSurProjectAuditinfoVo"/>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
|
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
|
||||||
<where>
|
<where>
|
||||||
and spcd.is_del='0'
|
and spcd.is_del='0'
|
||||||
|
<if test="id != null "> and spcd.id = #{id}</if>
|
||||||
<if test="projectId != null "> and spcd.project_id = #{projectId}</if>
|
<if test="projectId != null "> and spcd.project_id = #{projectId}</if>
|
||||||
<if test="deptId != null "> and spcd.dept_id = #{deptId}</if>
|
<if test="deptId != null "> and spcd.dept_id = #{deptId}</if>
|
||||||
<if test="checkType != null and checkType != ''"> and spcd.check_type = #{checkType}</if>
|
<if test="checkType != null and checkType != ''"> and spcd.check_type = #{checkType}</if>
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectSurProjectCheckingVo">
|
<sql id="selectSurProjectCheckingVo">
|
||||||
select id, project_id, dept_id, group_dept_id, check_type, main_image, image_urls, working_position_type, check_working_position, checking_num, check_result, intro, quality_user, quality_user_name, supervise_user, supervise_user_name, group_dept_user, group_dept_user_name, checking_date, checking_files, is_del, create_by, create_time, update_by, update_time, remark, approve_status from sur_project_checking
|
select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name from sur_project_checking spc
|
||||||
|
left join sur_project sp on spc.project_id = sp.id
|
||||||
|
left join sys_dept sd on sd.dept_id = spc.dept_id
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectSurProjectCheckingList" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
|
<select id="selectSurProjectCheckingList" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
|
||||||
|
|
@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
|
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
|
||||||
<where>
|
<where>
|
||||||
and spc.is_del=0
|
and spc.is_del=0
|
||||||
|
<if test="id != null "> and spc.id = #{id}</if>
|
||||||
<if test="projectId != null "> and spc.project_id = #{projectId}</if>
|
<if test="projectId != null "> and spc.project_id = #{projectId}</if>
|
||||||
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
|
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
|
||||||
<if test="deptId != null ">
|
<if test="deptId != null ">
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||||
<if test="remark != null">remark = #{remark},</if>
|
<if test="remark != null">remark = #{remark},</if>
|
||||||
<if test="approveStatus != null">approveStatus = #{approveStatus},</if>
|
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue