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

优化项目审批

dev_xds
姜玉琦 2023-09-23 11:30:10 +08:00
parent a485269f95
commit b70e4662d3
28 changed files with 454 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/api/project/checkDetection.js
View File

@ -52,9 +52,9 @@ export function delCheckDetection(id) {
}
//材料取样复试统计
export function findCheckDetectionCount(query) {
export function findGroupCountByApprove(query) {
return request({
url: '/project/checkDetection/findCheckDetectionCount',
url: '/project/checkDetection/findGroupCountByApprove',
method: 'get',
params: query
})

9
ruoyi-ui/src/api/project/materialSeal.js
View File

@ -9,6 +9,15 @@ export function listMaterialSeal(query) {
})
}
// 统计材料封样
export function findGroupCountByApprove(query) {
return request({
url: '/project/materialSeal/findGroupCountByApprove',
method: 'get',
params: query
})
}
// 查询材料封样详细
export function getMaterialSeal(id) {
return request({

9
ruoyi-ui/src/api/project/projectChecking.js
View File

@ -9,6 +9,15 @@ export function listProjectChecking(query) {
})
}
// 统计项目验收
export function findGroupCountByApprove(query) {
return request({
url: '/project/projectChecking/findGroupCountByApprove',
method: 'get',
params: query
})
}
// 查询项目验收详细
export function getProjectChecking(id) {
return request({

9
ruoyi-ui/src/api/project/projectMeasure.js
View File

@ -9,6 +9,15 @@ export function listProjectMeasure(query) {
})
}
// 统计实测实量
export function findGroupCountByApprove(query) {
return request({
url: '/project/projectMeasure/findGroupCountByApprove',
method: 'get',
params: query
})
}
// 查询实测实量详细
export function getProjectMeasure(id) {
return request({

44
ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
View File

@ -68,12 +68,12 @@
></right-toolbar>
</el-row>
<el-tabs
v-model="activeName"
@tab-click="handleClick"
v-model="queryParams.activeName"
@tab-click="getList"
style="margin-left: 25px; margin-right: 25px"
>
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.sjz" name="sjz"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>
<el-table
v-loading="loading"
@ -138,7 +138,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag
:options="dict.type.project_check_status"
@ -150,6 +150,7 @@
label="操作"
align="center"
width="120"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@ -416,7 +417,7 @@ import {
delCheckDetection,
addCheckDetection,
updateCheckDetection,
findCheckDetectionCount,
findGroupCountByApprove,
updateCheckDetectionResult,
} from "@/api/project/checkDetection";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -453,12 +454,11 @@ export default {
pageSize: 20,
projectId: null,
deptId: null,
activeName: null,
activeName: "jxz",
},
// 表单参数
form: {},
resultform: {},
activeName: "sjz",
// 表单校验
rules: {
checkType: [{ required: true, message: "请选择送检类型", trigger: "blur" }],
@ -497,7 +497,7 @@ export default {
deptUserData: [],
tabs: {
all: "全部数据（0）",
sjz: "送检中（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
checkDetectionList:[],
@ -531,7 +531,7 @@ export default {
this.onOpen = true;
this.queryParams.projectId = project.id;
this.tabs.all="全部数据（0）";
this.tabs.sjz="送检中（0）";
this.tabs.jxz="进行中（0）";
this.tabs.ywc="已完成（0）";
this.$api.publics
.queryUnitList({
@ -552,28 +552,19 @@ export default {
getList() {
this.loading = true;
this.queryParams.deptId = this.unitActiveName;
this.queryParams.activeName = this.activeName;
this.queryCount(this.queryParams);
this.queryCount();
listCheckDetection(this.queryParams).then((response) => {
this.checkDetectionList = response.rows;
this.total = response.total;
this.loading = false;
});
},
queryCount(query) {
findCheckDetectionCount(query).then((response) => {
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
let check1 = 0;
let check2 = 0;
if (response.data.check1) {
check1 += response.data.check1;
}
if (response.data.check2) {
check2 += response.data.check2;
}
this.tabs.sjz = "送检中（" + check1 + "）";
this.tabs.ywc = "已完成（" + check2 + "）";
this.tabs.all = "全部数据（" + (check1 + check2) + "）";
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
@ -635,11 +626,6 @@ export default {
this.resultopen = false;
this.reset();
},
// 页签点击
handleClick() {
this.queryParams.activeName = this.activeName;
this.getList();
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();

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

@ -48,19 +48,13 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="审批状态" prop="approveStatus">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
<el-form-item label="材料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入材料名称"
clearable
>
<el-option
v-for="dict in dict.type.project_check_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="送检时间">
<el-date-picker
@ -73,13 +67,19 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="材料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入材料名称"
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
clearable
@keyup.enter.native="handleQuery"
/>
>
<el-option
v-for="dict in dict.type.project_check_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="使用部位" prop="usePosition">
<el-input
@ -162,9 +162,9 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.sjz" name="sjz"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
@ -256,7 +256,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag
:options="dict.type.project_check_status"
@ -542,7 +542,7 @@ import {
delCheckDetection,
addCheckDetection,
updateCheckDetection,
findCheckDetectionCount,
findGroupCountByApprove,
updateCheckDetectionResult,
} from "@/api/project/checkDetection";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -594,10 +594,9 @@ export default {
checkTime: null,
checkState: null,
detectionResult: null,
activeName: "sjz",
activeName: "jxz",
approveStatus:null,
},
activeName: "sjz",
// 表单参数
form: {},
// 结果表单参数
@ -640,7 +639,7 @@ export default {
deptUserData: [],
tabs: {
all: "全部数据（0）",
sjz: "送检中（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
};
@ -660,11 +659,6 @@ export default {
}
this.resultform.detectionFile = fileUrls;
},
// 页签点击
handleClick() {
this.queryParams.activeName = this.activeName;
this.getList();
},
/** 查询材料取样复试列表 */
getList() {
this.loading = true;
@ -680,20 +674,12 @@ export default {
this.loading = false;
});
},
queryCount(query) {
findCheckDetectionCount(query).then((response) => {
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
let check1 = 0;
let check2 = 0;
if (response.data.check1) {
check1 += response.data.check1;
}
if (response.data.check2) {
check2 += response.data.check2;
}
this.tabs.sjz = "送检中（" + check1 + "）";
this.tabs.ywc = "已完成（" + check2 + "）";
this.tabs.all = "全部数据（" + (check1 + check2) + "）";
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},

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

@ -81,7 +81,7 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="审批状态" prop="approveStatus">
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
@ -160,7 +160,11 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-tabs v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
v-loading="loading"
:data="materialSealList"
@ -225,6 +229,11 @@
<span>{{ parseTime(scope.row.sealDate, "{y}-{m}-{d} {h}:{i}") }}</span>
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column
label="监理人"
align="center"
@ -242,11 +251,6 @@
<dict-tag :options="dict.type.project_checking_result" :value="scope.row.materialResult" />
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column label="会签单" align="center" prop="signFiles" width="120">
<template slot-scope="scope">
<el-button
@ -435,6 +439,7 @@ import {
delMaterialSeal,
addMaterialSeal,
updateMaterialSeal,
findGroupCountByApprove,
} from "@/api/project/materialSeal";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -487,6 +492,12 @@ export default {
approveStatus:null,
materialResult:null,
witnessUser:null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
// 表单参数
form: {},
@ -584,12 +595,22 @@ export default {
this.queryParams.params["beginSealDate"] = this.daterangeSealDate[0];
this.queryParams.params["endSealDate"] = this.daterangeSealDate[1];
}
this.queryCount();
listMaterialSeal(this.queryParams).then((response) => {
this.materialSealList = response.rows;
this.total = response.total;
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;

60
ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
View File

@ -11,7 +11,7 @@
<div>{{ title + " 【材料封样管理】" }}</div>
</template>
<el-tabs
v-model="activeName"
v-model="unitActiveName"
style="margin-left: 20px; margin-right: 20px"
@tab-click="getList"
>
@ -67,6 +67,15 @@
@queryTable="getList"
></right-toolbar>
</el-row>
<el-tabs
v-model="queryParams.activeName"
@tab-click="getList"
style="margin-left: 25px; margin-right: 25px"
>
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>
</el-tabs>
<el-table
v-loading="loading"
:data="projectMaterialSealList"
@ -126,7 +135,7 @@
<dict-tag :options="dict.type.project_checking_result" :value="scope.row.materialResult" />
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
@ -162,6 +171,7 @@
<el-table-column
label="操作"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@ -312,13 +322,13 @@
</template>
<script>
import { mapGetters } from "vuex";
import {
listMaterialSeal,
getMaterialSeal,
delMaterialSeal,
addMaterialSeal,
updateMaterialSeal,
findGroupCountByApprove,
} from "@/api/project/materialSeal";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -368,7 +378,7 @@ export default {
],
},
projectMaterialSealList: [],
activeName: "",
unitActiveName: "",
// 遮罩层
loading: true,
// 选中数组
@ -387,15 +397,19 @@ export default {
pageSize: 10,
projectId: null,
deptId: null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
deptUserData:[],
previewList: [],
isOnly: false,
};
},
computed: {
...mapGetters(["dept"]),
},
computed: {},
mounted() {},
methods: {
@ -448,19 +462,13 @@ export default {
closeViewer() {
this.showViewer = false;
},
doOk() {
updateProjectDeptWroks(this.form).then((response) => {
this.$modal.msgSuccess("保存成功");
this.isOpen = false;
});
},
doCanel() {
this.isOpen = false;
},
show(project) {
this.project = project;
this.title = project.projectName;
this.isOpen = true;
this.tabs.all="全部数据（0）";
this.tabs.jxz="进行中（0）";
this.tabs.ywc="已完成（0）";
this.queryParams.projectId = project.id;
this.$api.publics
.queryUnitList({
@ -470,7 +478,7 @@ export default {
.then((d) => {
this.nodes = d.rows;
if (d.rows.length > 0) {
this.activeName = this.nodes[0].unitId + "";
this.unitActiveName = this.nodes[0].unitId + "";
this.isUnit = true;
this.getList();
} else {
@ -482,7 +490,8 @@ export default {
},
// 页签点击
getList() {
this.queryParams.deptId = this.activeName;
this.queryParams.deptId = this.unitActiveName;
this.queryCount()
this.loading = true;
listMaterialSeal(this.queryParams).then((response) => {
this.projectMaterialSealList = response.rows;
@ -490,6 +499,15 @@ export default {
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;
@ -539,9 +557,9 @@ export default {
this.reset();
this.form.projectId = this.project.id;
this.form.projectName = this.project.projectName;
this.form.deptId = this.activeName;
this.form.deptId = this.unitActiveName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});
@ -568,7 +586,7 @@ export default {
this.form = response.data;
this.form.projectName = this.project.projectName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});

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

@ -74,7 +74,7 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="审批状态" prop="approveStatus">
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
@ -145,7 +145,11 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-tabs v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
v-loading="loading"
:data="projectCheckingList"
@ -235,7 +239,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
@ -412,6 +416,7 @@ import {
delProjectChecking,
addProjectChecking,
updateProjectChecking,
findGroupCountByApprove,
} from "@/api/project/projectChecking";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -468,6 +473,12 @@ export default {
projectName: null,
deptName: null,
approveStatus:null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
// 表单参数
form: {},
@ -516,12 +527,22 @@ export default {
this.queryParams.params["beginCheckingDate"] = this.daterangeCheckingDate[0];
this.queryParams.params["endCheckingDate"] = this.daterangeCheckingDate[1];
}
this.queryCount();
listProjectChecking(this.queryParams).then((response) => {
this.projectCheckingList = response.rows;
this.total = response.total;
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;

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

@ -11,7 +11,7 @@
<div>{{ title + " 【举牌验收管理】" }}</div>
</template>
<el-tabs
v-model="activeName"
v-model="unitActiveName"
style="margin-left: 20px; margin-right: 20px"
@tab-click="getList"
>
@ -67,6 +67,17 @@
@queryTable="getList"
></right-toolbar>
</el-row>
<el-tabs
v-model="queryParams.activeName"
@tab-click="getList"
style="margin-left: 25px; margin-right: 25px"
>
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>
</el-tabs>
<el-table
v-loading="loading"
:data="projectCheckingList"
@ -140,7 +151,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
@ -148,6 +159,7 @@
<el-table-column
label="操作"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@ -320,6 +332,7 @@ import {
delProjectChecking,
addProjectChecking,
updateProjectChecking,
findGroupCountByApprove,
} from "@/api/project/projectChecking";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -357,7 +370,7 @@ export default {
checkResult: [{ required: false, message: "请选择验收结果", trigger: "blur" }],
},
projectCheckingList: [],
activeName: "",
unitActiveName: "",
// 遮罩层
loading: true,
// 选中数组
@ -376,6 +389,12 @@ export default {
pageSize: 10,
projectId: null,
deptId: null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
deptUserData: [],
previewList: [],
@ -398,19 +417,13 @@ export default {
closeViewer() {
this.showViewer = false;
},
doOk() {
updateProjectDeptWroks(this.form).then((response) => {
this.$modal.msgSuccess("保存成功");
this.isOpen = false;
});
},
doCanel() {
this.isOpen = false;
},
show(project) {
this.project = project;
this.title = project.projectName;
this.isOpen = true;
this.tabs.all="全部数据（0）";
this.tabs.jxz="进行中（0）";
this.tabs.ywc="已完成（0）";
this.queryParams.projectId = project.id;
this.$api.publics
.queryUnitList({
@ -420,7 +433,7 @@ export default {
.then((d) => {
this.nodes = d.rows;
if (d.rows.length > 0) {
this.activeName = this.nodes[0].unitId + "";
this.unitActiveName = this.nodes[0].unitId + "";
this.isUnit = true;
this.getList();
} else {
@ -439,7 +452,8 @@ export default {
},
// 页签点击
getList() {
this.queryParams.deptId = this.activeName;
this.queryParams.deptId = this.unitActiveName;
this.queryCount();
this.loading = true;
listProjectChecking(this.queryParams).then((response) => {
this.projectCheckingList = response.rows;
@ -447,6 +461,15 @@ export default {
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;
@ -496,9 +519,9 @@ export default {
this.reset();
this.form.projectId = this.project.id;
this.form.projectName = this.project.projectName;
this.form.deptId = this.activeName;
this.form.deptId = this.unitActiveName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});
@ -516,7 +539,7 @@ export default {
this.form = response.data;
this.form.projectName = this.project.projectName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});

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

@ -101,7 +101,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审批状态" prop="approveStatus">
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
@ -172,7 +172,11 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-tabs v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
v-loading="loading"
:data="projectMeasureList"
@ -247,7 +251,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
@ -481,6 +485,7 @@ import {
delProjectMeasure,
addProjectMeasure,
updateProjectMeasure,
findGroupCountByApprove,
} from "@/api/project/projectMeasure";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -539,6 +544,12 @@ export default {
superviseUser: null,
isDel: null,
approveStatus: null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
// 表单参数
form: {},
@ -601,12 +612,22 @@ export default {
this.queryParams.params["beginMeasureTime"] = this.daterangeMeasureTime[0];
this.queryParams.params["endMeasureTime"] = this.daterangeMeasureTime[1];
}
this.queryCount();
listProjectMeasure(this.queryParams).then((response) => {
this.projectMeasureList = response.rows;
this.total = response.total;
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;

62
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -11,7 +11,7 @@
<div>{{ title + " 【实测实量管理】" }}</div>
</template>
<el-tabs
v-model="activeName"
v-model="unitActiveName"
style="margin-left: 20px; margin-right: 20px"
@tab-click="getList"
>
@ -67,6 +67,17 @@
@queryTable="getList"
></right-toolbar>
</el-row>
<el-tabs
v-model="queryParams.activeName"
@tab-click="getList"
style="margin-left: 25px; margin-right: 25px"
>
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>
</el-tabs>
<el-table
v-loading="loading"
:data="projectMeasureList"
@ -124,7 +135,7 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus">
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
@ -156,6 +167,7 @@
<el-table-column
label="操作"
align="center"
fixed="right"
class-name="small-padding fixed-width"
width="120"
>
@ -351,13 +363,13 @@
</template>
<script>
import { mapGetters } from "vuex";
import {
listProjectMeasure,
getProjectMeasure,
delProjectMeasure,
addProjectMeasure,
updateProjectMeasure,
findGroupCountByApprove,
} from "@/api/project/projectMeasure";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import indexDrawer from "../projectAuditinfo/indexDrawer.vue";
@ -398,7 +410,7 @@ export default {
measureFiles: [{ required: false, message: "请上传测量附件", trigger: "blur" }],
},
projectMeasureList: [],
activeName: "",
unitActiveName: "",
// 遮罩层
loading: true,
// 选中数组
@ -417,14 +429,18 @@ export default {
pageSize: 10,
projectId: null,
deptId: null,
activeName: "jxz",
},
tabs: {
all: "全部数据（0）",
jxz: "进行中（0）",
ywc: "已完成（0）",
},
deptUserData: [],
previewList: [],
};
},
computed: {
...mapGetters(["dept"]),
},
computed: {},
mounted() {},
methods: {
@ -452,19 +468,13 @@ export default {
closeViewer() {
this.showViewer = false;
},
doOk() {
updateProjectDeptWroks(this.form).then((response) => {
this.$modal.msgSuccess("保存成功");
this.isOpen = false;
});
},
doCanel() {
this.isOpen = false;
},
show(project) {
this.project = project;
this.title = project.projectName;
this.isOpen = true;
this.tabs.all="全部数据（0）";
this.tabs.jxz="进行中（0）";
this.tabs.ywc="已完成（0）";
this.queryParams.projectId = project.id;
this.$api.publics
.queryUnitList({
@ -474,7 +484,7 @@ export default {
.then((d) => {
this.nodes = d.rows;
if (d.rows.length > 0) {
this.activeName = this.nodes[0].unitId + "";
this.unitActiveName = this.nodes[0].unitId + "";
this.isUnit = true;
this.getList();
} else {
@ -493,7 +503,8 @@ export default {
},
// 页签点击
getList() {
this.queryParams.deptId = this.activeName;
this.queryParams.deptId = this.unitActiveName;
this.queryCount();
this.loading = true;
listProjectMeasure(this.queryParams).then((response) => {
this.projectMeasureList = response.rows;
@ -501,6 +512,15 @@ export default {
this.loading = false;
});
},
queryCount() {
findGroupCountByApprove(this.queryParams).then((response) => {
if (response && response.data) {
this.tabs.jxz = "进行中（" + response.data.jxz + "）";
this.tabs.ywc = "已完成（" + response.data.ywc + "）";
this.tabs.all = "全部数据（" + (response.data.jxz + response.data.ywc) + "）";
}
});
},
// 取消按钮
cancel() {
this.open = false;
@ -550,9 +570,9 @@ export default {
this.reset();
this.form.projectId = this.project.id;
this.form.projectName = this.project.projectName;
this.form.deptId = this.activeName;
this.form.deptId = this.unitActiveName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});
@ -570,7 +590,7 @@ export default {
this.form = response.data;
this.form.projectName = this.project.projectName;
this.nodes.forEach((item) => {
if (item.unitId == this.activeName) {
if (item.unitId == this.unitActiveName) {
this.form.deptName = item.unitName;
}
});

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
View File

@ -63,8 +63,8 @@ public class SurProjectCheckDetectionController extends BaseController
* 查询取样复试列表
*/
@PreAuthorize("@ss.hasPermi('project:checkDetection:list')")
@GetMapping("/findCheckDetectionCount")
public AjaxResult findCheckDetectionCount(SurProjectCheckDetection surProjectCheckDetection)
@GetMapping("/findGroupCountByApprove")
public AjaxResult findGroupCountByApprove(SurProjectCheckDetection surProjectCheckDetection)
{
surProjectCheckDetection.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectCheckDetection.getNowRole())){
@ -73,7 +73,7 @@ public class SurProjectCheckDetectionController extends BaseController
surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId()));
}
surProjectCheckDetection.setNowUser(Convert.toStr(getUserId()));
return success(surProjectCheckDetectionService.queryGroupCount(surProjectCheckDetection));
return success(surProjectCheckDetectionService.findGroupCountByApprove(surProjectCheckDetection));
}
/**

19
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java
View File

@ -61,6 +61,25 @@ public class SurProjectCheckingController extends BaseController
return getDataTable(list);
}
/**
* 统计举牌验收
*/
@PreAuthorize("@ss.hasPermi('project:projectChecking:list')")
@GetMapping("/findGroupCountByApprove")
public AjaxResult findGroupCountByApprove(SurProjectChecking surProjectChecking)
{
surProjectChecking.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectChecking.getNowRole())){
surProjectChecking.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectChecking.setNowDept(Convert.toStr(getDeptId()));
}
surProjectChecking.setNowUser(Convert.toStr(getUserId()));
surProjectChecking.setNowUserName(getUsername());
return success(surProjectCheckingService.findGroupCountByApprove(surProjectChecking));
}
/**
* 导出举牌验收列表
*/

17
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMaterialSealController.java
View File

@ -60,6 +60,23 @@ public class SurProjectMaterialSealController extends BaseController
return getDataTable(list);
}
/**
* 统计材料封样
*/
@PreAuthorize("@ss.hasPermi('project:materialSeal:list')")
@GetMapping("/findGroupCountByApprove")
public AjaxResult findGroupCountByApprove(SurProjectMaterialSeal surProjectMaterialSeal)
{
surProjectMaterialSeal.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectMaterialSeal.getNowRole())){
surProjectMaterialSeal.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectMaterialSeal.setNowDept(Convert.toStr(getDeptId()));
}
surProjectMaterialSeal.setNowUser(Convert.toStr(getUserId()));
return success(surProjectMaterialSealService.findGroupCountByApprove(surProjectMaterialSeal));
}
/**
* 导出材料封样列表
*/

17
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectMeasureController.java
View File

@ -60,6 +60,23 @@ public class SurProjectMeasureController extends BaseController
return getDataTable(list);
}
/**
* 统计实测实量
*/
@PreAuthorize("@ss.hasPermi('project:projectMeasure:list')")
@GetMapping("/findGroupCountByApprove")
public AjaxResult findGroupCountByApprove(SurProjectMeasure surProjectMeasure)
{
surProjectMeasure.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectMeasure.getNowRole())){
surProjectMeasure.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectMeasure.setNowDept(Convert.toStr(getDeptId()));
}
surProjectMeasure.setNowUser(Convert.toStr(getUserId()));
return success(surProjectMeasureService.findGroupCountByApprove(surProjectMeasure));
}
/**
* 导出实测实量列表
*/

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
View File

@ -75,7 +75,7 @@ public interface ISurProjectCheckDetectionService
* @param surProjectCheckDetection 材料送检
* @return 材料送检集合
*/
public Map<String,Object> queryGroupCount(SurProjectCheckDetection surProjectCheckDetection);
public Map<String,Object> findGroupCountByApprove(SurProjectCheckDetection surProjectCheckDetection);
/**
* 根据项目统计材料送检

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
View File

@ -29,6 +29,14 @@ public interface ISurProjectCheckingService
*/
public List<SurProjectChecking> selectSurProjectCheckingList(SurProjectChecking surProjectChecking);
/**
* 统计项目验收
*
* @param surProjectChecking 项目验收
* @return 项目验收集合
*/
public Map<String,Object> findGroupCountByApprove(SurProjectChecking surProjectChecking);
/**
* 查询项目验收列表
*

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java
View File

@ -29,6 +29,14 @@ public interface ISurProjectMaterialSealService
*/
public List<SurProjectMaterialSeal> selectSurProjectMaterialSealList(SurProjectMaterialSeal surProjectMaterialSeal);
/**
* 统计材料封样
*
* @param surProjectMaterialSeal 材料封样
* @return 项目验收集合
*/
public Map<String,Object> findGroupCountByApprove(SurProjectMaterialSeal surProjectMaterialSeal);
/**
* 新增材料封样
*

9
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java
View File

@ -3,6 +3,7 @@ package com.yanzhu.jh.project.service;
import java.util.List;
import java.util.Map;
import com.yanzhu.jh.project.domain.SurProjectMaterialSeal;
import com.yanzhu.jh.project.domain.SurProjectMeasure;
/**
@ -29,6 +30,14 @@ public interface ISurProjectMeasureService
*/
public List<SurProjectMeasure> selectSurProjectMeasureList(SurProjectMeasure surProjectMeasure);
/**
* 统计实测实量
*
* @param surProjectMeasure 实测实量
* @return 项目验收集合
*/
public Map<String,Object> findGroupCountByApprove(SurProjectMeasure surProjectMeasure);
/**
* 新增实测实量
*

22
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
View File

@ -150,13 +150,21 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
* @return 材料送检集合
*/
@Override
public Map<String,Object> queryGroupCount(SurProjectCheckDetection surProjectCheckDetection){
List<Map<String, Object>> dataList = surProjectCheckDetectionMapper.queryGroupCount(surProjectCheckDetection);
Map<String, Object> dataMap = new HashMap<>();
if(dataList!=null && dataList.size()>0){
for(Map<String, Object> map:dataList){
dataMap.put("check"+map.get("check_state"),map.get("total"));
}
public Map<String,Object> findGroupCountByApprove(SurProjectCheckDetection surProjectCheckDetection){
Map<String,Object> dataMap = new HashMap<>();
surProjectCheckDetection.setActiveName("jxz");
List<SurProjectCheckDetection> awaitList = surProjectCheckDetectionMapper.selectSurProjectCheckDetectionList(surProjectCheckDetection);
if(awaitList!=null){
dataMap.put("jxz",awaitList.size());
}else{
dataMap.put("jxz",0);
}
surProjectCheckDetection.setActiveName("ywc");
List<SurProjectCheckDetection> finishedList = surProjectCheckDetectionMapper.selectSurProjectCheckDetectionList(surProjectCheckDetection);
if(finishedList!=null){
dataMap.put("ywc",finishedList.size());
}else{
dataMap.put("ywc",0);
}
return dataMap;
}

26
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
View File

@ -58,6 +58,32 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
return surProjectCheckingMapper.selectSurProjectCheckingList(surProjectChecking);
}
/**
* 统计项目验收
*
* @param surProjectChecking 项目验收
* @return 项目验收集合
*/
@Override
public Map<String,Object> findGroupCountByApprove(SurProjectChecking surProjectChecking) {
Map<String,Object> dataMap = new HashMap<>();
surProjectChecking.setActiveName("jxz");
List<SurProjectChecking> awaitList = surProjectCheckingMapper.selectSurProjectCheckingList(surProjectChecking);
if(awaitList!=null){
dataMap.put("jxz",awaitList.size());
}else{
dataMap.put("jxz",0);
}
surProjectChecking.setActiveName("ywc");
List<SurProjectChecking> finishedList = surProjectCheckingMapper.selectSurProjectCheckingList(surProjectChecking);
if(finishedList!=null){
dataMap.put("ywc",finishedList.size());
}else{
dataMap.put("ywc",0);
}
return dataMap;
}
/**
* 查询项目验收列表
*

27
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.yanzhu.jh.project.service.impl;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -57,6 +58,32 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
return surProjectMaterialSealMapper.selectSurProjectMaterialSealList(surProjectMaterialSeal);
}
/**
* 统计材料封样
*
* @param surProjectMaterialSeal 材料封样
* @return 项目验收集合
*/
@Override
public Map<String,Object> findGroupCountByApprove(SurProjectMaterialSeal surProjectMaterialSeal) {
Map<String,Object> dataMap = new HashMap<>();
surProjectMaterialSeal.setActiveName("jxz");
List<SurProjectMaterialSeal> awaitList = surProjectMaterialSealMapper.selectSurProjectMaterialSealList(surProjectMaterialSeal);
if(awaitList!=null){
dataMap.put("jxz",awaitList.size());
}else{
dataMap.put("jxz",0);
}
surProjectMaterialSeal.setActiveName("ywc");
List<SurProjectMaterialSeal> finishedList = surProjectMaterialSealMapper.selectSurProjectMaterialSealList(surProjectMaterialSeal);
if(finishedList!=null){
dataMap.put("ywc",finishedList.size());
}else{
dataMap.put("ywc",0);
}
return dataMap;
}
/**
* 新增材料封样
*

27
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.yanzhu.jh.project.service.impl;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -56,6 +57,32 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
return surProjectMeasureMapper.selectSurProjectMeasureList(surProjectMeasure);
}
/**
* 统计材料封样
*
* @param surProjectMeasure 材料封样
* @return 项目验收集合
*/
@Override
public Map<String,Object> findGroupCountByApprove(SurProjectMeasure surProjectMeasure) {
Map<String,Object> dataMap = new HashMap<>();
surProjectMeasure.setActiveName("jxz");
List<SurProjectMeasure> awaitList = surProjectMeasureMapper.selectSurProjectMeasureList(surProjectMeasure);
if(awaitList!=null){
dataMap.put("jxz",awaitList.size());
}else{
dataMap.put("jxz",0);
}
surProjectMeasure.setActiveName("ywc");
List<SurProjectMeasure> finishedList = surProjectMeasureMapper.selectSurProjectMeasureList(surProjectMeasure);
if(finishedList!=null){
dataMap.put("ywc",finishedList.size());
}else{
dataMap.put("ywc",0);
}
return dataMap;
}
/**
* 新增实测实量
*

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -78,8 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spcd.witness_user=#{nowUserName})</if>
<if test='activeName == "sjz"'> and spcd.check_state = '1'</if>
<if test='activeName == "ywc"'> and spcd.check_state = '2'</if>
<if test='activeName == "jxz"'> and spcd.approve_status != '4'</if>
<if test='activeName == "ywc"'> and spcd.approve_status = '4'</if>
</where>
order by spcd.check_time desc
</select>

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -81,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})</if>
<if test='activeName == "jxz"'> and spc.approve_status != '4'</if>
<if test='activeName == "ywc"'> and spc.approve_status = '4'</if>
</where>
order by checking_date desc
</select>

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
View File

@ -65,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.user_id = #{nowUser} and spu.is_del=0</if>
<if test='activeName == "jxz"'> and spme.approve_status != '4'</if>
<if test='activeName == "ywc"'> and spme.approve_status = '4'</if>
</where>
</select>

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
View File

@ -75,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spm.quality_user=#{nowUserName} or spm.supervise_user=#{nowUserName})</if>
<if test='activeName == "jxz"'> and spm.approve_status != '4'</if>
<if test='activeName == "ywc"'> and spm.approve_status = '4'</if>
</where>
</select>