@lambo-design-mobile/workflow-approve 1.0.0-beta.22 → 1.0.0-beta.24

package/src/FlowNodeCell.vue

@@ -2,7 +2,7 @@
   <van-cell center>
     <template v-slot:icon>
       <div
-          v-if="['通过','流程发起','跳转指定节点'].includes(getAuditStatus(item.auditResult).text)"
+          v-if="['通过','流程发起','跳转指定节点'].includes(getAuditStatus(item.auditResult, item.handleName, item.rejectName).text)"
           class="completed-icon">
         <van-icon class="iconfont" class-prefix='icon' :name=getAuditStatus(item.auditResult).icon
                   size="28px" color="#fff"/>
@@ -36,7 +36,7 @@
     </template>
     <template v-slot:default>
                         <span :style="{ color: getAuditStatus(item.auditResult).color }">{{
-                            getAuditStatus(item.auditResult).text
+                            getAuditStatus(item.auditResult, item.handleName, item.rejectName).text
                           }}</span>
     </template>
   </van-cell>

package/src/SelectHandle.vue

@@ -16,7 +16,7 @@
         <template #right-icon>
           <div @click="onSearch" class="todo-search">搜索</div>
         </template>
-        <template #action>
+        <template v-if="!useUserTransferRange" #action>
           <van-badge :dot="searchFilterBadge">
             <van-icon @click="searchFilterShow = !searchFilterShow;" name="filter-o" color="#666666" size="25px"/>
           </van-badge>
@@ -51,9 +51,10 @@
       <van-list v-model="loading" style="padding-top: 15px"
                 :finished="finished"
                 finished-text="没有更多了"
+                :immediate-check="false"
                 @load="handleLoad()">
         <select-handle-card ref="selectHandleCard" :multi-select="multiSelect" :person-list="personList.rows"
-                            :result.sync="checkResult">
+                            :result.sync="checkResult" :show-status="!useUserTransferRange">
         </select-handle-card>
       </van-list>
     </div>
@@ -63,14 +64,14 @@
     </div>
 
     <van-popup v-model="searchOrganShow" closeable round position="bottom" :style="{ height: '80%' }">
-      <select-organize :all-organize="true" :show-check-box="false" @handleSelect="onSelect" ></select-organize>
+      <select-organize :all-organize="true" :treetype-id="orgTreeType" :organize-id-list="organizeIdList" :show-check-box="false" @handleSelect="onSelect" ></select-organize>
     </van-popup>
   </div>
 </template>
 
 <script>
 import SelectHandleCard from "./SelectHandleCard.vue";
-import {getOrgRootTree, getProcessType, getUserList} from "../api";
+import {getOrgRootTree, getProcessType, getUserList, getTransferRange} from "../api";
 import Tree from "./tree/Tree.vue";
 import SelectOrganize from "./SelectOrganize.vue";
 
