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

Merge pull request 'master' (#756) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/756
This commit is contained in:
odjbin
2024-09-08 12:51:36 +00:00
parent a0906ed5c7 e52efa0a45
commit c43ea8be87
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/AttachmentUpload.vue
View File

@@ -370,8 +370,12 @@ const handleDelete = (row, type) => {
_singleFileValue.value.splice(_singleFileValue.value.findIndex((item) => item.fileId === row.fileId), 1); _singleFileValue.value.splice(_singleFileValue.value.findIndex((item) => item.fileId === row.fileId), 1);
isSingleFile.value = false isSingleFile.value = false
} else { } else {
isHaveOneFile.value=false
allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1); allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
if(allFileList.value&&allFileList.value?.length==0){
isHaveOneFile.value=false
}else{
isHaveOneFile.value=true
}
} }
} }
}); });

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

@@ -480,7 +480,6 @@ const getFileParam = (item) => {
} }
} }
const handleSubmit = async () => { const handleSubmit = async () => {
console.log(' projectPersonUserList.value', projectPersonUserList.value)
let files = [] let files = []
if (props.mode === 'resubmit') { if (props.mode === 'resubmit') {
attachment.value.allFileList.forEach(item => { attachment.value.allFileList.forEach(item => {
@@ -491,6 +490,7 @@ const handleSubmit = async () => {
files.push(getFileParam(item)) files.push(getFileParam(item))
}) })
} }
// console.info("🚀 ~method:handleSubmit -----", files,attachment.value.isHaveOneFile)
if (!attachment.value.isHaveOneFile) { if (!attachment.value.isHaveOneFile) {
attachment.value.validate() attachment.value.validate()
ElNotification({ ElNotification({
@@ -510,7 +510,7 @@ const handleSubmit = async () => {
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
requirementId: route.query.id, requirementId: route.query.id,
fileList: files, fileList: files,
singleFile: attachment.value.singleFile, // singleFile: attachment.value.singleFile,
projectId: projectId.value, projectId: projectId.value,
preProcess: JSON.stringify(localFormData.value.preProcess) preProcess: JSON.stringify(localFormData.value.preProcess)
} }

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

@@ -232,7 +232,8 @@ const searchConfig = reactive([
prop: 'researchPersonnel', prop: 'researchPersonnel',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入研发人员查询' placeholder: '请输入研发人员查询',
clearable: true,
} }
}, },
{ {

38
src/views/project-management/implementation/updateTable.vue
View File

@@ -18,28 +18,30 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="startTime" label="项目开始时间"> <el-form-item prop="startTime" label="项目开始时间">
<el-date-picker <!-- <el-date-picker-->
v-model="tableForm.startTime" <!-- v-model="tableForm.startTime"-->
type="date" <!-- type="date"-->
format="YYYY-MM-DD" <!-- format="YYYY-MM-DD"-->
value-format="YYYY-MM-DD" <!-- value-format="YYYY-MM-DD"-->
placeholder="选择项目开始时间" <!-- placeholder="选择项目开始时间"-->
> <!-- >-->
</el-date-picker> <!-- </el-date-picker>-->
<span>{{ tableForm.startTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''"> <el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''">
<el-date-picker <!-- <el-date-picker-->
v-model="tableForm.endTime" <!-- v-model="tableForm.endTime"-->
type="date" <!-- type="date"-->
format="YYYY-MM-DD" <!-- format="YYYY-MM-DD"-->
value-format="YYYY-MM-DD" <!-- value-format="YYYY-MM-DD"-->
placeholder="选择项目预计持续时间" <!-- placeholder="选择项目预计持续时间"-->
:disabled="!tableForm.startTime" <!-- :disabled="!tableForm.startTime"-->
:disabled-date="disabledDate" <!-- :disabled-date="disabledDate"-->
> <!-- >-->
</el-date-picker> <!-- </el-date-picker>-->
<span>{{ tableForm.endTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">