@sy-common/organize-select-help 1.0.0-beta.3 → 1.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sy-common/organize-select-help",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/readme.md

@@ -0,0 +1,25 @@
+{
+    //组织节点
+    orgList:{
+        includeLevel:true/false,//是否包含下级组织节点
+        orgUnitId：id,  //组织id
+        orgNodeName:''//组织名称
+    },
+    //岗位节点
+    postList:{
+        includeLevel:true/false,//是否包含下级组织节点
+        orgUnitId：id,  //组织id
+        orgNodeName:''//组织名称
+        positionId：''//岗位
+        positionName：''//岗位名称
+    },
+    人员节点
+    staffList:{
+        name：'名称’//名称
+        orgNodeName：‘’//
+    }
+
+}
+
+
+v-model双向绑定是否显示帮助框

package/src/index.vue

@@ -84,7 +84,7 @@
             </Tabs>
           </div>
           <div class="form-content">
-            <p>已选择条件 <span class="num">(1)</span></p>
+            <p>已选择条件 <span class="num">（{{getCheckTypenum}}）</span></p>
             <div class="node-list">
               <!--              组织节点条件：-->
               <div>
@@ -95,7 +95,7 @@
                 <div class="group-list-content">
                   <p class="list-item flex-r-bt" v-for="(item,index) in orgList" :ket="index">
                     <span>{{ item.title }}</span>
-                    <img src="./assets/delete.png" alt="" @click="clearOrgByIndex(index)">
+                    <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearOrgByIndex(index)">
                   </p>
                   <p style="color:#CCCCCC" class="list-item" v-if="!orgList.length">未选择组织节点</p>
                 </div>
@@ -109,7 +109,7 @@
                 <div class="group-list-content">
                   <p class="list-item flex-r-bt" v-for="(item,index) in postList">
                     <span>{{item.positionName}}-{{item.title}}</span>
-                    <img src="./assets/delete.png" alt="" @click="clearPostByIndex(index)">
+                    <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearPostByIndex(index)">
                   </p>
                   <p style="color:#CCCCCC" class="list-item" v-if="!postList.length">未选择组织节点+岗位条件</p>
                 </div>
@@ -123,7 +123,7 @@
                 <div class="group-list-content">
                   <p class="list-item flex-r-bt" v-for="(item,index) in staffList" :key="item.id">
                     <span>{{item.name}}</span>
-                    <img src="./assets/delete.png" alt="" @click="clearStaffByIndex(index)">
+                    <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearStaffByIndex(index)">
                   </p>
                   <p style="color:#CCCCCC" class="list-item" v-if="!staffList.length">未选择直接选择人员</p>
                 </div>
@@ -144,6 +144,10 @@ export default {
     value:{
       type: Boolean,
       default: false
+    },
+    data:{
+      type:Object,
+      default:{}
     }
   },
   data(){
@@ -209,7 +213,7 @@ export default {
       if(!this.proOrgList.length) return this.$Message.error("请先选择组织节点！")
       let proOrgList = deepCopy(this.proOrgList)
       proOrgList.forEach(item=>{
-        item.title = `${item.orgNodeName}（包含下级组织节点）`
+        item.title = this.includeLevelOrg.includes('01')?`${item.orgNodeName}（包含下级组织节点）`:item.orgNodeName
         item.id = this.includeLevelOrg.includes('01')?('01'+'-' + item.orgUnitId):('00'+'-'+item.orgUnitId)
         item.includeLevel = this.includeLevelOrg.includes('01')
       })
@@ -303,11 +307,37 @@ export default {
   computed:{
     getCheckedStaff(){
       return this.staffAllList.filter((item)=>item.checked===true).length
+    },
+    getCheckTypenum(){
+      let l1 = this.orgList.length?1:0;
+      let l2 = this.postList.length?1:0;
+      let l3 = this.staffList.length?1:0;
+      return l1+l2+l3
     }
   },
   watch:{
     value(val){
       this.modal = val
+    },
+    data:{
+      handler(val){
+        let map = deepCopy(val)
+        let orgList = map.orgList || []
+        orgList.forEach(item=>{
+          item.title = item.includeLevel?`${item.orgNodeName}（包含下级组织节点）`:item.orgNodeName
+          item.id = item.includeLevel?('01'+'-' + item.orgUnitId):('00'+'-'+item.orgUnitId)
+        })
+        this.orgList = orgList
+        let postList = map.postList || []
+        postList.forEach(item=>{
+          item.title=`${item.includeLevel?(item.orgNodeName+'（包含下级组织节点）'):item.orgNodeName}`
+          item.id=item.includeLevel?('01'+'-'+item.positionId + '-' + item.orgUnitId):('00'+'-'+item.positionId + '-' + item.orgUnitId)
+        })
+        this.postList = postList
+        this.staffList = map.staffList || []
+      },
+      deep: true,
+      immediate: true,
     }
   }
 }
@@ -501,6 +531,9 @@ export default {
         .group-list-content {
           height: calc(100% - 26px);
           overflow: auto;
+          .clear-icon{
+            cursor:pointer;
+          }
         }
         .list-item{
           background:#F4F6FA;