fix: BUG修改

This commit is contained in:
kun 2023-08-03 19:14:31 +08:00
parent 4270ce828b
commit 3bce79d428
16 changed files with 344 additions and 115 deletions

View File

@ -117,14 +117,14 @@
margin-top: 17px;
padding: 0 22px;
.table-header {
height: 28px;
line-height: 28px;
height: 35px;
line-height: 35px;
@include flex;
background: url("@/assets/images/hzImg/assessmentImg/header-title.png") no-repeat center;
background-size: 100% 100%;
.td {
@include td;
font-size: 20px;
font-size: 22px;
}
.td:last-child {
display: flex;
@ -134,27 +134,27 @@
}
}
.table-body:nth-child(2n) {
height: 28px;
line-height: 28px;
height: 35px;
line-height: 35px;
@include flex;
background: url("@/assets/images/hzImg/assessmentImg/tableBg-light.png") no-repeat center;
background-size: 100% 100%;
margin-top: 12px;
.td {
@include td;
font-size: 18px;
font-size: 22px;
}
}
.table-body:nth-child(2n - 1) {
height: 28px;
line-height: 28px;
height: 35px;
line-height: 35px;
@include flex;
background: url("@/assets/images/hzImg/assessmentImg/tableBg-dark.png") no-repeat center;
background-size: 100% 100%;
margin-top: 12px;
.td {
@include td;
font-size: 18px;
font-size: 22px;
}
}
}

View File