@@ -89,6 +90,18 @@ export default {
     multiSelect: {  // 新增一个 prop 来控制是否开启多选模式
       type: Boolean,
       default: false
+    },
+    organTreeType: {
+      type: String,
+      required: false
+    },
+    userList: {  // 用户选择范围
+      type: Array,
+      default: () => ([])
+    },
+    orgList: {  // 组织选择范围
+      type: Array,
+      default: () => ([])
     }
   },
   data() {
@@ -96,6 +109,9 @@ export default {
       searchOrganShow: false,
       searchFilterShow: false,
       searchFilterBadge: false,
+      useUserTransferRange: false,
+      userRangeList: [],
+      orgTreeType: '',
       searchForm: {
         userId: '',
         orgTreeType: '',
@@ -114,6 +130,7 @@ export default {
         rows: []
       },
       checkResult: [],  // 需要传递到子组件的 checkResult
+      organizeIdList: [],  // 需要传递到子组件的组织选择范围
     };
   },
   mounted() {
@@ -121,47 +138,75 @@ export default {
   },
   methods: {
     initSearch() {
-      getOrgRootTree().then(res => {
-        const result = res.data;
-        if (result.code === 1) {
-          this.searchForm.organId = result.data[0].organId;
-          this.searchForm.organTitle = result.data[0].organName;
-          this.searchForm.userId = '';
+      if (this.userList && this.userList.length > 0) {
+        this.useUserTransferRange = true
+        this.userRangeList = this.userList.map(item => { return{...item, organName: item.organName || item.deptName} })
+        this.personList.rows = this.userRangeList
+        this.personList.total = this.userRangeList.length
+        return
+      }
+      this.useUserTransferRange = false
+      if (this.orgList && this.orgList.length > 0){
+        this.organizeIdList = this.orgList.map(item => item.orgId)
+        this.orgTreeType = this.organTreeType;
+        this.searchForm = {
+          ...this.searchForm,
+          orgTreeType: this.organTreeType,
+          organId: this.orgList[0].orgId,
+          organTitle: this.orgList[0].orgName,
+          userId: ''
         }
         this.handleLoad()
-      })
+      } else {
+        getProcessType(this.procType).then(res => {
+          this.orgTreeType = res.data.data.rows[0].organTreeType;
+          const permScope = res.data.data.rows[0].permScope || 'all'
+          getOrgRootTree(this.orgTreeType).then(res => {
+            const orgResult = res.data;
+            if (orgResult.code === 200) {
+              this.searchForm = {
+                ...this.searchForm,
+                orgTreeType: this.orgTreeType,
+                permScopeList: permScope,
+                organId: orgResult.data[0].organId,
+                organTitle: orgResult.data[0].organName,
+                userId: ''
+              }
+            }
+            this.handleLoad()
+          })
+        }).catch(error => {
+          console.error(error)
+        })
+      }
     },
     handleLoad() {
       console.log("触发加载")
+      this.loading = true;
+      if (this.useUserTransferRange){
+        this.personList.rows = this.searchForm.userName ? this.userRangeList.map(item => item.userName === this.searchForm.userName) : this.userRangeList
+        this.personList.total = this.personList.rows.length;
+        this.loading = false;
+        return
+      }
       const offset = this.personList.rows.length;
       const limit = 10;
 
-      getProcessType(this.procType).then(res => {
-
-        this.searchForm.orgTreeType = res.data.data.rows[0].organTreeType;
-        const userArray = this.extractUsers(res.data.data.rows[0].permScope);
-        if (userArray.length > 0) {
-          this.searchForm.permScopeList = userArray.join(',')
+      getUserList(offset, limit, this.searchForm).then(res => {
+        const result = res.data;
+        if (result.code === "1") {
+          //返回的数据添加到 personList 中
+          this.personList.rows = this.personList.rows.concat(result.data.rows);
+          this.personList.total = result.data.total;
         }
-        getUserList(offset, limit, this.searchForm).then(res => {
-
-          const result = res.data;
-          if (result.code === "1") {
-            //返回的数据添加到 personList 中
-            this.personList.rows = this.personList.rows.concat(result.data.rows);
-            this.personList.total = result.data.total;
-          }
 
-          this.loading = false;
-          this.finished = this.personList.rows.length >= this.personList.total;
+        this.loading = false;
+        this.finished = this.personList.rows.length >= this.personList.total;
 
-        }).catch(error => {
-          console.error('Error fetching data:', error);
-          this.loading = false;
-        });
       }).catch(error => {
-        console.error(error)
-      })
+        console.error('Error fetching data:', error);
+        this.loading = false;
+      });
     },
 
     extractUsers(permScope) {
@@ -220,10 +265,10 @@ export default {
   },
   watch: {
     // 监听 searchForm 的每一个字段的变化
-    searchForm: {
-      handler: 'checkSearchForm',
-      deep: true // 深度监听
-    }
+    // searchForm: {
+    //   handler: 'checkSearchForm',
+    //   deep: true // 深度监听
+    // }
   }
 }
 </script>
@@ -349,4 +394,4 @@ export default {
 .submitForm:active {
   background: linear-gradient(90deg, rgba(0, 150, 255, 0.8), rgba(22, 119, 255, 0.79));
 }
-</style>
+</style>

package/src/SelectHandleCard.vue

@@ -17,7 +17,7 @@
                   :border="false" title="部门名称"
                   :value="item.organName"></van-cell>
         <van-cell title-class="list-title" value-class="list-value" class="custom-cell"
-                  :border="false" title="人员状态">
+                  :border="false" title="人员状态" v-if="showStatus">
           <template v-slot:default>
             <span :style="getStatusStyle(item.status)"></span>
             <span :style="{ color: getStatusStyle(item.status)['background-color'] }">
@@ -46,6 +46,10 @@ export default {
     multiSelect: {  // 新增一个 prop 来控制是否开启多选模式
       type: Boolean,
       default: false
+    },
+    showStatus: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/SelectOrganize.vue

@@ -46,6 +46,10 @@ export default {
     organizeIdList: {
       type: Array,
       default: () => []
+    },
+    treetypeId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -102,7 +106,7 @@ export default {
     handleLoadData(node, callback) {
       getOrgSubNodes(node.id).then((res) => {
         const result = res.data;
-        if (result.code === 1) {
+        if (result.code === 200) {
           callback(
               result.data.map((item) => {
                 return {
@@ -141,7 +145,7 @@ export default {
       this.organizeIdList.forEach((item) => {
         getOrgan(item).then((res) => {
           const result = res.data;
-          if (result.code === 1) {
+          if (result.code === 200) {
             // 确保 result.data 是一个对象
             const newItem = {
               children: [],
@@ -159,9 +163,9 @@ export default {
         });
       });
     } else {
-      getOrgRootTree().then((res) => {
+      getOrgRootTree(this.treetypeId).then((res) => {
         const result = res.data;
-        if (result.code === 1) {
+        if (result.code === 200) {
           this.organizeData = result.data.map((item) => {
             return {
               children: [],