From 526d5d78829452142f5ae5ae1e8ca799069ca277 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Tue, 7 May 2024 09:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=AE=9A=E9=9B=86=E6=94=B9=E9=80=A0?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selectedProject/selectedProject.data.ts   |  3 ++-
 .../qms/basicDataManage/selectedSet/index.vue | 27 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts b/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
index 875da6e3d..12f0117a7 100644
--- a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
+++ b/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
@@ -10,6 +10,7 @@ export const SelectedProjectRules = reactive({
   // dictionaryTypeAndCode: [required],
   estimateCode: [required],
   defectLevel: [required],
+  dictionaryValue: [required]
 })
 
 export const SelectedProject = useCrudSchemas(reactive<CrudSchema[]>([
@@ -28,7 +29,7 @@ export const SelectedProject = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '选定集',
+    label: '字典项',
     field: 'dictionaryValue',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/basicDataManage/selectedSet/index.vue
index 9047a67c1..b302283f1 100644
--- a/src/views/qms/basicDataManage/selectedSet/index.vue
+++ b/src/views/qms/basicDataManage/selectedSet/index.vue
@@ -108,6 +108,7 @@ const tableData = ref([])
 const routeName = ref()
 const selectDictType = ref()
 const optionsList = ref()
+const existValue = ref([])
 routeName.value = route.name
 const tableColumns = ref(SelectedSet.allSchemas.tableColumns)
 
@@ -377,16 +378,37 @@ const validateNotRepetition = (data) => {
 };
 
 
-const detailValidate = (data) => {
+const detailValidate = (formType,data) => {
   let tag = true;
+  existValue.value.forEach(item=>{
+    if(data.dictionaryValue == item.dictionaryValue){
+      message.warning("选定集字典项不能重复！")
+      tag = false;
+    }
+  })
   return tag
 }
 
 const detailOpenForm = (type, row, masterParmas) => {
+  let param = {
+    masterId : masterParmas.masterId
+  }
   if(type == 'create'){
+    SelectedProjectApi.getSelectedProjectNoPage(param).then(res => {
+      if(res.length > 0){
+        existValue.value = res
+      }
+    })
   }else if('update'){
+    SelectedProjectApi.getSelectedProjectNoPage(param).then(res => {
+      if(res.length > 0){
+        existValue.value = res.filter(item=>{
+          return item?.id != row.id
+        })
+      }
+    })
+    
   }
-  
 }
 
 
@@ -396,6 +418,7 @@ const detailBasiFormOnChange = (field,val,detailFormRef) => {
 }
 
 const formSelectChange = (a,b,c,d) => {
+
 }
 
 /** 初始化 **/