@ -73,7 +73,7 @@
</template>
</el-input>
</div>
<div class="type-title">未验收项目</div>
<!-- <div class="type-title">未验收项目</div> -->
<div class="table-content">
<div class="table-header">
<div class="td">序号</div>
@ -95,8 +95,8 @@
</div>
</template>
</div>
<div class="type-title">已验收项目</div>
<div class="table-content">
<!-- <div class="type-title">已验收项目</div> -->
<!-- <div class="table-content">
<div class="table-header">
<div class="td">序号</div>
<div class="td">企业名称</div>
@ -116,7 +116,7 @@
<div class="td">{{ item.score }}</div>
</div>
</template>
</div>
</div> -->
</div>
</div>
</div>
@ -139,7 +139,7 @@
</template>
</el-input>
</div>
<div class="type-title">未验收项目</div>
<!-- <div class="type-title">未验收项目</div> -->
<div class="table-content">
<div class="table-header">
<div class="td">序号</div>
@ -161,8 +161,8 @@
</div>
</template>
</div>
<div class="type-title">已验收项目</div>
<div class="table-content">
<!-- <div class="type-title">已验收项目</div> -->
<!-- <div class="table-content">
<div class="table-header">
<div class="td">序号</div>
<div class="td">企业名称</div>
@ -182,7 +182,7 @@
<div class="td">{{ item.score }}</div>
</div>
</template>
</div>
</div> -->
</div>
</div>
</div>
@ -292,7 +292,7 @@ const getEngineerData = async () => {
}
};
const getRedCountData = () => {
getRedSuccessCountData();
// getRedSuccessCountData();
getRedNoSuccessCountData();
};
const getRedSuccessCountData = async () => {
@ -312,7 +312,7 @@ const getRedSuccessCountData = async () => {
const getRedNoSuccessCountData = async () => {
let requestData = {
...redCountSearch.value,
engineeringState: 0,
// engineeringState: 0,
scoreSort: redNoSuccessSort.value,
enterpriseType: companyType.value
};
@ -324,7 +324,7 @@ const getRedNoSuccessCountData = async () => {
}
};
const getBlackCountData = () => {
getBlackSuccessCountData();
// getBlackSuccessCountData();
getBlackNoSuccessCountData();
};
const getBlackSuccessCountData = async () => {
@ -344,7 +344,7 @@ const getBlackSuccessCountData = async () => {
const getBlackNoSuccessCountData = async () => {
let requestData = {
...blackCountSearch.value,
engineeringState: 0,
// engineeringState: 0,
scoreSort: blackNoSuccessSort.value,
enterpriseType: companyType.value
};

View File

@ -106,11 +106,11 @@ const formConfig = reactive({
prop: "scoreCriteria",
type: "input"
},
{
label: "违约处理",
prop: "punish",
type: "input"
},
// {
// label: "",
// prop: "punish",
// type: "input"
// },
{
label: "扣分标准",
prop: "deductPointsStandard",
@ -160,13 +160,13 @@ const formConfig = reactive({
trigger: "blur"
}
],
deductPointsStandard: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
// deductPointsStandard: [
// {
// required: true,
// message: "",
// trigger: "blur"
// }
// ],
standardScore: [
{
required: true,
@ -192,10 +192,10 @@ const columns: ColumnProps[] = [
prop: "scoreCriteria",
label: "评分标准"
},
{
prop: "punish",
label: "违约处理"
},
// {
// prop: "punish",
// label: ""
// },
{
prop: "deductPointsStandard",
label: "扣分标准"

View File

@ -87,12 +87,12 @@
<el-form-item label="项目名称:" prop="engineeringName" v-if="addFormData.type == 2">
<el-input v-model="addFormData.engineeringName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目状态:" prop="type">
<!-- <el-form-item label="项目状态:" prop="type">
<el-radio-group v-model="addFormData.engineeringState">
<el-radio :label="1">已验收</el-radio>
<el-radio :label="0">未验收</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<el-button class="hzCancelStyle" @click="addVisible = false">取消</el-button>

View File

@ -19,15 +19,19 @@
>检查情况
<span>{{
basicData?.state == 1
? "待整改"
? "执法中"
: basicData?.state == 2
? "待审核"
? "待整改"
: basicData?.state == 3 && basicData?.level == 1
? "初审通过"
: basicData?.state == 3 && basicData?.level == 2
? "终审通过"
: basicData?.state == 4
? "已驳回"
? "待初审"
: basicData?.state == 4 && basicData?.level == 1
? "待终审"
: basicData?.state == 4 && basicData?.level == 2
? "已闭合"
: basicData?.state == 5 && basicData?.level == 1
? "初审驳回"
: basicData?.state == 5 && basicData?.level == 2
? "终审驳回"
: ""
}}</span>
</span>
@ -106,13 +110,15 @@
scope.row.state == 1
? "待整改"
: scope.row.state == 2
? "待"
? "待审"
: scope.row.state == 3 && scope.row.level == 1
? "初审通过"
? "待终审"
: scope.row.state == 3 && scope.row.level == 2
? "终审通过"
: scope.row.state == 4
? "已驳回"
? "已闭合"
: scope.row.state == 4 && scope.row.level == 1
? "初审驳回"
: scope.row.state == 4 && scope.row.level == 2
? "终审驳回"
: ""
}}</span>
</template>
@ -276,7 +282,7 @@
</div>
</el-dialog>
<!-- 单项审核弹窗 -->
<el-dialog v-model="auditVisible" :append-to-body="true">
<el-dialog v-model="auditVisible" :append-to-body="true" width="50%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
<span style="margin-left: 5px; color: var(--el-menu-text-color)">审核意见</span>
@ -291,7 +297,7 @@
</template>
</el-dialog>
<!-- 单项终审弹窗 -->
<el-dialog v-model="auditAgainVisible" :append-to-body="true">
<el-dialog v-model="auditAgainVisible" :append-to-body="true" width="50%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
<span style="margin-left: 5px; color: var(--el-menu-text-color)">终审意见</span>

View File

@ -52,12 +52,16 @@
? "执法中"
: row.state == 2
? "待整改"
: row.state == 3
? "待审核"
: row.state == 4
: row.state == 3 && row.level == 1
? "待初审"
: row.state == 4 && row.level == 1
? "待终审"
: row.state == 4 && row.level == 2
? "已闭合"
: row.state == 5
? "已驳回"
: row.state == 5 && row.level == 1
? "初审驳回"
: row.state == 5 && row.level == 2
? "终审驳回"
: ""
}}</span>
</template>
@ -146,11 +150,13 @@ const columns: ColumnProps[] = [
search: { el: "select" },
width: 150,
enum: [
{ label: "执法中", value: 1 },
{ label: "待整改", value: 2 },
{ label: "待审核", value: 3 },
{ label: "已闭合", value: 4 },
{ label: "已驳回", value: 5 }
// { label: "", value: 1 },
{ label: "待整改", value: "2" },
{ label: "待初审", value: "3-1" },
{ label: "待终审", value: "4-1" },
{ label: "已闭合", value: "4-2" },
{ label: "初审驳回", value: "5-1" },
{ label: "终审驳回", value: "5-2" }
]
},
{ prop: "slippage", label: "逾期情况(天)", width: 150 },
@ -214,16 +220,25 @@ const onCurChange = async (params: number) => {
};
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.type = 2;
newParams.level = 1;
// console.log(newParams);
if (newParams.createTime) {
newParams.createTime_begin = newParams.createTime[0];
newParams.createTime_end = newParams.createTime[1];
delete newParams.createTime;
}
if (newParams.state) {
if (newParams.state.indexOf("-")) {
newParams.level = Number(newParams.state[2]);
newParams.state = Number(newParams.state[0]);
} else {
newParams.state = newParams.state;
}
}
newParams.engineeringSn = searchSn.value;
newParams.type = 2;
if (!(newParams.projectSn || newParams.engineeringSn)) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return statisticsTable(newParams);
};
@ -279,8 +294,8 @@ watch(
);
onMounted(async () => {
await getEngPage();
searchSn.value = (records.value as any[])[0].projectSn;
searchName.value = (records.value as any[])[0].projectName;
searchSn.value = (records.value as any[])[0].engineeringSn;
searchName.value = (records.value as any[])[0].engineeringName;
onSearch(records.value[0]);
await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
});

View File

@ -19,15 +19,19 @@
>检查情况
<span>{{
basicData?.state == 1
? "待整改"
? "执法中"
: basicData?.state == 2
? "待审核"
? "待整改"
: basicData?.state == 3 && basicData?.level == 1
? "初审通过"
: basicData?.state == 3 && basicData?.level == 2
? "终审通过"
: basicData?.state == 4
? "已驳回"
? "待初审"
: basicData?.state == 4 && basicData?.level == 1
? "待终审"
: basicData?.state == 4 && basicData?.level == 2
? "已闭合"
: basicData?.state == 5 && basicData?.level == 1
? "初审驳回"
: basicData?.state == 5 && basicData?.level == 2
? "终审驳回"
: ""
}}</span>
</span>
@ -106,13 +110,15 @@
scope.row.state == 1
? "待整改"
: scope.row.state == 2
? "待"
? "待审"
: scope.row.state == 3 && scope.row.level == 1
? "初审通过"
? "待终审"
: scope.row.state == 3 && scope.row.level == 2
? "终审通过"
: scope.row.state == 4
? "已驳回"
? "已闭合"
: scope.row.state == 4 && scope.row.level == 1
? "初审驳回"
: scope.row.state == 4 && scope.row.level == 2
? "终审驳回"
: ""
}}</span>
</template>
@ -269,7 +275,7 @@
</div>
</el-dialog>
<!-- 单项审核弹窗 -->
<el-dialog v-model="auditVisible" :append-to-body="true">
<el-dialog v-model="auditVisible" :append-to-body="true" width="50%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
<span style="margin-left: 5px; color: var(--el-menu-text-color)">审核意见</span>
@ -284,7 +290,7 @@
</template>
</el-dialog>
<!-- 单项终审弹窗 -->
<el-dialog v-model="auditAgainVisible" :append-to-body="true">
<el-dialog v-model="auditAgainVisible" :append-to-body="true" width="50%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
<span style="margin-left: 5px; color: var(--el-menu-text-color)">终审意见</span>
@ -366,6 +372,7 @@ const singleAuditSubmit = async index => {
if (index == 1) {
let requestData = {
id: singleData.value.id,
level: 1,
suggest: auditForm.value.content,
examineState: 2
};
@ -374,6 +381,7 @@ const singleAuditSubmit = async index => {
} else {
let requestData = {
id: singleData.value.id,
level: 1,
suggest: auditForm.value.content,
examineState: 1
};
@ -731,10 +739,19 @@ onMounted(() => {});
.test :deep(.el-input__inner) {
text-align: center;
}
:deep(.el-table__empty-text) {
min-height: 200px;
display: flex;
justify-content: center;
align-items: center;
:deep() {
.el-table__empty-text {
min-height: 200px;
display: flex;
justify-content: center;
align-items: center;
}
.el-input__wrapper,
.el-textarea__inner,
.el-input.is-disabled .el-input__wrapper {
color: var(--el-menu-text-color);
background-color: transparent;
box-shadow: 0 0 0 1px #087ba4 inset;
}
}
</style>

View File

@ -53,12 +53,16 @@
? "执法中"
: row.state == 2
? "待整改"
: row.state == 3
? "待审核"
: row.state == 4
: row.state == 3 && row.level == 1
? "待初审"
: row.state == 4 && row.level == 1
? "待终审"
: row.state == 4 && row.level == 2
? "已闭合"
: row.state == 5
? "已驳回"
: row.state == 5 && row.level == 1
? "初审驳回"
: row.state == 5 && row.level == 2
? "终审驳回"
: ""
}}</span>
</template>
@ -147,11 +151,13 @@ const columns: ColumnProps[] = [
search: { el: "select" },
width: 150,
enum: [
{ label: "执法中", value: 1 },
{ label: "待整改", value: 2 },
{ label: "待审核", value: 3 },
{ label: "已闭合", value: 4 },
{ label: "已驳回", value: 5 }
// { label: "", value: 1 },
{ label: "待整改", value: "2" },
{ label: "待初审", value: "3-1" },
{ label: "待终审", value: "4-1" },
{ label: "已闭合", value: "4-2" },
{ label: "初审驳回", value: "5-1" },
{ label: "终审驳回", value: "5-2" }
]
},
{ prop: "slippage", label: "逾期情况(天)", width: 150 },
@ -183,6 +189,7 @@ const onSearch = async (params: any) => {
};
//
const allConfirm = () => {
console.log(666777888);
proTable.value.getTableList();
};
const handleLookItem = row => {
@ -215,19 +222,23 @@ const onCurChange = async (params: number) => {
};
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.type = 1;
if (newParams.createTime) {
newParams.createTime_begin = newParams.createTime[0];
newParams.createTime_end = newParams.createTime[1];
delete newParams.createTime;
}
if (active.value === 0) {
newParams.projectSn = searchSn.value;
} else {
newParams.engineeringSn = searchSn.value;
if (newParams.state) {
if (newParams.state.indexOf("-")) {
newParams.level = Number(newParams.state[2]);
newParams.state = Number(newParams.state[0]);
} else {
newParams.state = newParams.state;
}
}
newParams.type = 1;
if (!(newParams.projectSn || newParams.engineeringSn)) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
newParams.engineeringSn = searchSn.value;
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return statisticsTable(newParams);
};
@ -283,9 +294,9 @@ watch(
);
onMounted(async () => {
await getEngPage();
searchSn.value = (records.value as any[])[0].engineeringSn;
searchName.value = (records.value as any[])[0].engineeringName;
onSearch(records.value[0]);
searchSn.value = (records.value as any[])[0].projectSn;
searchName.value = (records.value as any[])[0].projectName;
await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
});
</script>

View File

@ -284,7 +284,7 @@ const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.engineeringSn = searchSn.value;
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return getvideoManagementPage(newParams);
};

View File

@ -258,7 +258,7 @@ const getTableList = (params: any) => {
console.log(newParams);
return smallStore(newParams);
} else {
return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
};
// dataCallback list && total && pageNum && pageSize

View File

@ -238,7 +238,7 @@ const getTableList = (params: any) => {
console.log(newParams);
return smallStore(newParams);
} else {
return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
};
// dataCallback list && total && pageNum && pageSize

View File

@ -105,6 +105,144 @@
<img src="@/assets/images/hzImg/xm/icon-right.png" alt="" class="icon-right" />
</div>
</div>
<div class="dialogInner">
<div class="title">履约评价</div>
<div class="detailTable">
<div class="item">
<div class="itemInner">
<span class="label">序号</span>
</div>
<div class="itemInner">
<span class="label">企业名称</span>
</div>
<div class="itemInner">
<span class="label">企业类型</span>
</div>
<div class="itemInner">
<span class="label">履约得分</span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">承建单位</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">监理单位</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">设计单位</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
<div class="itemInner">
<span class="label">-</span>
</div>
</div>
</div>
</div>
<div class="dialogInner">
<div class="title">招标管理</div>
<div class="title2" style="margin-bottom: 10px">
<div class="item">
<img src="@/assets/images/hzImg/xm/zbgl.png" alt="" />
<div>
<div class="name">招标概况</div>
</div>
</div>
</div>
<div class="detailBox" style="margin-bottom: 10px">
<div class="item">
<div class="itemInner">
<span class="label">招标名称</span>
<span></span>
</div>
<div class="itemInner">
<span class="label">招标日期</span>
<span></span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">类型</span>
<span></span>
</div>
<div class="itemInner">
<span class="label">中标单位</span>
<span></span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">规模</span>
<span></span>
</div>
<div class="itemInner">
<span class="label">负责人</span>
<span></span>
</div>
</div>
<div class="item">
<div class="itemInner">
<span class="label">所属行业</span>
<span></span>
</div>
<div class="itemInner">
<span class="label">联系人</span>
<span></span>
</div>
</div>
</div>
<div class="fieList">
<img src="@/assets/images/hzImg/xm/icon-left.png" alt="" class="icon-left" />
<div class="fileBox">
<div class="item" v-for="item in 9" :key="item">
<img src="@/assets/images/hzImg/xm/pdf.png" alt="" class="icon-left" />
<div class="name">-</div>
</div>
</div>
<img src="@/assets/images/hzImg/xm/icon-right.png" alt="" class="icon-right" />
</div>
</div>
</div>
</div>
</template>
@ -127,7 +265,7 @@ const closeFn = () => {
.dialogBox {
position: fixed;
top: 50%;
left: 50%;
left: calc(50% + 100px);
z-index: 99;
width: 1430px;
padding-top: 40px;
@ -209,6 +347,48 @@ const closeFn = () => {
}
}
}
.detailTable {
margin: 20px 20px;
.item {
display: flex;
align-items: center;
color: rgb(255 255 255 / 80%);
border-bottom: 1px solid #1e3758;
&:last-child {
border-bottom: none;
}
.label {
display: inline-block;
width: 100%;
color: #97baa4;
text-align: center;
}
span {
padding: 8px;
}
.itemInner {
width: 25%;
border-right: 1px solid #1e3758;
border-bottom: 1px solid #1e3758;
}
.address {
display: inline-block;
width: 150px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: top;
}
}
.item:not(:first-child) .itemInner {
.label {
display: inline-block;
width: 100%;
color: #c4c6ce;
text-align: center;
}
}
}
.intro {
height: 150px;
margin: 0 40px;

View File

@ -91,9 +91,9 @@
margin-bottom: 0;
}
.name {
width: 100px;
width: max-content;
display: inline-flex;
margin: 0 0 0 12px;
margin: 0 5px 0 12px;
white-space: nowrap;
}
.rect {

View File

@ -318,7 +318,7 @@ const getTableList = (params: any) => {
}
newParams.engineeringSn = searchSn.value;
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return getLedgerPage(newParams);
};

View File

@ -283,7 +283,7 @@ const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.engineeringSn = searchSn.value;
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return getDustManagementPage(newParams);
};

View File

@ -194,7 +194,7 @@ const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.engineeringSn = searchSn.value;
if (!newParams.engineeringSn) {
return { result: { records: [], current: "1", total: "0", size: "10" } };
return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } };
}
return getRealTimePage(newParams);
};