@lambo-design/workflow-approve 1.0.0-beta.55 → 1.0.0-beta.56

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

@@ -7,7 +7,7 @@
                 @on-change="organChange($event)"
                 placeholder="输入关键字查询" style="width:60em;">
           <OptionGroup label="组织">
-            <Option v-for="(value, key) in organTree.orgenMap" :key="key" :value="`${key}:${value},1`">
+            <Option v-for="(value, key) in organTree.organMap" :key="key" :value="`${key}:${value},1`">
               <span>{{ value }}</span>
             </Option>
           </OptionGroup>
@@ -26,6 +26,11 @@
               <span>{{ value }}</span>
             </Option>
           </OptionGroup>
+          <OptionGroup label="组织类型" v-if="ucAdapterType === 'sc'">
+            <Option v-for="(value, key) in organTree.typeMap" :key="key" :value="`${key}:${value},5`" >
+              <span>{{value}}</span>
+            </Option>
+          </OptionGroup>
         </Select>
         <Button type="primary" :loading="loading" @click="organTreeRedisUpdate" style="float: right;">
           <span v-if="!loading">更新查询数据</span>
@@ -229,10 +234,11 @@ export default {
       organId: "",
       organModel: [],
       organTree: {
-        orgenMap: {},
+        organMap: {},
         userMap: {},
         roleMap: {},
         postMap: {},
+        typeMap: {},
       },
       readingRangePost: [],
       treeUserValueCenter: [],
@@ -1159,20 +1165,32 @@ export default {
           depList = [...new Set(depList)];
           depList = depList.reverse();
           let bizTypeCode = depList[0] ? depList[0].bizTypeCode : ''
-          this.userNum = "1"
           if (bizTypeCode) {
             this.treeOrgTypeValue.push(depList[0])
+            this.organModel.push(depList[0].bizTypeCode +":"+depList[0].typeName+","+"5");
           }
         })
       } else {
-        this.userNum = "1"
         let list = []
         uniqueArray.forEach(item => {
           if (item.bizTypeCode != info.bizTypeCode) {
             list.push(item)
           }
         })
+        let typeList = []
+        this.organModel.forEach(data => {
+          let [value, type] = data.split(',')
+          if (type && type !== '5'){
+            typeList.push(data)
+          } else {
+            let typeCode = value.split(':')[0]
+            if (typeCode !== info.bizTypeCode){
+              typeList.push(data)
+            }
+          }
+        })
         this.treeOrgTypeValue = list
+        this.organModel = typeList
       }
 
       this.updateLength()
@@ -1493,6 +1511,7 @@ export default {
         })
         self.organModel = orgList
         self.noticeList = row
+        self.noticeRoleNameList = row
       }
       this.updateLength()
     },
@@ -1555,93 +1574,17 @@ export default {
       this.updateLength()
     },
     organTreeRedis(row) {
-      const user = sessionStorage.getItem('userInfo');
-      const jsonArray = JSON.parse(user);
-      if (row == 'undefined' || row == "all") {
-
-        ajax.get(this.smartFlowServerContext + "/manage/processDesign/getOrgan?orgId=" + (jsonArray.organId)
-        ).then(resp => {
-          if (resp.data.code === '200') {
-            this.organTree = resp.data.data;
-          }
-        })
-      } 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.orgenMap) {
-                  for (let i = 0; i < orgPermScope.length; i++) {
-                    if (key == orgPermScope[i]) {
-                      const dataArr = [[key, resp.data.data.orgenMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.orgenMap, key, value)
-                      }
-                    }
-                  }
-                }
-                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)
-                      }
-                    }
-                  }
-                }
-
-                for (let key in resp.data.data.roleMap) {
-                  for (let i = 0; i < rolePermScope.length; i++) {
-                    if (key == rolePermScope[i]) {
-                      const dataArr = [[key, resp.data.data.roleMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.roleMap, key, value)
-                      }
-                    }
-                  }
-                }
-
-                for (let key in resp.data.data.postMap) {
-                  for (let i = 0; i < postPermScope.length; i++) {
-                    if (key == postPermScope[i]) {
-                      const dataArr = [[key, resp.data.data.postMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.postMap, key, value)
-                      }
-                    }
-                  }
-                }
-              }
-            })
-
-          })
+      let params = {
+        permScope: row,
+        organTreeType: this.organTreeType,
       }
