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

Merge pull request 'refactor(expense-management): 优化数字输入和附件处理' (#1020) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1020
This commit is contained in:
odjbin
2025-06-07 01:30:52 +00:00
parent 14c6ed1168 70d94f3c1d
commit e44380c000
3 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/components/DetailComponent/ProjectApply.vue
View File

@@ -6,88 +6,88 @@
<el-col :span="6">
<!-- label-width="106"-->
<el-form-item label="实际经费预算(元)" prop="actualEconomicEstimate" label-width="130">
<el-input v-model="localFormData.actualEconomicEstimate" placeholder="请输入实际经费预算">
</el-input>
<el-input-number v-model="localFormData.actualEconomicEstimate" placeholder="请输入实际经费预算" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" v-if="isSpecialFund">
<!-- label-width="106" -->
<el-form-item label="实际专项资金(元)" prop="specialFundAmount" label-width="140">
<el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
</el-input>
<el-input-number v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="title==='check'">
<el-col :span="6">
<el-form-item label="实际专利(项)" prop="actualNewPatent" label-width="130">
<el-input v-model="localFormData.actualNewPatent" placeholder="请输入实际专利数量" style="margin-right: 20px">
</el-input>
<el-input-number v-model="localFormData.actualNewPatent" placeholder="请输入实际专利数量" style="margin-right: 20px" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -10px">
<el-form-item label="实际软件著作权(项)" prop="actualSoftwareCopyright" label-width="150">
<el-input v-model="localFormData.actualSoftwareCopyright" placeholder="请输入实际软件著作权数量">
</el-input>
<el-input-number v-model="localFormData.actualSoftwareCopyright" placeholder="请输入实际软件著作权数量":controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -5px">
<el-form-item label="实际技术标准(项)" prop="actualTechnicalNorms" label-width="150">
<el-input v-model="localFormData.actualTechnicalNorms" placeholder="请输入实际技术标准数量">
</el-input>
<el-input-number v-model="localFormData.actualTechnicalNorms" placeholder="请输入实际技术标准数量":controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="实际新产品(项)" prop="actualNewProduct" label-width="160" style="margin-right: -10px">
<el-input v-model="localFormData.actualNewProduct" placeholder="请输入实际新产品数量" >
</el-input>
<el-input-number v-model="localFormData.actualNewProduct" placeholder="请输入实际新产品数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="实际新工艺(项)" prop="actualNewProcess" label-width="130" >
<el-input v-model="localFormData.actualNewProcess" placeholder="请输入实际新工艺数量" style="margin-right: 20px">
</el-input>
<el-input-number v-model="localFormData.actualNewProcess" placeholder="请输入实际新工艺数量" style="margin-right: 20px" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -10px">
<el-form-item label="实际新装置(项)" prop="actualNewDevice" label-width="150">
<el-input v-model="localFormData.actualNewDevice" placeholder="请输入实际新装置数量">
</el-input>
<el-input-number v-model="localFormData.actualNewDevice" placeholder="请输入实际新装置数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -5px">
<el-form-item label="实际新材料(项)" prop="actualNewMaterials" label-width="150">
<el-input v-model="localFormData.actualNewMaterials" placeholder="请输入实际新材料数量">
</el-input>
<el-input-number v-model="localFormData.actualNewMaterials" placeholder="请输入实际新材料数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="实际计算机软件(项)" prop="actualComputerSoftware" label-width="160" style="margin-right: -10px">
<el-input v-model="localFormData.actualComputerSoftware" placeholder="请输入实际计算机软件数量">
</el-input>
<el-input-number v-model="localFormData.actualComputerSoftware" placeholder="请输入实际计算机软件数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="实际论文论著(项)" prop="actualThesis" label-width="130" style="margin-right: 20px">
<el-input v-model="localFormData.actualThesis" placeholder="请输入实际论文论著数量">
</el-input>
<el-input-number v-model="localFormData.actualThesis" placeholder="请输入实际论文论著数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -10px">
<el-form-item label="实际研究报告(项)" prop="actualResearchReport" label-width="150">
<el-input v-model="localFormData.actualResearchReport" placeholder="请输入实际研究报告数量">
</el-input>
<el-input-number v-model="localFormData.actualResearchReport" placeholder="请输入实际研究报告数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-left: -5px">
<el-form-item label="实际商标(项)" prop="actualTrademark" label-width="150">
<el-input v-model="localFormData.actualTrademark" placeholder="请输入实际商标数量">
</el-input>
<el-input-number v-model="localFormData.actualTrademark" placeholder="请输入实际商标数量" :controls="false">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="实际其他(项)" prop="actualOther" label-width="130" style="margin-right: 10px">
<el-input rows="4" type="textarea" v-model="localFormData.actualOther" placeholder="请输入实际其他项">
<el-input rows="4" type="textarea" v-model="localFormData.actualOther" placeholder="请输入实际其他项" >
</el-input>
</el-form-item>
</el-col>
@@ -202,8 +202,8 @@
<el-dialog v-if="showPreTable" title="前置流程" v-model="showPreTable" width="80%">
<el-form :model="preProcessForm" inline @submit.prevent="searchPreProcess">
<el-form-item label="请求名称">
<el-input v-model="preProcessForm.requestName" placeholder="请输入请求名称" clearable>
</el-input>
<el-input-number v-model="preProcessForm.requestName" placeholder="请输入请求名称" clearable>
</el-input-number>
</el-form-item>
<el-form-item>
<el-button color="#DED0B2" @click="searchPreProcess">搜索</el-button>

18
src/components/DetailComponent/ProjectAttachment.vue
View File

@@ -308,6 +308,7 @@ const compositeParam = (item) => {
}
const getFile = (val) => {
console.log('上传文件', val)
fileList.value=getLocalList()
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
localStorage.setItem(`implementAllFileList-${route.query.projectId}`, JSON.stringify(fileList.value))
@@ -347,8 +348,8 @@ const handleSubmit = async () => {
// otherAttachmentList.value.push(item)
// })
getAttachmentList()
fileList.value = []
}
fileList.value = []
// changeFileList('all',true)
}
}
@@ -372,7 +373,20 @@ const changeFileList = (tag, flag) => {
// targetState: "30",
// }
} else {
otherAttachmentList.value = allFiles.value.filter(item1 => item1.tag == tag)
const filw = getLocalList().filter(item1 => item1.tag === tag);
const filteredAllFiles = allFiles.value.filter(item1 => item1.tag === tag);
// 使用 fileId 作为唯一标识进行去重
const seen = new Set();
const uniqueFiles = [...filteredAllFiles, ...filw].filter(item => {
if (!seen.has(item.fileId)) {
seen.add(item.fileId);
return true;
}
return false;
});
otherAttachmentList.value = uniqueFiles;
// params = {
// targetId: route.query.projectId,
// targetState: "30",

4
src/views/expense-management/share-detail/add.vue
View File

@@ -176,8 +176,8 @@ const selectProject=(row,index)=>{
//先选择人员, 再选择项目: 再添加一行,重复操作
const projectIdArray = formData.value.tableData.map(item => item.projectId)
const researchPersonnelIdArray = formData.value.tableData.map(item => item.researchPersonnelId)
// console.log('projectIdArray',projectIdArray)
// console.log('researchPersonnelIdArray',researchPersonnelIdArray)
console.log('projectIdArray',projectIdArray)
console.log('researchPersonnelIdArray',researchPersonnelIdArray)
const projectNumObj = getSelectProjectAndResearchPersonnelNum(projectIdArray)
const researchPersonnelNumObj = getSelectProjectAndResearchPersonnelNum(researchPersonnelIdArray)
let repeatProjectName=getProjectName(row.projectId)