Merge pull request 'fix : 修复项目立项校验' (#587) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/587
This commit is contained in:
2024-07-18 04:27:39 +00:00
2 changed files with 23 additions and 11 deletions

View File

@@ -59,8 +59,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<!-- :required="preProcessRequired"-->
<el-form-item label="前置流程" prop="preProcess" label-width="125">
<el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
<el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
{{ localFormData.preProcess&&localFormData.preProcess.length>0 ? '更改' :sessionParams.preProcess&&sessionParams.preProcess.length>0 ? '更改' : '请选择' }}
</el-button>
@@ -573,12 +572,17 @@ const getFileParam = (item) => {
const handleSubmit = async () => {
if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
if (localFormData.value.preProcess == undefined) {
ElNotification({
title: '提示',
message: '请选择前置流程!',
type: 'error'
})
return;
if(JSON.parse(localStorage.getItem('preProcess'))?.length>0){
}else {
ElNotification({
title: '提示',
message: '请选择前置流程!',
type: 'error'
})
return;
}
}
}

View File

@@ -222,10 +222,18 @@ const handleClick = (item, data) => {
const noSelected = (selectItem) => {
//右侧的x
for (let i = 0; i < selectList.value.length; i++) {
if (selectList.value[i].value === selectItem.value) {
selectList.value.splice(i, 1);
break;
if(selectItem.value){
if (selectList.value[i].value === selectItem.value) {
selectList.value.splice(i, 1);
break;
}
}else{
if (selectList.value[i].id === selectItem.id) {
selectList.value.splice(i, 1);
break;
}
}
}
selectItem.selected = false;
};