@lambo-design-mobile/workflow-approve 1.0.0-beta.3 → 1.0.0-beta.30

package/src/SelectOrganize.vue

@@ -27,7 +27,7 @@
 
 <script>
 import Tree from "./tree/Tree.vue";
-import {getOrgan, getOrgRootTree, getOrgSubNodes} from "../api";
+import {getOrgan, getOrgRootTree, getOrgSubNodes, getBizOrgRootTree} from "../api";
 
 export default {
   name: "CustomTree",
@@ -46,6 +46,15 @@ export default {
     organizeIdList: {
       type: Array,
       default: () => []
+    },
+    // 根组织获取规则，为true表示用登录人权限范围
+    orgRootWithPermit: {
+      type: Boolean,
+      default: true
+    },
+    treetypeId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -102,7 +111,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 +150,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,21 +168,40 @@ export default {
         });
       });
     } else {
-      getOrgRootTree().then((res) => {
-        const result = res.data;
-        if (result.code === 1) {
-          this.organizeData = result.data.map((item) => {
-            return {
-              children: [],
-              title: item.organName,
-              id: item.organCode,
-              parentId: item.parentId,
-              checked: false,
-              expand: false
-            };
-          });
-        }
-      });
+      if (this.orgRootWithPermit){
+        getOrgRootTree(this.treetypeId).then((res) => {
+          const result = res.data;
+          if (result.code === 200) {
+            this.organizeData = result.data.map((item) => {
+              return {
+                children: [],
+                title: item.organName,
+                id: item.organCode,
+                parentId: item.parentId,
+                checked: false,
+                expand: false
+              };
+            });
+          }
+        });
+      } else {
+        getBizOrgRootTree(this.treetypeId).then((res) => {
+          const result = res.data;
+          if (result.code === 200) {
+            this.organizeData = result.data.map((item) => {
+              return {
+                children: [],
+                title: item.bizOrganName,
+                id: item.bizOrganCode,
+                parentId: item.parentId,
+                checked: false,
+                expand: false
+              };
+            });
+          }
+        });
+      }
+
     }
   }
 };

package/src/TodoListCard.vue

@@ -16,42 +16,53 @@
           </template>
         </van-cell>
         <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
-                  title="样品单号"
+                  title="申请编号"
                   :value="item.applyId"></van-cell>
         <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
                   title="流程名称" @click="toggleDetails(index)" :is-link="true"
                   :arrow-direction="detailsVisible[index] ? 'down' : ''"
                   :value="item.procName"></van-cell>
         <div v-if="detailsVisible[index]">
-          <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
-                    title="当前环节"
-                    :value="item.taskName"></van-cell>
           <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false" title="申请人"
                     :value="item.applyUser ? item.applyUser.split(':')[1] : '未定义'"></van-cell>
+          <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
+                    :title="selectedTask === 'pending' ? '发起时间':'审批时间' "
+                    :value="selectedTask === 'pending' ? formatDate(item.startDate) :formatDate(item.auditDate)">
+          </van-cell>
         </div>
-        <van-cell title-class="list-title" value-class="list-value" class="custom-cell"
-                  :title="selectedTask === 'pending' ? '发起时间':'审批时间' "
-                  :value="selectedTask === 'pending' ? formatDate(item.startDate) :formatDate(item.auditDate)">
-        </van-cell>
+        <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
+                  title="当前环节"
+                  :value="item.taskName"></van-cell>
         <van-cell v-if="selectedTask === 'pending'" :key="selectedTask" title=" ">
           <template #right-icon>
             <div class="button-group">
+              <van-button class="button" size="small" plain type="info" @click="derive(item)">
+                转办
+              </van-button>
               <van-button class="button" size="small" plain type="info" @click="handleItem(item)">
-                {{ item.handleType === '20' ? '审批' : '办理' }}
+                {{ item.handleName || (item.handleType === '20' ? '审批' : '办理') }}
               </van-button>
             </div>
           </template>
         </van-cell>
       </van-cell-group>
     </van-checkbox-group>
+    <van-popup v-if="selectUserPopupShow" v-model="selectUserPopupShow" closeable round position="bottom" :style="{ height: '80%' }">
+      <div class="select-user-popup-body">
+        <select-handle title="指定办理人" :procType="selectUserPopupParams.procType" :organ-tree-type="selectUserPopupParams.organTreeType" :org-root-with-permit="false"
+                       :org-list="selectUserPopupParams.orgList" :user-list="selectUserPopupParams.userList" @selectHandle="handleSelectResult"></select-handle>
+      </div>
+    </van-popup>
   </div>
 </template>
 <script>
