Merge branch 'master' into 'master'

优化新增病房科室

See merge request lighter/vue-intergration-platform!149

src/views/dictionary/personnel/DeptRoomDict.vue

@@ -184,6 +184,7 @@ const handleCurrentChangeSmall = (val) => {
 }
 
 const roomDeptData = ref([])
+const allRoomDeptData = ref([])
 const smallDeptData = ref([])
 
 const text = ref('')
@@ -191,6 +192,7 @@ onMounted(() => {
   nextTick(() => {
     queryUnitCode('')
     queryRoomDept()
+    queryAllRoomDept()
   })
 })
 
@@ -215,6 +217,16 @@ const deptChange = async (row) => {
   }
 }
 
+const queryAllRoomDept = () => {
+  selectRoomDept("")
+      .then((res) => {
+        allRoomDeptData.value = res
+      })
+      .catch(() => {
+        allRoomDeptData.value = []
+      })
+}
+
 // 查询病房科室字典
 const queryRoomDept = () => {
   selectRoomDept(text.value)
@@ -347,16 +359,17 @@ const updateRoomDept = (row) => {
   }
 
   if (row.isAdd) {
-    let fe = 0
-    for (let num in roomDeptData.value) {
-      if (roomDeptData.value[num].wardCode === row.wardCode && roomDeptData.value[num].deptCode === row.deptCode) {
-        fe++
+    let fe = false
+    for (let num in allRoomDeptData.value) {
+      if (allRoomDeptData.value[num].wardCode.trim() === row.wardCode && allRoomDeptData.value[num].deptCode.trim() === row.deptCode) {
+        fe = true
+        break
       }
     }
-    if (fe === 2) {
+    if (fe) {
       ElMessage({
         type: "warning",
-        message: "存在重复的病房科室，请核对!",
+        message: "存在重复的病房科室，不能新增!",
         duration: 2500,
         showClose: true,
       });