@lambo-design/workflow-approve 1.0.0-beta.45 → 1.0.0-beta.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.45",
+  "version": "1.0.0-beta.47",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/shared": "^1.0.0-beta.246",
-    "@lambo-design/core": "^4.7.1-beta.154"
+    "@lambo-design/core": "^4.7.1-beta.156",
+    "@lambo-design/shared": "^1.0.0-beta.246"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/countersigners-box.vue

@@ -1,15 +1,14 @@
 <template>
   <div style="min-height: 300px;">
-    <div style="min-height:5em;border: 1px dotted #a4a4a4;">
-      <template v-if="countersignersTagsData.length > 0">
-        <Tag v-for="(item, index) in countersignersTagsData" :key="item.id" closable @on-close="closeTags(index, item)" size="large">
-          {{ item.split(':')[1].split(',')[0] }}
-        </Tag>
-      </template>
-      <template v-else>
-        <p style="padding: 10px;color: #989898">暂无会签人</p>
-      </template>
-    </div>
+    <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}`"  :label="value">
+        <span>{{ value }}</span>
+      </Option>
+    </Select>
     <div class="cont">
       <div
         class="contLeftTwo">
@@ -89,7 +88,7 @@ export default {
       userNum: '0',
       // permScope: "",
       organTreeType: '00',
-      organId: '',
+      organIdList: [],
       countersignersTagsData: [],
       organTree: {
         orgenMap: {},
@@ -152,24 +151,6 @@ export default {
   },
   methods: {
     //把已选择的数据放入到已选列表中展示
-    getOrgan(row) {
-      let self = this
-      self.countersignersTagsData = []
-      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.countersignersTagsData.push(item + ',1')
-          self.userNum = '1'
-        })
-      }
-    },
     getUser(row) {
       let self = this
       self.selectedKeys = []
@@ -178,79 +159,24 @@ export default {
       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
+          let [userId, userName] = item.split(':');
+          let userStr = `${userId},${userName}`;
           self.selectedData.push(userStr)
           self.treeUserValue.push(userStr)
           self.selectedKeys.push(userStr)
-          self.countersignersTagsData.push(item + ',2')
-          self.userNum = '1'
-        })
-      }
-    },
-    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.countersignersTagsData.push(item + ',3')
-          let roles = roleId + ',' + roleName
-          self.selectedData.push(roles)
-          self.noticeList.push(roles)
-        })
-      }
-    },
-    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,
+          if (!self.countersignersTagsData.includes(userStr)) {
+            self.countersignersTagsData.push(userStr);
           }
-          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.countersignersTagsData.push(item + ',4')
+          self.userNum = '1'
         })
       }
     },
-    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()
-        })
-      }
+
+    organChange(event) {
+      this.countersignersTagsData = [...event]; // 直接同步
+      this.treeUserValue = [...event]; // 保持一致
+      this.selectedKeys = [...event];
+
     },
 
     getRootOrganTree(organTreeType) {
@@ -345,69 +271,69 @@ export default {
     getOrganTreeByProType(row, permScope, organTreeType) {
       const self = this
       return new Promise((resolve, reject) => {
-        let organTree = [];
-        let childsTree = [];
+        let organTree = []
+        let childsTree = []
         if (permScope && permScope.length > 0) {
           let params = {
             orgTreeType: organTreeType,
-          };
-          permScope = permScope.split(';');
+          }
+          permScope = permScope.split(';')
 
           const requests = permScope.map(perm => {
             return ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + perm, { params: params })
-                .then(resp => {
-                  if (resp.data.code === 200) {
-                    return resp.data.data;
-                  } else {
-                    return [];
-                  }
-                })
-                .catch(err => {
-                  console.error(err);
-                  return [];
-                });
-          });
+              .then(resp => {
+                if (resp.data.code === 200) {
+                  return resp.data.data
+                } else {
+                  return []
+                }
+              })
+              .catch(err => {
+                console.error(err)
+                return []
+              })
+          })
 
           Promise.all(requests)
-              .then(results => {
-                results.forEach(data => {
-                  if (data) {
-                    let obj = {
-                      type: data.organType,
-                      id: data.id,
-                      organId: data.organId,
-                      orders: data.orders,
-                      title: data.organName,
-                      name: data.organName,
-                      com: data.organId,
-                      code: data.organCode,
-                      loading: false,
-                      checked: false,
-                      children: [],
-                      hasChild: true,
-                    };
-                    childsTree.push(obj);
-                  }
-                });
-
-                organTree.push(childsTree);
-                const codesSeen = new Map();
-                organTree = organTree.reduce((acc, item, index) => {
-                  if (!codesSeen.has(item.code)) {
-                    codesSeen.set(item.code, index);
-                    acc.push(item);
+            .then(results => {
+              results.forEach(data => {
+                if (data) {
+                  let obj = {
+                    type: data.organType,
+                    id: data.id,
+                    organId: data.organId,
+                    orders: data.orders,
+                    title: data.organName,
+                    name: data.organName,
+                    com: data.organId,
+                    code: data.organCode,
+                    loading: false,
+                    checked: false,
+                    children: [],
+                    hasChild: true,
                   }
-                  return acc;
-                }, []);
-                resolve(organTree);
+                  childsTree.push(obj)
+                }
               })
-              .catch(err => {
-                reject(err);
-              });
+
+              organTree.push(childsTree)
+              const codesSeen = new Map()
+              organTree = organTree.reduce((acc, item, index) => {
+                if (!codesSeen.has(item.code)) {
+                  codesSeen.set(item.code, index)
+                  acc.push(item)
+                }
+                return acc
+              }, [])
+              resolve(organTree)
+            })
+            .catch(err => {
+              reject(err)
+            })
         } else {
-          resolve([]);
+          resolve([])
         }
-      });
+      })
     },
     //获取人员树信息(数据初始化)
     async getReadingRange(row, organTreeType) {
@@ -415,55 +341,60 @@ export default {
       var permScope = row.substring(row.indexOf('U:'))
       permScope = permScope.substring(2, permScope.indexOf(','))
       let permScopeTwo = permScope.split(';')
-      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+      if (permScopeTwo.length > 0 && permScopeTwo[0]) {
         let promises = []
         for (let i = 0; i < permScopeTwo.length; i++) {
-          let promise = ajax.get(self.smartFlowServerContext + "/manage/user/get/" + permScopeTwo[i] + '?treeType=' + organTreeType)
-              .then(resp => {
-                if (resp.data.code === 200) {
-                  return resp.data.data.organCode
-                }
-              })
+          let promise = ajax.get(self.smartFlowServerContext + '/manage/user/get/' + permScopeTwo[i] + '?treeType=' + organTreeType)
+            .then(resp => {
+              if (resp.data.code === 200) {
+                return resp.data.data.organCode
+              }
+            })
           promises.push(promise)
         }
         Promise.all(promises).then(async (result) => {
-          const uniqueResults = [...new Set(result.filter(Boolean))];
-          permScope = uniqueResults.join(';');
-          self.readingRange = await this.getOrganTreeByProType(row, permScope, organTreeType);
+          const uniqueResults = [...new Set(result.filter(Boolean))]
+          permScope = uniqueResults.join(';')
+          self.readingRange = await this.getOrganTreeByProType(row, permScope, organTreeType)
+          self.organTreeRedis(this.permScope, self.readingRange)
         })
       } else {
         //对于流程类型中没有规定人员范围但规定组织范围的情况
-        self.readingRange = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(",")), organTreeType);
+        self.readingRange = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(',')), organTreeType)
       }
 
     },
 
-    closeTags(index, info) {
-      let type = info.split(',')[1]
-      let data = info.split(',')[0]
-      this.readingRangeScPerDel(index, data)
-    },
-
-    //权限范围人员单条删除
-    readingRangeScPerDel(res, info) {
-      let index = this.treeUserValue.findIndex(item => {
-        return item.replace(',', ':') === info
-      })
-      if (index !== -1) {
-        this.treeUserValue.splice(index, 1)
-        this.selectedKeys.splice(index, 1)
-      }
-      let orgList = []
-      let organList = []
-      orgList.push(info)
-      info = info.replace(',', ':')
-      this.countersignersTagsData.forEach(organ => {
-        if (organ.indexOf(info) == -1) {
-          organList.push(organ)
-        }
-      })
-      this.countersignersTagsData = organList
-    },
+    // closeTags(index, info) {
+    //   let type = info.split(',')[1]
+    //   let data = info.split(',')[0]
+    //   this.readingRangeScPerDel(index, data)
+    // },
+
+    // //权限范围人员单条删除
+    // readingRangeScPerDel(res, info) {
+    //   let self = this
+    //   console.log(this.treeUserValue,"treeUserValue")
+    //   console.log(info,"info")
+    //   let index = this.treeUserValue.findIndex(item => {
+    //     return item === info
+    //   })
+    //   if (index !== -1) {
+    //     self.treeUserValue = self.treeUserValue.filter((_, i) => i !== index)
+    //     self.selectedKeys = self.selectedKeys.filter((_, i) => i !== index)
+    //     // self.selectedKeys.splice(index, 1)
+    //   }
+    //   let orgList = []
+    //   let organList = []
+    //   orgList.push(info)
+    //   info = info.replace(',', ':')
+    //   self.countersignersTagsData.forEach(organ => {
+    //     if (organ.indexOf(info) == -1) {
+    //       organList.push(organ)
+    //     }
+    //   })
+    //   self.countersignersTagsData = organList
+    // },
 
     selectUserChange(node) {
       let self = this
@@ -544,7 +475,6 @@ export default {
       })
     },
 
-
     //权限范围用户点击事件(点击人员树，触发查询，显示在右侧)
     selectReRaYHChange(data, info) {
       let self = this
@@ -569,7 +499,7 @@ export default {
             }
           }).then(function (resp) {
             if (resp.data.code === 200) {
-              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId)) {
                   userIdSet.add(item.userId)
@@ -597,7 +527,7 @@ export default {
             }
           }).then(function (resp) {
             if (resp.data.code === 200) {
-              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data
               nodeUser.forEach(item => {
                 if ((!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) || userPermScope.length <= 0 || !userPermScope[0]) {
                   userIdSet.add(item.userId)
@@ -619,41 +549,38 @@ export default {
       self.treeUserCenterValue = treeUserCenters
     },
 
-
-    //人员选中
+    // 人员选中
     getReadingRangeUser(row) {
-      let self = this
-      debugger
-      self.userNum = '2'
+      let self = this;
+      self.userNum = '2';
       if (row.length > self.selectedKeys.length) {
-        self.treeUserValue = row
-        self.selectedKeys = row
-        // row = row.reverse()
-        let index = row.length - 1
-        let organName = row[index].replace(',', ':') + ',2'
-        self.countersignersTagsData.push(organName)
+        // 用户选择了新人员
+        self.treeUserValue = row;
+        self.selectedKeys = row;
+
+        let index = row.length - 1;
+        let organName = row[index];
+
+        if (!self.countersignersTagsData.includes(organName)) {
+          self.countersignersTagsData.push(organName);
+        }
+
+        self.organChange(self.countersignersTagsData);
+
       } else if (row.length < self.selectedKeys.length) {
-        let diff = ''
-        let orgList = []
-        for (let i = 0; i < self.selectedKeys.length; i++) {
-          if (!row.includes(self.selectedKeys[i])) {
-            diff = self.selectedKeys[i]
-          }
+        // 用户取消了选择
+        let diff = self.selectedKeys.find(item => !row.includes(item));
+
+        // 从 countersignersTagsData 中移除取消的用户
+        if (diff) {
+          self.countersignersTagsData = self.countersignersTagsData.filter(item => item !== diff);
+          self.selectedKeys = row; // 更新选中数据
         }
-        diff = diff.replace(',', ':')
-        self.countersignersTagsData.forEach(organ => {
-          if (organ.indexOf(diff) == -1) {
-            orgList.push(organ)
-          }
-        })
-        self.countersignersTagsData = orgList
-        self.selectedKeys = row
       }
     },
 
-
     //数据初始化？
-    organTreeRedis(row) {
+    organTreeRedis(row, readingRange) {
       const user = sessionStorage.getItem('userInfo')
       const jsonArray = JSON.parse(user)
       if (row == 'undefined' || row == 'all') {
@@ -665,43 +592,31 @@ export default {
           }
         })
       } else {
-
-        let orgPermScope = row.substring(2, row.indexOf(','))
-        orgPermScope = orgPermScope.split(';')
-
-        let userPermScope = row.substring(row.indexOf('U:'))
-        userPermScope = userPermScope.substring(2, userPermScope.indexOf(','))
-        userPermScope = userPermScope.split(';')
-
-        var rolePermScope = row.substring(row.indexOf('R:'))
-        rolePermScope = rolePermScope.substring(2, rolePermScope.indexOf(','))
-        rolePermScope = rolePermScope.split(';')
-
-        let postPermScope = row.substring(row.indexOf('P:'))
-        postPermScope = postPermScope.substring(2, postPermScope.indexOf(','))
-        postPermScope = postPermScope.split(';')
-        ajax.get(this.upmsServerContext + '/manage/user/get/' + (jsonArray.accountUuid || jsonArray.userId))
-          .then(resp => {
-            this.organId = resp.data.data.organId
-            ajax.get(this.smartFlowServerContext + '/manage/processDesign/getOrgan?orgId=' + (jsonArray.organId)
-            ).then(resp => {
-              if (resp.data.code === '200') {
-                for (let key in resp.data.data.userMap) {
-                  for (let i = 0; i < userPermScope.length; i++) {
-                    if (key == userPermScope[i]) {
-                      const dataArr = [[key, resp.data.data.userMap[key]]]
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i]
-                        this.$set(this.organTree.userMap, key, value)
-                      }
-                    }
+        let organIds =[]
+        readingRange[0].forEach(item => {
+          organIds.push(item.organId)
+        })
+        console.log(organIds)
+        ajax.get(this.smartFlowServerContext + '/manage/user/getAllUsersInfo', {
+            params: {
+              organIds: organIds.join(','),
+              permScopeList: row,
+              orgTreeType: this.organTreeType
+            }
+          }
+        ).then(resp => {
+          if (resp.data.code === '200') {
+            for (let key in resp.data.data) {
+                  const dataArr = [[key, resp.data.data[key]]]
+                  for (let i = 0; i < dataArr.length; i++) {
+                    const [key, value] = dataArr[i]
+                    this.$set(this.organTree.userMap, key, value)
                   }
                 }
+            console.log(this.organTree.userMap,"userMap")
+          }
+        })
 
-              }
-            })
-
-          })
       }
 
     },
@@ -753,7 +668,7 @@ export default {
       this.id = id
       this.permScope = permScope
       this.organTreeType = organTreeType
-      this.organTreeRedis(this.permScope)
+      // this.organTreeRedis(this.permScope)
       if (inputValue) {
         //加入已选择的数据
         this.getUser(inputValue)
@@ -764,25 +679,9 @@ export default {
       } else {
         this.getReadingRange(this.permScope, this.organTreeType)
       }
-    },
-    findTitleByValue(arr, value) {
-      function traverse(items) {
-        for (let item of items) {
-          if (item.value === value) {
-            return item.title
-          }
-          if (item.children && item.children.length > 0) {
-            let result = traverse(item.children)
-            if (result) {
-              return result
-            }
-          }
-        }
-        return ''
-      }
 
-      return traverse(arr)
     },
+
     showUserDetail(item) {
       if (item.organName) {
         return `(${item.organName} )`
@@ -796,6 +695,7 @@ export default {
   watch: {
     countersignersTagsData: {
       handler(newVal, oldVal) {
+        console.log("countersignersTagsData",newVal)
         let organ = []
         let names = []
         let organs = []
@@ -806,13 +706,12 @@ export default {
         })
         let nameValue = []
         let users = []
-        //倒着从treeUserValue遍历，保证顺序和显示的一样
         this.treeUserValue.forEach(item => {
-          const parts = item.split(',');
-          nameValue.push(parts[0]);
-          names.push(parts[1]);
-          users.push(parts[0] + ':' + parts[1]);
-        });
+          const parts = item.split(',')
+          nameValue.push(parts[0])
+          names.push(parts[1])
+          users.push(parts[0] + ':' + parts[1])
+        })
         let roleList = []
         let roles = []
         this.noticeRoleList.forEach(item => {
@@ -907,4 +806,36 @@ export default {
 /deep/ .ivu-checkbox-input {
   width: 136px;
 }
+/deep/.custom-select .ivu-select {
+  height: 80px;         /* 控制总体高度 */
+  min-height: 80px;
+  line-height: normal;   /* 避免行高过大导致居中 */
+  box-sizing: border-box;
+}
+
+/deep/.custom-select .ivu-select-input {
+  height: auto !important;
+  line-height: normal !important;
+  padding: 0 !important;
+  margin-top: 0 !important;
+}
+
+/deep/.custom-select .ivu-select-selection {
+  display: flex !important;
+  flex-wrap: wrap !important;
+  align-items: flex-start !important;
+  height: 80px;          /* 与上面的高度一致 */
+  padding: 8px !important;
+  line-height: normal !important;
+  overflow-y: auto;
+}
+
+/deep/.custom-select .ivu-select-selection__choice {
+  margin: 0 5px 5px 0;
+  vertical-align: top;}
+
+/* 可选：调整下拉箭头的位置 */
+/deep/.custom-select .ivu-select-arrow {
+  display: none;
+}
 </style>

package/src/components/history.vue

@@ -4,7 +4,7 @@
     <Timeline class="portrait-timeline">
       <TimelineItem v-for="(items,index) in itemList" :key="index" class="portrait-timeline-item">
         <template #dot>
-          <div v-if="items[0].auditResult === '00' || items[0].auditResult === '30' || items[0].auditResult === '80'" class="cicle" style="background-color: #005aff"></div>
+          <div v-if="items[0].auditResult === '00' || items[0].auditResult === '10' || items[0].auditResult === '30' || items[0].auditResult === '80'" class="cicle" style="background-color: #005aff"></div>
           <div v-else-if="items[0].auditResult === '40' || items[0].auditResult === '50'" class="cicle" style="background-color: #ffcc66"></div>
           <div v-else-if="items[0].auditResult === '60'" class="cicle" style="background-color: #ed4014"></div>
           <div v-else class="cicle" style="background-color: #ff9900"></div>
@@ -56,6 +56,8 @@
                               <Col span="12">
                                 <span style="color: #005aff;; font-size: 13px;"
                                       v-if="item.auditResult === '00'">流程发起</span>
+                                <span style="color: #005aff;; font-size: 13px;"
+                                      v-else-if="item.auditResult === '10'">自动跳过</span>
                                 <span style="color: #005aff;; font-size: 13px;"
                                       v-else-if="item.auditResult === '30'">通过</span>
                                 <span style="color: #ed4014; font-size: 13px;"
@@ -74,7 +76,7 @@
                               </Col>
                               <Col span="12" style="text-align: right">
                                 <Button v-if="item.fileList && item.fileList.length > 0" size="small" type="primary" ghost class="urging" @click="openModal(item)">查看附件</Button>
-                                <Button v-if="displayPushButton && item.auditResult !== '00'&& item.auditResult !== '30'&&item.auditResult !== '40'&&item.auditResult !== '50'&&item.auditResult !== '60'&&item.auditResult!=='80'&&item.auditResult!=='90'"
+                                <Button v-if="displayPushButton && item.auditResult !== '00' && item.auditResult !== '10' && item.auditResult !== '30'&&item.auditResult !== '40'&&item.auditResult !== '50'&&item.auditResult !== '60'&&item.auditResult!=='80'&&item.auditResult!=='90'"
                                         size="small" type="primary" ghost class="urging"
                                         @click="pushHim(item,itemListItem,itemListIndex)">催一下
                                 </Button>