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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
clay
2024-06-28 21:54:34 +08:00
parent 58d5efb655 c199ecb9fb
commit 16c4e07a86
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/AttachmentUpload.vue
View File

@@ -19,7 +19,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="其他文件">
<el-card style="width: 100%">
<el-card style="width: 100%;box-shadow: none">
<file-upload @getFile="getOtherFile"/>
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
:data="allFileList" :isSettingCol="false" :pagination="false">

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

@@ -28,7 +28,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="formData.isSpecialFund">
<el-form-item label="专项资金">
<el-form-item label="专项资金名称">
<span>{{ formData.specialFund }}</span>
</el-form-item>
</el-col>

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

@@ -8,7 +8,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
<span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
</el-form-item>
</el-col>

4
src/views/project-demand/requirement/add.vue
View File

@@ -57,7 +57,7 @@
</el-col>
<el-col :span="6" v-if="formData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFundId">
<el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
<el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
<el-option
v-for="item in specialFundOption"
:key="item.value"
@@ -171,7 +171,7 @@ const rules = reactive({
companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}],
})
const tableConfig = reactive({

3
src/views/project-management/filing/attachment.vue
View File

@@ -116,7 +116,8 @@ const upload = () => {
name: 'Filing/upload',
query: {
id: route.query.id,
name: activeName.value
name: activeName.value,
requirementId:requirementId.value
}
})
}

3
src/views/project-management/filing/upload.vue
View File

@@ -162,7 +162,8 @@ const handleSubmit = async () => {
await router.push({
name: 'Filing/attachment',
query:{
id: route.query.id
id: route.query.id,
requirementId:route.query.requirementId
}
})
}

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

@@ -28,7 +28,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="formData.isSpecialFund">
<el-form-item label="专项资金">
<el-form-item label="专项资金名称">
<span>{{ formData.specialFund }}</span>
</el-form-item>
</el-col>

8
src/views/project-management/mobledetail/SummaryDetailMoblie.vue
View File

@@ -8,7 +8,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
<span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
</el-form-item>
</el-col>
@@ -132,10 +132,10 @@
</el-form-item>
</el-col>
<el-col :span="24">
<file-component
title="需求上报附件"
<file-component
title="需求上报附件"
tag="需求上报"
v-model:value="localFormData.fileList"
v-model:value="localFormData.fileList"
:processViewer="processViewer"
:file-list-show="fileListShow"
labelAlign="top"