From f7df178feabf0ee7f0419c6b68fc88b59e7d24bf Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 3 Sep 2021 10:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=9B=AE=E5=BD=95=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D=E7=A7=B0=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/DataDirectoryModule.vue           | 29 ++++++++++++++++++-
 .../modules/WorkingGroupMemberUnitModule.vue  |  6 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/views/dataNetworkDiskManagement/dataDirectory/modules/DataDirectoryModule.vue b/src/views/dataNetworkDiskManagement/dataDirectory/modules/DataDirectoryModule.vue
index 7c5ce1b..8feb923 100644
--- a/src/views/dataNetworkDiskManagement/dataDirectory/modules/DataDirectoryModule.vue
+++ b/src/views/dataNetworkDiskManagement/dataDirectory/modules/DataDirectoryModule.vue
@@ -44,6 +44,7 @@
 <script>
 import pick from 'lodash.pick'
 import { httpAction } from '../../../../api/manage'
+import { duplicateCheck } from '../../../../api/api'
 
 export default {
   name: 'DataDirectoryModule',
@@ -62,7 +63,7 @@ export default {
       },
       validatorRules: {
         name: {
-          rules: [{ required: true, message: '请输入文件夹名称' }],
+          rules: [{ required: true, validator: this.checkDirectoryName }],
           validateTrigger: 'blur'
         },
         parentId: {
@@ -134,6 +135,32 @@ export default {
     },
     handleCancle() {
       this.model = {}
+    },
+    /**
+     * 文件夹名称唯一性校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkDirectoryName(rules, value, callback) {
+      if (value) {
+        if (!this.model.id) {
+          const params = {
+            confusionCode: 'pay_data_directory',
+            fieldVal: value
+          }
+          duplicateCheck(params).then(res => {
+            if (res.success) {
+              callback(res.message)
+            } else {
+              callback('文件夹名称已存在')
+            }
+          })
+          return
+        }
+        callback()
+      }
+      callback('请输入文件夹名称')
     }
   }
 }
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 1c316ca..3d88081 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -389,10 +389,12 @@ export default {
      */
     companyChange(value) {
       this.selectedCompany = value
-      this.model.contactsId = undefined
+      this.model.contactsIdOne = undefined
+      this.model.contactsIdTwo = undefined
+      this.model.contactsIdThree = undefined
       this.model.mailContactsId = undefined
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId'))
+        this.form.setFieldsValue(pick(this.model, 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId'))
       })
     },
     /**