Merge pull request 'dengjie commit : 部门选择' (#8) from DJ into master

Reviewed-on: http://git.hchyun.com/clay/workflow-engine-web/pulls/8

flowable-engine-web/src/components/common/DeptPicker.vue

@@ -153,7 +153,7 @@ export default {
           }
         }
       }
-      // this._value = this.selectList
+      this._value = this.selectList
     },
 
     //左侧没有选择框时,点击tree-item
@@ -177,6 +177,7 @@ export default {
         check.checked=true
         this.selectList=[node];
       }
+      this._value = this.selectList
     },
     //左侧无选择框时,右侧显示×
     noSelected(selectItem) {
@@ -209,8 +210,8 @@ export default {
     },
     //确定按钮
     selectConfirm() {
-      this.$emit("input", this.selectList)
+      this.$emit("ok", this.selectList);
-      // this.$emit("dengjie")
+      this.visible = false;
     }
   }
 };

flowable-engine-web/src/views/common/form/components/DeptPicker.vue

@@ -7,14 +7,16 @@
     <template v-else>
       <template v-if="perm === 'E'">
         <el-button icon="iconfont icon-map-site" type="primary" size="mini" round @click="selectDept"> 选择部门</el-button>
-        <org-picker type="dept" :multiple="multiple" ref="deptPicker" :selected="_value" @ok="selected"/>
+        <org-picker type="dept" :multiple="multiple" ref="deptPicker" :v-model="select" :selected="_value" @ok="selected"/>
         <span class="placeholder"> {{placeholder}}</span>
         <div style="margin-top: 5px">
-          <el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.name}}</el-tag>
+          <el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.deptName}}</el-tag>
         </div>
       </template>
       <template v-else-if="perm === 'R'">
-        {{_value}}
+        <div v-for="(dept, i) in _value" :key="i">
+          {{dept.deptName}}
+        </div>
       </template>
     </template>
   </div>
@@ -58,9 +60,9 @@ export default {
     selectDept() {
       this.$refs.deptPicker.showDeptPicker()
     },
-    selected(values){
+    selected(select){
-      this.showOrgSelect = false
+      // this.showOrgSelect = false
-      this._value = values
+      this._value = select
     },
     delDept(i){
       this._value.splice(i, 1)