From 0efcaa1947e92f1804742ced640ccf27aadb67ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 12 Mar 2020 16:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BA=BA=E5=91=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                              | 18 ++++++++++++++++++
 .../custom/gridoperatorinfo-add-or-update.vue  | 18 ++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf49f747..bcdd264e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9095,6 +9095,24 @@
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
       "dev": true
     },
+    "jsonp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
+      "integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
+      "requires": {
+        "debug": "^2.1.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "http://r.cnpmjs.org/jsprim/download/jsprim-1.4.1.tgz",
diff --git a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
index 759949d9..c345e7b5 100755
--- a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
+++ b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
@@ -35,11 +35,17 @@
                   placeholder="联系电话"></el-input>
       </el-form-item>
       <el-form-item label="所属网格"
-                    prop="allDeptIds">
-        <el-cascader v-model="dataForm.allDeptIds"
+                    v-if="!dataForm.id"
+                    prop="selectedDeptIds">
+        <el-cascader v-model="dataForm.selectedDeptIds"
                      :options="options"
+                     :props="{ multiple: true }"
                      filterable
-                     clearable></el-cascader>
+                     collapse-tags></el-cascader>
+      </el-form-item>
+      <el-form-item label="所属机构"
+                    v-if="dataForm.id">
+        <div>{{dataForm.allDeptNames}}</div>
       </el-form-item>
       <el-form-item label="网络职责"
                     prop="dutyCategoryId">
@@ -117,7 +123,7 @@ export default {
         dutyCategoryId: '',
         showFlag: '',
         remark: '',
-        allDeptIds: ''
+        selectedDeptIds: []
       },
       sexFlagArr: [
         { dictValue: '1', dictName: '男' },
@@ -144,7 +150,7 @@ export default {
         dutyCategoryId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        allDeptIds: [
+        selectedDeptIds: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         faceImg: [
@@ -167,7 +173,7 @@ export default {
         if (this.dataForm.id) {
           this.getInfo()
         } else {
-          this.dataForm.allDeptIds = []
+          this.dataForm.selectedDeptIds = []
         }
       })
     },