@lambo-design/workflow-approve 1.0.0-beta.50 → 1.0.0-beta.51

package/package.json

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

package/src/components/countersigners-box.vue

@@ -1,14 +1,18 @@
 <template>
   <div style="min-height: 300px;">
-    <Select v-model="countersignersTagsData"
+    <Select v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0" 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">
+      <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value}`" :label="value">
         <span>{{ value }}</span>
       </Option>
     </Select>
+    <Tag v-else v-for="(item, index) in countersignersTagsData" :key="item.id" closable @on-close="closeTags(index, item)"
+         size="large">
+      {{ item.split(',')[1] }}
+    </Tag>
     <div class="cont">
       <div
         class="contLeftTwo">
@@ -159,13 +163,13 @@ export default {
       let userList = users.split(',')
       if (users && userList.length > 0) {
         userList.forEach(item => {
-          let [userId, userName] = item.split(':');
-          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)
           if (!self.countersignersTagsData.includes(userStr)) {
-            self.countersignersTagsData.push(userStr);
+            self.countersignersTagsData.push(userStr)
           }
           self.userNum = '1'
         })
@@ -173,9 +177,9 @@ export default {
     },
 
     organChange(event) {
-      this.countersignersTagsData = [...event]; // 直接同步
-      this.treeUserValue = [...event]; // 保持一致
-      this.selectedKeys = [...event];
+      this.countersignersTagsData = [...event] // 直接同步
+      this.treeUserValue = [...event] // 保持一致
+      this.selectedKeys = [...event]
 
     },
 
@@ -266,6 +270,7 @@ export default {
           }
         })
       }
+      self.organTreeRedis(self.permScope, self.readingRange)
     },
 
     getOrganTreeByProType(row, permScope, organTreeType) {
@@ -361,40 +366,36 @@ export default {
       } else {
         //对于流程类型中没有规定人员范围但规定组织范围的情况
         self.readingRange = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(',')), organTreeType)
+        self.organTreeRedis(this.permScope, self.readingRange)
       }
 
     },
 
-    // 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
-    // },
+    closeTags(index, info) {
+      this.readingRangeScPerDel(index, info)
+    },
+
+    //权限范围人员单条删除
+    readingRangeScPerDel(res, info) {
+      let self = this
+      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)
+      self.countersignersTagsData.forEach(organ => {
+        if (organ.indexOf(info) == -1) {
+          organList.push(organ)
+        }
+      })
+      self.countersignersTagsData = organList
+    },
 
     selectUserChange(node) {
       let self = this
@@ -551,73 +552,61 @@ export default {
 
     // 人员选中
     getReadingRangeUser(row) {
-      let self = this;
-      self.userNum = '2';
+      let self = this
+      self.userNum = '2'
       if (row.length > self.selectedKeys.length) {
         // 用户选择了新人员
-        self.treeUserValue = row;
-        self.selectedKeys = row;
+        self.treeUserValue = row
+        self.selectedKeys = row
 
-        let index = row.length - 1;
-        let organName = row[index];
+        let index = row.length - 1
+        let organName = row[index]
 
         if (!self.countersignersTagsData.includes(organName)) {
-          self.countersignersTagsData.push(organName);
+          self.countersignersTagsData.push(organName)
         }
 
-        self.organChange(self.countersignersTagsData);
+        self.organChange(self.countersignersTagsData)
 
       } else if (row.length < self.selectedKeys.length) {
         // 用户取消了选择
-        let diff = self.selectedKeys.find(item => !row.includes(item));
+        let diff = self.selectedKeys.find(item => !row.includes(item))
 
         // 从 countersignersTagsData 中移除取消的用户
         if (diff) {
-          self.countersignersTagsData = self.countersignersTagsData.filter(item => item !== diff);
-          self.selectedKeys = row; // 更新选中数据
+          self.countersignersTagsData = self.countersignersTagsData.filter(item => item !== diff)
+          self.selectedKeys = row // 更新选中数据
         }
       }
     },
 
     //数据初始化？
     organTreeRedis(row, readingRange) {
-      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 organIds =[]
+      let organIds = []
+      if (readingRange.length > 0) {
         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
-            }
+      }
+
+      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")
+        }
+      ).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)
+            }
           }
-        })
-
-      }
+        }
+      })
 
     },
 
@@ -695,7 +684,7 @@ export default {
   watch: {
     countersignersTagsData: {
       handler(newVal, oldVal) {
-        console.log("countersignersTagsData",newVal)
+        console.log('countersignersTagsData', newVal)
         let organ = []
         let names = []
         let organs = []
@@ -770,9 +759,10 @@ export default {
 }
 
 .contLeft {
-  flex: 0 0 40%;
-  z-index: 1;
-  margin-right: 10px
+  flex: 1; /* 让右侧自适应剩余空间 */
+  margin-top: 34px; /* 您原本的33.98px可改为34px */
+  min-height: 350px;
+  overflow: auto; /* 可选，若内容过长也可滚动 */
 }
 
 .contRight {
@@ -793,49 +783,48 @@ export default {
 }
 
 .contLeftTwo {
-  flex: 0 0 50%;
-  z-index: 1;
+  flex: none; /* 改为none，这样不按照flex比例缩放 */
+  width: 250px; /* 固定宽度或max-width */
   margin-right: 10px;
+  overflow: auto; /* 当内容超过300px宽时出现滚动条 */
 }
 
-.contRightTwo {
-  flex: 0 0 49%;
-  margin-top: 30px;
-}
 
 /deep/ .ivu-checkbox-input {
   width: 136px;
 }
-/deep/.custom-select .ivu-select {
-  height: 80px;         /* 控制总体高度 */
+
+/deep/ .custom-select .ivu-select {
+  height: 80px; /* 控制总体高度 */
   min-height: 80px;
-  line-height: normal;   /* 避免行高过大导致居中 */
+  line-height: normal; /* 避免行高过大导致居中 */
   box-sizing: border-box;
 }
 
-/deep/.custom-select .ivu-select-input {
+/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 {
+/deep/ .custom-select .ivu-select-selection {
   display: flex !important;
   flex-wrap: wrap !important;
   align-items: flex-start !important;
-  height: 80px;          /* 与上面的高度一致 */
+  height: 80px; /* 与上面的高度一致 */
   padding: 8px !important;
   line-height: normal !important;
   overflow-y: auto;
 }
 
-/deep/.custom-select .ivu-select-selection__choice {
+/deep/ .custom-select .ivu-select-selection__choice {
   margin: 0 5px 5px 0;
-  vertical-align: top;}
+  vertical-align: top;
+}
 
 /* 可选：调整下拉箭头的位置 */
-/deep/.custom-select .ivu-select-arrow {
+/deep/ .custom-select .ivu-select-arrow {
   display: none;
 }
 </style>