@lambo-design/workflow-approve 1.0.0-beta.53 → 1.0.0-beta.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.53",
+  "version": "1.0.0-beta.54",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/candidate-groups-box.vue

@@ -287,108 +287,119 @@ export default {
   },
   methods: {
     getOrgan(row) {
-      let self = this
-      self.organModel = []
-      let organs = row.organs
-      let organList = organs.split(",")
-      if (organs && organList.length > 0) {
-        organList.forEach(item => {
-          let organ = {
-            code: item.split(':')[0],
-            name: item.split(':')[1],
-          }
-          self.treeValueBM.push(organ)
-          self.orgList.push(organ)
-          self.organModel.push(item + ',1')
-          self.userNum = "1"
-          self.updateLength()
-        })
+      if (row.organs){
+        let self = this
+        self.organModel = []
+        let organs = row.organs
+        let organList = organs.split(",")
+        if (organs && organList.length > 0) {
+          organList.forEach(item => {
+            let organ = {
+              code: item.split(':')[0],
+              name: item.split(':')[1],
+            }
+            self.treeValueBM.push(organ)
+            self.orgList.push(organ)
+            self.organModel.push(item + ',1')
+            self.userNum = "1"
+            self.updateLength()
+          })
+        }
       }
     },
     getUser(row) {
-      let self = this
-      self.selectedKeys = []
-      self.treeUserValue = []
-      self.treeUserNameCenterValue = []
-      let users = row.users
-      let userList = users.split(",")
-      if (users && userList.length > 0) {
-        userList.forEach(item => {
-          let userId = item.split(':')[0]
-          let userName = item.split(':')[1]
-          let user = {
-            userId: userId,
-            userName: userName,
-          }
-          let userStr = userId + "," + userName
-          self.treeUserValue.push(userStr)
-          self.treeUserNameCenterValue.push(user)
-          self.selectedKeys.push(userStr)
-          self.organModel.push(item + ",2")
-          self.userNum = "1"
-          self.updateLength()
-        })
+      if (row.users){
+        let self = this
+        self.selectedKeys = []
+        self.treeUserValue = []
+        self.treeUserNameCenterValue = []
+        let users = row.users
+        let userList = users.split(",")
+        if (users && userList.length > 0) {
+          userList.forEach(item => {
+            let userId = item.split(':')[0]
+            let userName = item.split(':')[1]
+            let user = {
+              userId: userId,
+              userName: userName,
+            }
+            let userStr = userId + "," + userName
+            self.treeUserValue.push(userStr)
+            self.treeUserNameCenterValue.push(user)
+            self.selectedKeys.push(userStr)
+            self.organModel.push(item + ",2")
+            self.userNum = "1"
+            self.updateLength()
+          })
+        }
       }
     },
     getRole(row) {
-      let self = this
-      self.noticeRoleList = []
-      self.noticeList = []
-      self.noticeRoleNameList = []
-      let roles = row.roles
-      let roleList = roles.split(",")
-      if (roles && roleList.length > 0) {
-        roleList.forEach(item => {
-          let roleId = item.split(':')[0]
-          let roleName = item.split(':')[1]
-          self.noticeRoleNameList.push(roleName)
-          self.organModel.push(item + ',3')
-          let roles = roleId + "," + roleName
-          self.noticeRoleList.push(roles)
-          self.noticeList.push(roles)
-          self.updateLength()
-        })
+      if (row.roles){
+        let self = this
+        self.noticeRoleList = []
+        self.noticeList = []
+        self.noticeRoleNameList = []
+        let roles = row.roles
+        let roleList = roles.split(",")
+        if (roles && roleList.length > 0) {
+          roleList.forEach(item => {
+            let roleId = item.split(':')[0]
+            let roleName = item.split(':')[1]
+            self.noticeRoleNameList.push(roleName)
+            self.organModel.push(item + ',3')
+            let roles = roleId + "," + roleName
+            self.noticeRoleList.push(roles)
+            self.noticeList.push(roles)
+            self.updateLength()
+          })
+        }
       }
     },
     getPost(row) {
-      let self = this
-      self.treePostValue = []
-      self.postKeys = []
-      self.treePostNameCenterValue = []
-      let positions = row.positions
-      let positionList = positions.split(",")
-      if (positions && positionList.length > 0) {
-        positionList.forEach(item => {
-          let positionId = item.split(':')[0]
-          let positionName = item.split(':')[1]
-          let position = {
-            positionId: positionId,
-            positionName: positionName,
-          }
-          let post = positionId + "," + positionName
-          self.treePostValue.push(post)
-          self.postKeys.push(post)
-          // resp.data.data.code = resp.data.data.orgCode
-          // self.treePostNameCenterValue.push(resp.data.data)
-          self.treePostNameCenterValue.push(position)
-          self.organModel.push(item + ',4')
-          self.updateLength()
-        })
+      if (row.posts){
+        let self = this
+        self.treePostValue = []
+        self.postKeys = []
+        self.treePostNameCenterValue = []
+        let positions = row.positions
+        let positionList = positions.split(",")
+        if (positions && positionList.length > 0) {
+          positionList.forEach(item => {
+            let positionId = item.split(':')[0]
+            let positionName = item.split(':')[1]
+            let position = {
+              positionId: positionId,
+              positionName: positionName,
+            }
+            let post = positionId + "," + positionName
+            self.treePostValue.push(post)
+            self.postKeys.push(post)
+            // resp.data.data.code = resp.data.data.orgCode
+            // self.treePostNameCenterValue.push(resp.data.data)
+            self.treePostNameCenterValue.push(position)
+            self.organModel.push(item + ',4')
+            self.updateLength()
+          })
+        }
       }
+
     },
     getOrgType(row) {
-      let self = this
-      let types = row.types
-      let typeList = types.split(",")
-      if (types && typeList.length > 0) {
-        typeList.forEach(item => {
-          let type = {
-            bizTypeCode: item.split(':')[0],
-            typeName: item.split(':')[1],
-          }
-          self.treeOrgTypeValue.push(type)
-          self.updateLength()
-        })
+      if (row.types){
+        let self = this
+        let types = row.types
+        let typeList = types.split(",")
+        if (types && typeList.length > 0) {
+          typeList.forEach(item => {
+            let type = {
+              bizTypeCode: item.split(':')[0],
+              typeName: item.split(':')[1],
+            }
+            self.treeOrgTypeValue.push(type)
+            self.updateLength()
+          })
+        }
       }
     },
 
@@ -1883,7 +1894,7 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       this.organTreeRedis(this.permScope)
-      if (inputValue && inputValue.length > 0){
+      if (inputValue) {
         this.getOrgan(inputValue)
         this.getUser(inputValue)
         this.getRole(inputValue)

package/src/components/countersigners-box.vue

@@ -1,16 +1,17 @@
 <template>
   <div style="min-height: 300px;">
-    <div v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0"  class="searchable-select-wrapper">
-    <Select  v-model="countersignersTagsData"
-            filterable multiple
-            @on-change="organChange($event)"
-            class="custom-select"
-               >
-      <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value.split('（')[0]}`" :label="value.split('（')[0]">
-        <span>{{ value }}</span>
-      </Option>
-    </Select>
-      <Icon type="ios-search" class="search-icon" />
+    <div v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0" class="searchable-select-wrapper">
+      <Select v-model="countersignersTagsData"
+              filterable multiple
+              @on-change="organChange($event)"
+              class="custom-select"
+      >
+        <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value.split('（')[0]}`"
+                :label="value.split('（')[0]">
+          <span>{{ value }}</span>
+        </Option>
+      </Select>
+      <Icon type="ios-search" class="search-icon"/>
     </div>
     <Tag v-else v-for="(item, index) in countersignersTagsData" :key="item.id" closable
          @on-close="closeTags(index, item)"
@@ -161,23 +162,25 @@ export default {
   methods: {
     //把已选择的数据放入到已选列表中展示
     getUser(row) {
-      let self = this
-      self.selectedKeys = []
-      self.treeUserValue = []
-      let users = row.users
-      let userList = users.split(',')
-      if (users && userList.length > 0) {
-        userList.forEach(item => {
-          let [userId, userName] = item.split(':')
-          let userStr = `${userId},${userName}`
-          self.selectedData.push(userStr)
-          self.treeUserValue.push(userStr)
-          self.selectedKeys.push(userStr)
-          if (!self.countersignersTagsData.includes(userStr)) {
-            self.countersignersTagsData.push(userStr)
-          }
-          self.userNum = '1'
-        })
+      if (row.users) {
+        let self = this
+        self.selectedKeys = []
+        self.treeUserValue = []
+        let users = row.users
+        let userList = users.split(',')
+        if (users && userList.length > 0) {
+          userList.forEach(item => {
+            let [userId, userName] = item.split(':')
+            let userStr = `${userId},${userName}`
+            self.selectedData.push(userStr)
+            self.treeUserValue.push(userStr)
+            self.selectedKeys.push(userStr)
+            if (!self.countersignersTagsData.includes(userStr)) {
+              self.countersignersTagsData.push(userStr)
+            }
+            self.userNum = '1'
+          })
+        }
       }
     },
 
@@ -593,7 +596,6 @@ export default {
           organIds.push(item.organId)
         })
       }
-
       ajax.get(this.smartFlowServerContext + '/manage/user/getAllUsersInfo', {
           params: {
             organIds: organIds.join(','),
@@ -663,7 +665,7 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       // this.organTreeRedis(this.permScope)
-      if (inputValue && inputValue.length > 0) {
+      if (inputValue) {
         //加入已选择的数据
         this.getUser(inputValue)
       }
@@ -836,6 +838,7 @@ export default {
 /deep/ .custom-select .ivu-select-arrow {
   display: none;
 }
+
 .searchable-select-wrapper {
   position: relative;
   display: inline-block;