admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-08-16 17:55:12 +08:00
parent 7ecf606d05
commit 4e4a8a6cc2
14 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/element.scss
View File

@ -107,6 +107,7 @@
// 去除时间选择器上下 padding
.el-range-editor.el-input__wrapper {
padding: 0 10px;
flex-grow: 0;
}
}
.operation {

7
src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -104,7 +104,7 @@
<span v-else>{{ row.remark }}</span>
</template>
</el-table-column>
<el-table-column align="center" width="180" label="操作" v-if="title != '详情'">
<el-table-column align="center" width="180" fixed="right" label="操作" v-if="title != '详情'">
<template #default="scope">
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@ -232,7 +232,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="100" label="操作">
<el-table-column align="center" fixed="right" width="100" label="操作">
<template #default="{ row }">
<el-button type="primary" link @click="handleLookItem(row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@ -370,6 +370,9 @@ const confirm = async () => {
annexList: documentData.value,
engineeringSn: globalStore.engineeringSn
};
if (props.title == "重新发起") {
requestData.id = props.relativeId;
}
requestData.detailList.map(item => {
delete item.id;
});

3
src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
View File

@ -84,7 +84,8 @@ const columns: ColumnProps[] = [
{ label: "审批中", value: 1 },
{ label: "资料验收通过", value: 2 },
{ label: "已驳回", value: 3 },
{ label: "已验收通过", value: 4 }
{ label: "已验收通过", value: 4 },
{ label: "已重新发起", value: 5 }
]
},
{ prop: "operation", label: "操作", fixed: "right" }

1
src/views/enterprise/progressManagement/subItemManagement/index.vue
View File

@ -545,6 +545,7 @@ onMounted(() => {
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
}
}

4
src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -175,7 +175,7 @@
<template #default="{ row }">
<span>{{
row.state == 0
? "待执法"
? "待检查"
: row.state == 1
? "执法中"
: row.state == 2
@ -190,7 +190,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="100" label="操作">
<el-table-column align="center" fixed="right" width="100" label="操作">
<template #default="{ row }">
<el-button type="primary" link @click="handleLookItem(row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />

7
src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
View File

@ -18,7 +18,9 @@
<span class="row-span"
>检查情况：
<span>{{
basicData?.state == 1
basicData?.state == 0
? "待检查"
: basicData?.state == 1
? "执法中"
: basicData?.state == 2
? "待整改"
@ -122,7 +124,7 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 0 && basicData?.state != 4">
<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
>驳回,请尽快整改</el-button
>
@ -464,6 +466,7 @@ onMounted(() => {});
box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
border-radius: 8px 8px 8px 8px;
padding: 15px 20px;
overflow: hidden;
.content-title {
@include title;
margin-top: 45px;

3
src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
View File

@ -113,7 +113,8 @@ const columns: ColumnProps[] = [
{ label: "审批中", value: 1 },
{ label: "资料验收通过", value: 2 },
{ label: "已驳回", value: 3 },
{ label: "已验收通过", value: 4 }
{ label: "已验收通过", value: 4 },
{ label: "已重新发起", value: 5 }
]
},
{ prop: "operation", label: "操作", fixed: "right" }

8
src/views/goverment/laborRealName/attendanceMonitor/index.vue
View File

@ -237,7 +237,12 @@ onMounted(() => {
.table-box {
.statistics-top {
display: flex;
justify-content: space-between;
// justify-content: space-between;
flex-wrap: wrap;
.sta-item:not(:last-child) {
margin-right: 17px;
margin-bottom: 10px;
}
.sta-item {
width: 405px;
min-width: 320px;
@ -280,6 +285,7 @@ onMounted(() => {
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
}
}

1
src/views/goverment/laborRealName/memberSelect/index.vue
View File

@ -117,6 +117,7 @@ onMounted(() => {
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
}
}

1
src/views/goverment/laborRealName/projectSelect/index.vue
View File

@ -132,6 +132,7 @@ onMounted(() => {
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
}
}

1
src/views/goverment/progressManagement/divisionsAndISubItems/index.scss
View File

@ -62,6 +62,7 @@
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
span {
color: var(--el-menu-text-color);

7
src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
View File

@ -104,7 +104,7 @@
<span v-else>{{ row.remark }}</span>
</template>
</el-table-column>
<el-table-column align="center" width="180" label="操作" v-if="title != '详情'">
<el-table-column align="center" fixed="right" width="180" label="操作" v-if="title != '详情'">
<template #default="scope">
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@ -232,7 +232,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="100" label="操作">
<el-table-column align="center" fixed="right" width="100" label="操作">
<template #default="{ row }">
<el-button type="primary" link @click="handleLookItem(row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@ -370,6 +370,9 @@ const confirm = async () => {
annexList: documentData.value,
engineeringSn: globalStore.engineeringSn
};
if (props.title == "重新发起") {
requestData.id = props.relativeId;
}
requestData.detailList.map(item => {
delete item.id;
});

3
src/views/project/engineeringAcceptance/acceptanceApply/index.vue
View File

@ -84,7 +84,8 @@ const columns: ColumnProps[] = [
{ label: "审批中", value: 1 },
{ label: "资料验收通过", value: 2 },
{ label: "已驳回", value: 3 },
{ label: "已验收通过", value: 4 }
{ label: "已验收通过", value: 4 },
{ label: "已重新发起", value: 5 }
]
},
{ prop: "operation", label: "操作", fixed: "right" }

1
src/views/project/progressManagement/subItemManagement/index.vue
View File

@ -540,6 +540,7 @@ onMounted(() => {
:deep(.el-card__body) {
display: flex;
align-items: center;
flex-wrap: wrap;
}
}
}