From 094474b68012df62758be94d88eaf7113cbc7ef0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 18 Jul 2024 12:19:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 20 +++++++++++--------
 .../workflow/process/common/UserPicker.vue    | 14 ++++++++++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 3dec80d..074d0a7 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -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;
+      }
+
     }
   }
 
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index b1ad392..64b3dcc 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -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;
 };