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

Merge pull request 'dd' (#546) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/546
This commit is contained in:
odjbin
2024-07-14 08:43:41 +00:00
parent f1237de72a 8791d220e6
commit 02bf07f4da
33 changed files with 600 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,10 +4,10 @@
<baseTitle :title="getName()+'-上传附件'"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile" />
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
<fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
<el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-card>

11
src/views/project-management/implementation/account.vue
View File

@@ -94,7 +94,6 @@ const schema = computed(() => {
const baseForm = ref()
const tableIns = ref()
const btns = ref([
{name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},
{name: '导出', key: 'export', color: '#DED0B2', auth: ''}
])
const searchConfig = reactive([
@@ -221,10 +220,7 @@ const tableConfig = reactive({
},
btns: btns.value
})
if (route.query.state !== '4') {
btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''})
}
const exportIds=ref([])
// const exportIds=ref([])
const selectionChange=(data)=>{
console.log('data',data)
console.log(' data.forEach(item=>item.id)', data.forEach(item=>item.id))
@@ -248,6 +244,9 @@ const init = async () => {
const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
if (code===1000) {
tableData.value = data
if(!data.view){
btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''},{name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},)
}
baseForm.value.setValues(data)
}
// if (code !== 1000) {
@@ -283,7 +282,7 @@ const handleUploadFee = () => {
}
const exportExcelHandler = () => {
console.log('exportIds.value',exportIds.value)
// console.log('exportIds.value',exportIds.value)
let data = {
projectId: route.query.id
}

3
src/views/project-management/implementation/index.vue
View File

@@ -347,8 +347,7 @@ const handleStandingBook = (row) => {
router.push({
name: 'Implementation/account',
query: {
id: row.projectId,
state:row.state
id: row.projectId
}
})
}

4
src/views/project-management/implementation/upload.vue
View File

@@ -19,10 +19,10 @@
<baseTitle title="其他文件"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
<fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
<el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-card>

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

@@ -33,10 +33,10 @@
<baseTitle title="关联项目"></baseTitle>
<el-col :span="24">
<el-form-item>
<fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
<fvTable style="width: 100%;max-height:162px" height="162" v-if="showTable" :tableConfig="projectTable"
:data="formData.projects" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
<el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-form-item>
@@ -44,10 +44,10 @@
<baseTitle title="附件列表"></baseTitle>
<el-col :span="24">
<el-form-item>
<fvTable style="width: 100%;max-height: 300px;" height="300" v-if="showTable" :tableConfig="fileTable"
<fvTable style="width: 100%;max-height: 162px;" height="162" v-if="showTable" :tableConfig="fileTable"
:data="formData.files" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
<el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-form-item>