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

fix : 修复详情排版

Browse Source
This commit is contained in:
odjbin
2024-08-06 18:26:47 +08:00
parent 1b1e0a8174
commit c61b06e8b2
8 changed files with 72 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM nginx
FROM 10.7.127.190:38080/nginx:latest
RUN rm -rf /etc/nginx/conf.d/default.conf
RUN rm -rf /etc/nginx/nginx.conf

20
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -1,9 +1,8 @@
<template>
<div v-loading="loading">
<div v-loading="loading" :style="type==='singleDetail'?'padding: 0 30px':''">
<baseTitle title="需求征集信息" v-if="type!=='singleDetail'"></baseTitle>
<el-form :model="formData" >
<el-row gutter="20">
<!-- v-if="type==='singleDetail'"-->
<el-row gutter="20" style="margin-left: 5px">
<el-col :span="6">
<el-form-item label="征集名称">
<span>{{ formData.requirementName }}</span>
@@ -34,24 +33,17 @@
</div>
</el-form-item>
</el-col>
<el-col :span="24" style="margin-bottom: -15px">
<el-col :span="24" style="margin-bottom: -15px">
<el-form-item label="征集说明">
<div v-if="formData.collectExplain" v-html="formData.collectExplain">
</div>
<div v-else>--</div>
</el-form-item>
</el-col>
<!-- <el-col :span="24" style="margin-top: -15px;margin-bottom: -15px">-->
<!-- <baseTitle title="征集说明"></baseTitle>-->
<!-- <el-form-item>-->
<!-- <el-card style="width: 100%">-->
<!-- <div v-html="formData.collectExplain">-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="24">
<baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"> </baseTitle>
<baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表" style="margin-bottom: 0"></baseTitle>
<file-component title="" tag="需求征集"
v-model:value="formData.fileList" :processViewer="processViewer"
:file-list-show="fileListShow"/>

15
src/components/DetailComponent/FileComponent.vue
View File

@@ -196,4 +196,19 @@ watch(() => props.processViewer, (newVal) => {
:deep(.el-table--fit ) {
height: 162px !important;
}
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

16
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -317,22 +317,6 @@ getFundOptions()
</script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
.detail-block {
overflow-x: hidden;
overflow-y: auto;

15
src/components/DetailComponent/singleFileComponent.vue
View File

@@ -192,4 +192,19 @@ watch(() => props.processViewer, (newVal) => {
:deep(.el-table--fit ) {
height: 80px !important;
}
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

2
src/views/project-demand/requirement/detail.vue
View File

@@ -1,5 +1,5 @@
<template>
<baseTitle title="需求征集详情"></baseTitle>
<baseTitle title="需求征集详情" style="margin-left: 30px"></baseTitle>
<collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
:fileListShow="fileListShow"
:processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>

32
src/views/project-demand/requirement/index.vue
View File

@@ -1,5 +1,5 @@
<template>
<el-form ref="formRef" :model="selectForm" class="search-form" :rules="rules" style="margin-top: 18px;">
<el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;">
<el-row gutter="20">
<el-col :span="5">
<el-form-item prop="requirementName" label="征集名称">
@@ -8,7 +8,7 @@
</el-col>
<el-col :span="5" :offset="1">
<el-form-item prop="collectType" label="征集类型">
<el-select v-model="selectForm.collectType" ref="collectTypeSelectRef" placeholder="请选择征集类型" clearable filterable
<el-select v-model="selectForm.collectType" ref="collectTypeSelectRef" placeholder="请选择征集类型" clearable filterable remote
@change="getList">
<el-option
v-for="item in cacheStore.getDict('collect_type')"
@@ -21,7 +21,7 @@
</el-col>
<el-col :span="5" :offset="1">
<el-form-item prop="state" label="状态">
<el-select v-model="selectForm.state" placeholder="请选择状态" clearable filterable @change="getList">
<el-select v-model="selectForm.state" placeholder="请选择状态" clearable filterable @change="getList" remote @visible-change="selectOptionVisibleChange">
<el-option
v-for="item in stateOption"
:key="item.value"
@@ -216,6 +216,9 @@ const tableConfig = reactive({
params: {}
})
const selectOptionVisibleChange=(value)=>{
console.log('value',value)
}
const getStatePerm = () => {
getRequirementStatePerm().then(res => {
stateOption.value=res.data
@@ -288,3 +291,26 @@ const headBtnClick = (key) => {
}
}
</script>
<style lang="scss">
.select-form{
.el-select {
.el-select__wrapper{
.el-select__suffix::before {
content: "";
width: 6px;
height: 6px;
border: solid #a8abb2;
border-width: 0 0 1px 1px;
transform: translate(-50%, -50%) rotate(-45deg);
}
}
.is-focused {
.el-select__suffix::before {
margin-top: 10px;
transform:translate(-50%, -50%) rotate(-225deg)!important;
}
}
}
}
</style>

9
src/views/project-management/mobledetail/CollectionDetailMoblie.vue
View File

@@ -1,7 +1,7 @@
<template>
<div v-loading="loading">
<el-form :model="formData" >
<el-row>
<el-form :model="formData">
<el-row style="margin-left: 15px">
<el-col :span="24" v-if="type==='singleDetail'">
<el-form-item label="征集名称">
<span>{{ formData.requirementName }}</span>
@@ -22,7 +22,6 @@
<span>{{ formData.specialFund }}</span>
</el-form-item>
</el-col>
<el-col :span="24" v-if="type==='singleDetail'">
<el-form-item label="征集公司">
<span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
@@ -33,7 +32,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-bottom: -15px">
<el-col :span="24" style="margin-bottom: -15px">
<el-form-item label="征集说明">
<div v-if="formData.collectExplain" v-html="formData.collectExplain">
</div>
@@ -49,6 +48,8 @@
<!-- </el-card>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="24">
<baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
<file-component title="" tag="需求征集" :fullscreen="true"