-import {getNodeData} from "../api";
-import {Notify} from "vant";
+import {getNodeData, audit, getTransferRange} from "../api";
+import {Notify, Toast} from "vant";
+import SelectHandle from "./SelectHandle.vue";
 
 export default {
   name: 'TodoListCard',
+  components: {SelectHandle},
   props: {
     todoList: {},
     selectedTask: {
@@ -85,6 +96,19 @@ export default {
       localTodoList: this.todoList,
       detailsVisible: {}, // 用于跟踪每个项目的详细内容是否可见
       localResult: this.result,  // 使用 localResult 来绑定 van-checkbox-group
+      selectUserPopupShow: false,  // 转办弹框
+      selectUserPopupParams: {
+        procType: '',
+        class: '',
+        userList: [],
+        orgList: [],
+        organTreeType: '',
+        procId: '',
+        taskNode: '',
+        applyId: '',
+        taskId: '',
+        instanceId: '',
+      },
     }
   },
   watch: {
@@ -182,10 +206,124 @@ export default {
     toggleDetails(index) {
       this.$set(this.detailsVisible, index, !this.detailsVisible[index]);
     },
+    // 转办
+    async derive(item) {
+      this.resetTransferPopupData();
+      this.selectUserPopupParams.procType = item.procType
+      this.selectUserPopupParams.procId = item.procId
+      this.selectUserPopupParams.taskNode = item.taskNode
+      this.selectUserPopupParams.applyId = item.applyId
+      this.selectUserPopupParams.taskId = item.taskId
+      this.selectUserPopupParams.instanceId = item.procInstanceId || item.instanceId
+      const success = await this.fetchTransferRange();
+      if (success) {
+        this.selectUserPopupShow = true;
+      }
+    },
+    resetTransferPopupData() {
+      this.selectUserPopupParams = {
+        procType: '',
+        class: '',
+        userList: [],
+        orgList: [],
+        organTreeType: '',
+        procId: '',
+        taskNode: '',
+        applyId: '',
+        taskId: '',
+        instanceId: '',
+      };
+    },
+    async fetchTransferRange() {
+      try {
+        const params = {
+          procType: this.selectUserPopupParams.procType,
+          procId: this.selectUserPopupParams.procId,
+          taskNode: this.selectUserPopupParams.taskNode,
+          applyId: this.selectUserPopupParams.applyId,
+          taskId: this.selectUserPopupParams.taskId,
+          instanceId: this.selectUserPopupParams.instanceId,
+          actionType: 'auditTo82',
+        };
+        const res = await getTransferRange(params);
+        const result = res.data;
+        if (result.code == 200) {
+          this.selectUserPopupParams.organTreeType = result.data.organTreeType;
+          this.selectUserPopupParams.userList = result.data.userList;
+          this.selectUserPopupParams.orgList = result.data.orgList;
+          return true;
+        } else {
+          console.warn('获取选择人员范围失败，返回码:', result.code);
+          return false;
+        }
+      } catch (err) {
+        console.error('获取选择人员范围异常', err);
+        return false;
+      }
+    },
+    handleSelectResult(checkResult) {
+      const self = this
+      console.log('Selected result:', checkResult);
+      let auditParams = {
+        procId: self.selectUserPopupParams.procId,
+        applyId: self.selectUserPopupParams.applyId,
+        taskId: self.selectUserPopupParams.taskId,
+        auditResult: '82',
+        selectedUserId: checkResult[0].userId,
+      }
+      self.auditRequest(auditParams);
+      self.selectUserPopupShow = false;
+    },
+    auditRequest(auditParams) {
+      let self = this
+      Toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true,
+        message: '处理中',
+      })
+      //确认执行审批逻辑
+      audit(auditParams).then((resp) => {  // 使用箭头函数
+        let result = resp.data
+        if (result.code === '200') {
+          Toast.success(result.message);
+        } else {
+          Toast.fail(result.message);
+        }
+        this.selectUserPopupShow = false;
+        this.$emit('refresh');
+      })
+    },
   }
 }
 </script>
 <style scoped>
+.select-user-popup-body {
+  height: 100%;
+  overflow: visible;
+}
+
+::v-deep .select-user-popup-body > * {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: visible;
+  min-height: 0;
+}
+
+::v-deep .select-user-popup-body #headTitle {
+  flex: 0 0 auto;
+}
+
+::v-deep .select-user-popup-body #listContent {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+::v-deep .select-user-popup-body .custom-bottom-bar {
+  position: relative;
+  flex-shrink: 0;
+}
 
 .button-group {
   display: flex;
@@ -234,4 +372,4 @@ export default {
   flex: 0 0 auto;
 }
 
-</style>
+</style>