-
+      ajax.get(this.smartFlowServerContext + '/manage/processDesign/getQuickSelectionData', {params: params}).then(resp => {
+        if (resp.data.code === '200') {
+          this.organTree = resp.data.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
 
     },
     organChange(event) {
@@ -1650,10 +1593,12 @@ export default {
       let userValue = []
       let roleValue = []
       let postValue = []
+      let typeValue = []
       let orgAdjustment = ""
       let userAdjustment = ""
       let roleAdjustment = ""
       let postAdjustment = ""
+      let typeAdjustment = ""
       event.forEach(item => {
         let nameType = item.substring(item.indexOf(":") + 1)
         nameType = nameType.substring(nameType.indexOf(",") + 1)
@@ -1681,9 +1626,9 @@ export default {
         if (nameType == "3") {
           roleAdjustment = "3"
           this.organModel.push(item)
-          let user = item.substring(0, item.indexOf(","))
-          user = user.substring(user.indexOf(":") + 1)
-          roleValue.push(user)
+          let role = item.substring(0, item.indexOf(","))
+          role = role.replace(":", ",")
+          roleValue.push(role)
         } else if (nameType != "3") {
           roleAdjustment = "3"
         }
@@ -1696,6 +1641,13 @@ export default {
         } else if (nameType != "4") {
           postAdjustment = "4"
         }
+        if (nameType == "5") {
+          typeAdjustment = "5"
+          this.organModel.push(item)
+          typeValue.push({typeName:item.substring(item.indexOf(":") + 1,item.indexOf(",")), bizTypeCode: item.substring(0, item.indexOf(":")), checked: true})
+        } else if (nameType != "5"){
+          typeAdjustment = "5"
+        }
 
         // 执行需要的操作
       });
@@ -1704,121 +1656,71 @@ export default {
         userAdjustment = '2'
         roleAdjustment = '3'
         postAdjustment = '4'
+        typeAdjustment = '5'
         this.noticeRoleList = []
       }
-      if (this.userNum != "1") {
-        if (orgAdjustment == "1") {
-          this.treeValueBM = orgValue
-        }
-        if (userAdjustment == "2") {
-          this.treeUserValue = userValue
-        }
-        if (roleAdjustment == "3") {
-          this.noticeRoleNameList = roleValue
-        }
-        if (postAdjustment == "4") {
-          this.treePostValue = postValue
-        }
+      if (orgAdjustment == "1") {
+        this.treeValueBM = this.updateCheckedData(orgValue, this.treeValueBM, 'code', this.organTree.organMap)
+      }
+      if (userAdjustment == "2") {
+        this.treeUserValue = this.updateCheckedData(userValue, this.treeUserValue, 'id', this.organTree.userMap)
+      }
+      if (roleAdjustment == "3") {
+        this.noticeRoleNameList = this.updateCheckedData(roleValue, this.noticeRoleNameList, 'id', this.organTree.roleMap)
+      }
+      if (postAdjustment == "4") {
+        this.treePostValue = this.updateCheckedData(postValue, this.treePostValue, 'id', this.organTree.postMap)
+      }
+      if (typeAdjustment == "5") {
+        this.treeOrgTypeValue = this.updateCheckedData(typeValue, this.treeOrgTypeValue, 'bizTypeCode', this.organTree.typeMap)
       }
-      this.userNum = "2"
       this.updateLength()
     },
-    organTreeRedisUpdate() {
-      const user = sessionStorage.getItem('userInfo');
-      const jsonArray = JSON.parse(user);
-      if (this.permScope == "all" || this.permScope == "undefined") {
-        this.loading = true;
-        ajax.get(this.smartFlowServerContext + "/manage/processDesign/getOrgan?orgId=" + (jsonArray.organId)
-        ).then(resp => {
-          if (resp.data.code === '200') {
-            this.organTree = resp.data.data;
-            this.loading = false;
-          } else {
-            this.loading = false;
-          }
-        })
-      } else {
-        this.loading = true;
-        let orgPermScope = this.permScope.substring(2, this.permScope.indexOf(","))
-        orgPermScope = orgPermScope.split(';')
-
-        let userPermScope = this.permScope.substring(this.permScope.indexOf("U:"))
-        userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
-        userPermScope = userPermScope.split(';')
-
-        let rolePermScope = this.permScope.substring(this.permScope.indexOf("R:"))
-        rolePermScope = rolePermScope.substring(2, rolePermScope.indexOf(","))
-        rolePermScope = rolePermScope.split(';')
-
-        let postPermScope = this.permScope.substring(this.permScope.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.permitOrganId
-            ajax.get(this.smartFlowServerContext + "/manage/processDesign/getOrgan?orgId=" + this.organId
-            ).then(resp => {
-              if (resp.data.code === '200') {
-                for (let key in resp.data.data.orgenMap) {
-                  for (let i = 0; i < orgPermScope.length; i++) {
-                    if (key == orgPermScope[i]) {
-                      const dataArr = [[key, resp.data.data.orgenMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.orgenMap, key, value)
-                      }
-                    }
-                  }
-                }
-                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)
-                      }
-                    }
-                  }
-                }
-
-                for (let key in resp.data.data.roleMap) {
-                  for (let i = 0; i < rolePermScope.length; i++) {
-                    if (key == rolePermScope[i]) {
-                      const dataArr = [[key, resp.data.data.roleMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.roleMap, key, value)
-                      }
-                    }
-                  }
-                }
-
-                for (let key in resp.data.data.postMap) {
-                  for (let i = 0; i < postPermScope.length; i++) {
-                    if (key == postPermScope[i]) {
-                      const dataArr = [[key, resp.data.data.postMap[key]]]
-
-                      for (let i = 0; i < dataArr.length; i++) {
-                        const [key, value] = dataArr[i];
-                        this.$set(this.organTree.postMap, key, value)
-                      }
-                    }
-                  }
-                }
-                this.loading = false;
-                this.$Message.success("更新查询数据成功！")
-              } else {
-                // this.$Message.error(resp.data.data);
-                console.log(resp.data.data);
-                this.loading = false;
-              }
-            })
+    updateCheckedData(selectValue, treeValue, uniqueKey, selectMap){
+      if (treeValue.length === 0){
+        return selectValue
+      }
+      if (uniqueKey === 'id'){
+        treeValue = treeValue.map(str => {
+          const [id, name] = str.split(',');
+          return { id: id.trim(), name: name.trim() };
+        });
+        selectValue = selectValue.map(str => {
+          const [id, name] = str.split(',');
+          return { id: id.trim(), name: name.trim() };
+        });
+      }
 
-          })
+      //选择框有已选择列表没有的增加到已选择列表中
+      selectValue.forEach(orgObj => {
+        if (!this.isObjectInArray(treeValue, orgObj, uniqueKey)) {
+          treeValue.push(orgObj);
+        }
+      });
+      //已选择列表有选择框没有且包含在选择框所有数据中的，在已选择列表中删除
+      treeValue = treeValue.filter(treeObj => {
+        return !(!this.isObjectInArray(selectValue, treeObj, uniqueKey) && selectMap[treeObj[uniqueKey]]);
+      });
+      if (uniqueKey === 'id'){
+        return treeValue.map(obj => `${obj.id},${obj.name}`)
       }
+      return treeValue
+    },
+    isObjectInArray(array, obj, uniqueKey) {
+      return array.some(item => item[uniqueKey] === obj[uniqueKey]);
+    },
+    organTreeRedisUpdate() {
+      let params = {
+        permScope: this.permScope,
+        organTreeType: this.organTreeType,
+      }
+      ajax.get(this.smartFlowServerContext + '/manage/processDesign/getQuickSelectionData', {params: params}).then(resp => {
+        if (resp.data.code === '200') {
+          this.organTree = resp.data.data
+        }
+      }).catch(err => {
+        console.log(err);
+      })
     },
     readingRangeEmpty() {
       this.treeValueBM.forEach(item => {

package/src/components/history.vue

@@ -4,9 +4,9 @@
     <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 === '10' || 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 === '61' || 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' || items[0].auditResult === '83'" class="cicle" style="background-color: #ed4014"></div>
+          <div v-else-if="items[0].auditResult === '60' || items[0].auditResult === '62' || items[0].auditResult === '83'" class="cicle" style="background-color: #ed4014"></div>
           <div v-else class="cicle" style="background-color: #ff9900"></div>
         </template>
         <Collapse v-model="activeName" simple style="margin: -10px 0 0 -2px;border: none">
@@ -68,6 +68,10 @@
                                       v-else-if="item.auditResult === '51'">流程终止</span>
                                 <span style="color: #ed4014; font-size: 13px;"
                                       v-else-if="item.auditResult === '60'">撤回</span>
+                                <span style="color: #005aff; font-size: 13px;"
+                                      v-else-if="item.auditResult === '61'">交回委派任务</span>
+                                <span style="color: #ed4014; font-size: 13px;"
+                                      v-else-if="item.auditResult === '62'">委派任务被撤回</span>
                                 <span style="color: #19be6b; font-size: 13px;"
                                       v-else-if="item.auditResult === '80'">跳转指定节点</span>
                                 <span style="color: #ed4014; font-size: 13px;"
@@ -78,7 +82,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 !== '10' && item.auditResult !== '30'&&item.auditResult !== '40'&&item.auditResult !== '50'&&item.auditResult !== '60'&&item.auditResult!=='80'&&item.auditResult!=='83'&&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 !== '61'&&item.auditResult !== '62'&&item.auditResult!=='80'&&item.auditResult!=='83'&&item.auditResult!=='90'"
                                         size="small" type="primary" ghost class="urging"
                                         @click="pushHim(item,itemListItem,itemListIndex)">催一下
                                 </Button>