admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-23 22:14:02 +08:00
parent ff84ce78f7
commit 205868b90c
7 changed files with 156 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/assets/js/api/progressManagement.js
View File

@ -5,6 +5,7 @@ import {post,get} from '../http'
//甘特图-列表查询任务进度 //甘特图-列表查询任务进度
export const getParentChildTaskListApi = data => post('xmgl/taskProgress/getParentChildList', data); export const getParentChildTaskListApi = data => post('xmgl/taskProgress/getParentChildList', data);
export const getXzParentChildTaskListApi = data => post('xmgl/xzTaskProgress/getParentChildList', data);
export const getCountTaskProgressApi = data => post('xmgl/xzTaskProgress/countTaskProgress', data); export const getCountTaskProgressApi = data => post('xmgl/xzTaskProgress/countTaskProgress', data);
export const getCountTaskProgressListApi = data => get('xmgl/xzTaskProgressTotal/list', data); export const getCountTaskProgressListApi = data => get('xmgl/xzTaskProgressTotal/list', data);
export const updateProgressApi = data => post('xmgl/xzTaskProgressTotal/add', data); export const updateProgressApi = data => post('xmgl/xzTaskProgressTotal/add', data);
@ -12,10 +13,14 @@ export const updateProgressApi = data => post('xmgl/xzTaskProgressTotal/add', da
//分部分项工程管理 //分部分项工程管理
export const addTaskProgressApi = data => post('xmgl/taskProgress/add', data); export const addTaskProgressApi = data => post('xmgl/taskProgress/add', data);
export const addXzTaskProgressApi = data => post('xmgl/xzTaskProgress/add', data);
export const deleteTaskProgressApi = data => post('xmgl/taskProgress/delete', data); export const deleteTaskProgressApi = data => post('xmgl/taskProgress/delete', data);
export const deleteXzTaskProgressApi = data => post('xmgl/xzTaskProgress/delete', data);
export const editTaskProgressApi = data => post('xmgl/taskProgress/edit', data); export const editTaskProgressApi = data => post('xmgl/taskProgress/edit', data);
export const editXzTaskProgressApi = data => post('xmgl/xzTaskProgress/edit', data);
export const editProgressBindComponentApi = data => post('xmgl/taskProgress/editBimComponent', data); export const editProgressBindComponentApi = data => post('xmgl/taskProgress/editBimComponent', data);
export const getTaskProgressPageApi = data => post('xmgl/taskProgress/getParentChildPage', data); export const getTaskProgressPageApi = data => post('xmgl/taskProgress/getParentChildPage', data);
export const getXzTaskProgressPageApi = data => post('xmgl/xzTaskProgress/getParentChildPage', data);
//分部分项工程管理--BIMBASE中心进度管理 //分部分项工程管理--BIMBASE中心进度管理
export const addTaskProgressRtApi = data => post('xmgl/taskProgressRt/add', data); export const addTaskProgressRtApi = data => post('xmgl/taskProgressRt/add', data);
@ -27,9 +32,11 @@ export const getTaskProgressPageRtApi = data => post('xmgl/taskProgressRt/getPar
//分部分项工程管理_详情-进度记录 //分部分项工程管理_详情-进度记录
export const getTaskProgressContentApi = data => get('xmgl/taskProgressContent/list', data); export const getTaskProgressContentApi = data => get('xmgl/taskProgressContent/list', data);
export const getXzTaskProgressContentApi = data => get('xmgl/xzTaskProgressContent/list', data);
//分部分项工程管理_详情-材料用量 //分部分项工程管理_详情-材料用量
export const getTaskProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialRel/detailList', data); export const getTaskProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialRel/detailList', data);
export const getXzTaskProgressMaterialRelApi = data => get('xmgl/xzTaskProgressMaterialRel/detailList', data);
//分部分项工程管理_上报进度 //分部分项工程管理_上报进度
@ -38,6 +45,7 @@ export const addXzTaskProgressContentApi = data => post('xmgl/xzTaskProgressCont
//分部分项工程管理_开始任务 //分部分项工程管理_开始任务
export const addTaskProgressStart = data => post('xmgl/taskProgress/startTask', data); export const addTaskProgressStart = data => post('xmgl/taskProgress/startTask', data);
export const addXzTaskProgressStart = data => post('xmgl/xzTaskProgress/startTask', data);
@ -45,10 +53,12 @@ export const addTaskProgressStart = data => post('xmgl/taskProgress/startTask',
export const addTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/add', data); export const addTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/add', data);
export const deleteTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/delete', data); export const deleteTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/delete', data);
export const getTypeProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialType/list', data); export const getTypeProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialType/list', data);
export const getXzTypeProgressMaterialRelApi = data => get('xmgl/xzTaskProgressMaterialType/list', data);
//进度预警 //进度预警
export const getTaskProgressAlarmPageApi = data => get('xmgl/taskProgressAlarm/page', data); export const getTaskProgressAlarmPageApi = data => get('xmgl/taskProgressAlarm/page', data);
export const getXzTaskProgressAlarmPageApi = data => get('xmgl/xzTaskProgressAlarm/page', data);
//计划材料工程 //计划材料工程
@ -56,6 +66,8 @@ export const getTaskProgressMaterialRelTreeApi = data => get('xmgl/taskProgressM
// 进度审批 // 进度审批
export const getProgressContentPageApi = data => get('xmgl/xzTaskProgressContent/page', data); export const getProgressContentPageApi = data => get('xmgl/xzTaskProgressContent/page', data);
export const editProgressContentApi = data => post('xmgl/xzTaskProgressContent/edit', data);
export const deleteProgressContentApi = data => post('xmgl/xzTaskProgressContent/delete', data);

2
src/views/projectFront/dangerousBigProject/detail.vue
View File

@ -350,7 +350,7 @@
> >
<div class="flex"> <div class="flex">
<p> <p>
{{ {{index + 1}}.{{
item.children item.children
? item.controlTypeName ? item.controlTypeName
: item.controlContent : item.controlContent

45
src/views/projectFront/progressManagementAg/divisionSubManage.vue
View File

@ -343,6 +343,29 @@
:rules="addEditRules" :rules="addEditRules"
:model="workerInfo" :model="workerInfo"
> >
<el-form-item label="区域" prop="qualityRegionId">
<el-select v-model="workerInfo.qualityRegionId" placeholder="请选择">
<el-option
v-for="item in areaList"
:key="item.id"
:label="item.regionName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="承包商" prop="enterpriseId">
<el-select v-model="workerInfo.enterpriseId" placeholder="请选择">
<el-option
v-for="item in level1CompanyData"
:key="item.id"
:label="item.enterpriseName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item <el-form-item
label="分部分项名称" label="分部分项名称"
prop="taskName" prop="taskName"
@ -542,10 +565,10 @@
</template> </template>
<script> <script>
import { import {
addTaskProgressApi, addXzTaskProgressApi,
deleteTaskProgressApi, deleteXzTaskProgressApi,
editTaskProgressApi, editXzTaskProgressApi,
getTaskProgressPageApi, getXzTaskProgressPageApi
} from "@/assets/js/api/progressManagement"; } from "@/assets/js/api/progressManagement";
import { getCrewListDataApi } from "@/assets/js/api/dailyCheck"; import { getCrewListDataApi } from "@/assets/js/api/dailyCheck";
import detailpage from "./projectProgressDetail"; import detailpage from "./projectProgressDetail";
@ -610,6 +633,8 @@ export default {
actualStartDate: "", actualStartDate: "",
actualFinishDate: "", actualFinishDate: "",
dutyUserId: "", dutyUserId: "",
qualityRegionId: "",
enterpriseId: "",
progressRatio: "", progressRatio: "",
remark: "", remark: "",
parentId: 0, parentId: 0,
@ -813,7 +838,7 @@ export default {
enterpriseId: this.treeData.id, enterpriseId: this.treeData.id,
qualityRegionId: this.areaSelectVal, qualityRegionId: this.areaSelectVal,
}; };
getTaskProgressPageApi(data).then((res) => { getXzTaskProgressPageApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.listData = res.result.records; this.listData = res.result.records;
this.pagInfo.total = res.result.total; this.pagInfo.total = res.result.total;
@ -869,13 +894,15 @@ export default {
actualStartDate: this.workerInfo.actualStartDate, actualStartDate: this.workerInfo.actualStartDate,
actualFinishDate: this.workerInfo.actualFinishDate, actualFinishDate: this.workerInfo.actualFinishDate,
dutyUserId: this.workerInfo.dutyUserId, dutyUserId: this.workerInfo.dutyUserId,
qualityRegionId: this.workerInfo.qualityRegionId,
enterpriseId: this.workerInfo.enterpriseId,
progressRatio: this.workerInfo.progressRatio, progressRatio: this.workerInfo.progressRatio,
remark: this.workerInfo.remark, remark: this.workerInfo.remark,
parentId: this.workerInfo.parentId, parentId: this.workerInfo.parentId,
projectSn: this.projectSn, projectSn: this.projectSn,
}; };
if (this.dialogType == 1) { if (this.dialogType == 1) {
addTaskProgressApi(data).then((res) => { addXzTaskProgressApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message); this.$message.success(res.message);
this.dialogVisible = false; this.dialogVisible = false;
@ -884,7 +911,7 @@ export default {
}); });
} else if (this.dialogType == 2) { } else if (this.dialogType == 2) {
data.id = this.workerInfo.id; data.id = this.workerInfo.id;
editTaskProgressApi(data).then((res) => { editXzTaskProgressApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message); this.$message.success(res.message);
this.dialogVisible = false; this.dialogVisible = false;
@ -894,7 +921,7 @@ export default {
} else if (this.dialogType == 3) { } else if (this.dialogType == 3) {
data.parentId = this.workerInfo.parentId; data.parentId = this.workerInfo.parentId;
data.level = 2; data.level = 2;
addTaskProgressApi(data).then((res) => { addXzTaskProgressApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message); this.$message.success(res.message);
this.dialogVisible = false; this.dialogVisible = false;
@ -922,7 +949,7 @@ export default {
let data = { let data = {
id: value.id, id: value.id,
}; };
deleteTaskProgressApi(data).then((res) => { deleteXzTaskProgressApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",

29
src/views/projectFront/progressManagementAg/ganttChart.vue
View File

@ -68,11 +68,18 @@
</div> </div>
</div> </div>
<div class="gantt-box"> <div class="gantt-box">
<div class="top-content">
<div class="top-count">
<span>项目总进度：{{progressData.projectTotalProgress || 0}}%</span>
<span>项目总天数：{{progressData.projectTotalDayNum || 0}}天</span>
<span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span>
</div>
<div class="update-operate"> <div class="update-operate">
<el-button type="primary" size="medium" @click="updateProgressFn" <el-button type="primary" size="medium" @click="updateProgressFn"
>更新进度</el-button >更新进度</el-button
> >
</div> </div>
</div>
<div class="header"> <div class="header">
<div class="left-content"> <div class="left-content">
<div class="item" v-for="(item, index) in headerList" :key="index"> <div class="item" v-for="(item, index) in headerList" :key="index">
@ -862,7 +869,7 @@
</template> </template>
<script> <script>
import { getParentChildTaskListApi, getCountTaskProgressApi, getCountTaskProgressListApi, updateProgressApi } from "@/assets/js/api/progressManagement"; import { getXzParentChildTaskListApi, getCountTaskProgressApi, getCountTaskProgressListApi, updateProgressApi } from "@/assets/js/api/progressManagement";
import { import {
getQualityRegionListApi getQualityRegionListApi
} from '@/assets/js/api/quality.js' } from '@/assets/js/api/quality.js'
@ -919,6 +926,8 @@ export default {
areaList: [], areaList: [],
treeData: {}, treeData: {},
progressData: { progressData: {
projectSurplusDayNum: 0,
projectTotalDayNum: 0,
projectTotalProgress: 0 projectTotalProgress: 0
} }
}; };
@ -1018,6 +1027,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.treeData = this.level1CompanyData[0]; this.treeData = this.level1CompanyData[0];
this.$refs.tree.setCurrentKey(this.level1CompanyData[0].id) this.$refs.tree.setCurrentKey(this.level1CompanyData[0].id)
this.getCountFn();
}) })
} }
// this.enterpriseTreeData = res.result // this.enterpriseTreeData = res.result
@ -1039,12 +1049,11 @@ export default {
// 更新进度 // 更新进度
updateProgressFn() { updateProgressFn() {
this.dialogVisible = true; this.dialogVisible = true;
this.getCountFn();
this.getUpdateRecord(); this.getUpdateRecord();
}, },
//获取甘特图数据 //获取甘特图数据
getDataList() { getDataList() {
getParentChildTaskListApi({ getXzParentChildTaskListApi({
projectSn: this.searchSn, projectSn: this.searchSn,
qualityRegionId: this.areaSelectVal, qualityRegionId: this.areaSelectVal,
enterpriseId: this.treeData.id enterpriseId: this.treeData.id
@ -1460,11 +1469,17 @@ export default {
padding: 18px; padding: 18px;
background: #ffffff; background: #ffffff;
// border-radius: 8px; // border-radius: 8px;
position: relative; .top-content{
display: flex;
align-items: center;
justify-content: space-between;
.top-count{
span{
margin-right: 50px;
}
}
.update-operate { .update-operate {
position: absolute; }
top: 10px;
right: 20px;
} }
.header { .header {
display: flex; display: flex;

112
src/views/projectFront/progressManagementAg/progressApproval.vue
View File

@ -127,7 +127,7 @@
/> />
<span style="white-space: nowrap;">通过</span> <span style="white-space: nowrap;">通过</span>
</div> </div>
<div @click="dialogVisible = true" class="operationText"> <div @click="openBackDialog(scope.row)" class="operationText">
<img <img
src="@/assets/images/tableIcon/backApply.png" src="@/assets/images/tableIcon/backApply.png"
width="15px" width="15px"
@ -196,12 +196,14 @@
class="cancleBtn" class="cancleBtn"
icon="el-icon-circle-close" icon="el-icon-circle-close"
size="medium" size="medium"
@click="dialogVisible = false"
>{{ $t("message.personnelPosition.cancel") }} >{{ $t("message.personnelPosition.cancel") }}
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
size="medium" size="medium"
@click="backApply"
>{{ $t("message.personnelPosition.determine") }} >{{ $t("message.personnelPosition.determine") }}
</el-button> </el-button>
</div> </div>
@ -211,14 +213,16 @@
</div> </div>
</template> </template>
<script> <script>
import { getProgressContentPageApi } from "@/assets/js/api/progressManagement"; import { getProgressContentPageApi, editProgressContentApi, deleteProgressContentApi } from "@/assets/js/api/progressManagement";
import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson"; import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson";
export default { export default {
mounted() {}, mounted() {},
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
workerInfo: {}, workerInfo: {
description: ""
},
addForm: {}, addForm: {},
temporaryDialog: false, temporaryDialog: false,
selectTreeData: {}, selectTreeData: {},
@ -244,6 +248,7 @@ export default {
}, },
List: [], List: [],
daterange: [], daterange: [],
rowObj: {}
}; };
}, },
created() { created() {
@ -252,6 +257,32 @@ export default {
this.getTreeList(); this.getTreeList();
}, },
methods: { methods: {
openBackDialog(row){
this.rowObj = row;
this.workerInfo.description = "";
this.dialogVisible = true
},
// 驳回审批
backApply(){
editProgressContentApi({
id: this.rowObj.id,
feedbackContent: this.workerInfo.description,
auditType: 3,
}).then((res) => {
if (res.success) {
this.getWarningListData()
this.$message({
type: 'success',
message: '操作成功!',
})
} else {
this.$message({
type: 'error',
message: res.message,
})
}
})
},
// 通过 // 通过
pass(row){ pass(row){
this.$confirm("此操作将通过审批, 是否继续?", "提示", { this.$confirm("此操作将通过审批, 是否继续?", "提示", {
@ -260,23 +291,23 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
// deleteDeviceCentraliceCentralPageApi({ editProgressContentApi({
// id: obj.id, id: row.id,
// projectSn: this.$store.state.projectSn, auditType: 2,
// }).then((res) => { }).then((res) => {
// if (res.success) { if (res.success) {
// this.getPage() this.getWarningListData()
// this.$message({ this.$message({
// type: 'success', type: 'success',
// message: '删除成功!', message: '操作成功!',
// }) })
// } else { } else {
// this.$message({ this.$message({
// type: 'error', type: 'error',
// message: res.message, message: res.message,
// }) })
// } }
// }) })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
@ -285,9 +316,6 @@ export default {
}); });
}); });
}, },
edit(row) {
console.log(666);
},
deleteDev(obj) { deleteDev(obj) {
this.$confirm("此操作将永久删除, 是否继续?", "提示", { this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -295,23 +323,23 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
// deleteDeviceCentraliceCentralPageApi({ deleteProgressContentApi({
// id: obj.id, id: obj.id,
// projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
// }).then((res) => { }).then((res) => {
// if (res.success) { if (res.success) {
// this.getPage() this.getWarningListData()
// this.$message({ this.$message({
// type: 'success', type: 'success',
// message: '删除成功!', message: '删除成功!',
// }) })
// } else { } else {
// this.$message({ this.$message({
// type: 'error', type: 'error',
// message: res.message, message: res.message,
// }) })
// } }
// }) })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
@ -364,8 +392,8 @@ export default {
getProgressContentPageApi(data).then((res) => { getProgressContentPageApi(data).then((res) => {
console.log("返回的值", res); console.log("返回的值", res);
if (res.code == 200) { if (res.code == 200) {
// this.tableList = res.result.records this.tableList = res.result.records
this.tableList = [{ name: 111 }]; // this.tableList = [];
this.pagInfo.total = res.result.total; this.pagInfo.total = res.result.total;
} }
}); });

4
src/views/projectFront/progressManagementAg/progressWarning.vue
View File

@ -100,7 +100,7 @@
</template> </template>
<script> <script>
import { import {
getTaskProgressAlarmPageApi getXzTaskProgressAlarmPageApi
} from "@/assets/js/api/progressManagement"; } from "@/assets/js/api/progressManagement";
import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson"; import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson";
export default { export default {
@ -180,7 +180,7 @@ export default {
createDate_end: this.queryInfo.endTime, createDate_end: this.queryInfo.endTime,
enterpriseId: this.queryInfo.enterpriseId enterpriseId: this.queryInfo.enterpriseId
} }
getTaskProgressAlarmPageApi(data).then((res) => { getXzTaskProgressAlarmPageApi(data).then((res) => {
console.log('返回的值', res) console.log('返回的值', res)
if (res.code == 200) { if (res.code == 200) {
this.tableList = res.result.records this.tableList = res.result.records

24
src/views/projectFront/progressManagementAg/projectProgressDetail.vue
View File

@ -367,11 +367,11 @@
</template> </template>
<script> <script>
import { import {
addTaskProgressStart, //开始任务 addXzTaskProgressStart, //开始任务
getTaskProgressContentApi, //进度记录 getXzTaskProgressContentApi, //进度记录
getTaskProgressMaterialRelApi, //材料用量 getXzTaskProgressMaterialRelApi, //材料用量
addXzTaskProgressContentApi, //上报进度 addXzTaskProgressContentApi, //上报进度
getTypeProgressMaterialRelApi, //上报进度材料列表 getXzTypeProgressMaterialRelApi, //上报进度材料列表
} from "@/assets/js/api/progressManagement"; } from "@/assets/js/api/progressManagement";
export default { export default {
props: ["id", "rowData"], props: ["id", "rowData"],
@ -427,8 +427,8 @@ export default {
this.projectSn = this.$store.state.projectSn; this.projectSn = this.$store.state.projectSn;
this.uploadUrl = this.$store.state.UPLOADURL; this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL; this.fileUrl = this.$store.state.FILEURL;
this.getTypeList(); // this.getTypeList();
this.getDetailInfo(); // this.getDetailInfo();
this.getProgressInfo(); this.getProgressInfo();
}, },
methods: { methods: {
@ -438,7 +438,7 @@ export default {
}, },
//查询材料类型配置 //查询材料类型配置
getTypeList() { getTypeList() {
getTypeProgressMaterialRelApi({ getXzTypeProgressMaterialRelApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
}).then((res) => { }).then((res) => {
if (res.result.length > 0) { if (res.result.length > 0) {
@ -452,7 +452,7 @@ export default {
taskProgressId: this.itemForm.id, taskProgressId: this.itemForm.id,
projectSn: this.projectSn, projectSn: this.projectSn,
}; };
getTaskProgressMaterialRelApi(data).then((res) => { getXzTaskProgressMaterialRelApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.result; this.tableData = res.result;
} else { } else {
@ -465,7 +465,7 @@ export default {
let data = { let data = {
taskProgressId: this.itemForm.id, taskProgressId: this.itemForm.id,
}; };
getTaskProgressContentApi(data).then((res) => { getXzTaskProgressContentApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.planList = res.result; this.planList = res.result;
} else { } else {
@ -495,8 +495,8 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.itemForm.progressRatio = Number(data.progressRatio); this.itemForm.progressRatio = Number(data.progressRatio);
this.getProgressInfo(); this.getProgressInfo();
this.getTypeList(); // this.getTypeList();
this.getDetailInfo(); // this.getDetailInfo();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
@ -569,7 +569,7 @@ export default {
status: 1, status: 1,
}; };
console.log("开始任务", data); console.log("开始任务", data);
addTaskProgressStart(data).then((res) => { addXzTaskProgressStart(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("开始任务成功"); this.$message.success("开始任务成功");
this.itemForm.status = 1; this.itemForm.status = 1;