lcw

src/components/flowPath/SelectingPeople.vue

@@ -241,7 +241,6 @@ const qcckPostList = async () => {
   const data = {}
   const listError = []
   for (let i = 0; i < checkListData.value.length; i++) {
-
     if (Array.isArray(checkListData.value[i].userList)) {
       for (let j = 0; j < checkListData.value[i].userList.length; j++) {
         const item = checkListData.value[i].userList[j]
@@ -318,7 +317,6 @@ const endpoints = [
 const queryModel = async () => {
   try {
     loading.value = true
-
     // 查询模型信息
     const params = {
       modelId: props.radioData,
@@ -341,8 +339,11 @@ const queryModel = async () => {
     const eventNode = resData[1].rows.find(item =>
       item.nodeType === '1' && item.nodeId === sequenceNode.targetNodeId
     )
-    const orgId = 'a8aa5ed229724b278faa7abd0f0cceb6'
-    // getItem('userOrg').parentid
+    const orgId = getItem('deptId')[0].fzOrgId
+    if (!orgId) {
+        proxy.$message({ type: "error", message: "查询模型失败，请重试" })
+      return
+    }
     if (eventNode) {
       // 处理事件节点
       await handleEventNode(eventNode, orgId)
@@ -360,7 +361,6 @@ const queryModel = async () => {
 const optional=ref(false)
 // 处理事件节点
 const handleEventNode = async (eventNode, orgId) => {
-
   const nodeExtension = JSON.parse(eventNode.nodeExtension)
   modelData.value = [eventNode]
   checkList.value = [eventNode.nodeId]
@@ -372,13 +372,20 @@ const handleEventNode = async (eventNode, orgId) => {
     orgid: ""
   }
   if (nodeExtension.flwsUserNode.orgType == 'brothers') {
+    console.log(1);
+
     orgData = await queryListByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'parent') {
+      console.log(2);
     orgData = await querysingleByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'parents') {
+      console.log(3);
     orgData = await queryUporgsByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'appoint') {
+     console.log(4);
     // orgData = await queryUporgsByEntity({ orgcode: orgId })
+    console.log(orgData);
+
   }
   if (nodeExtension.flwsUserNode.orgType == 'appoint') {
     promes.roles = roles
@@ -424,7 +431,6 @@ const handleEventNode = async (eventNode, orgId) => {
 
 // 处理普通节点
 const handleNormalNodes = async (resData, sequenceNode, orgId) => {
-
   const targetNodeIds = resData[2].rows
     .filter(item => item.sourceNodeId === sequenceNode.targetNodeId)
     .map(item => item.targetNodeId)
@@ -468,6 +474,7 @@ const handleNormalNodes = async (resData, sequenceNode, orgId) => {
       })
       promesList[modelData.value[i].nodeId] = list
     } else if (str.flwsUserNode.orgType == 'appoint') {
+
       list = [{
         posts: str.flwsUserNode.post[0] ? str.flwsUserNode.post[0] : '',
         roles: str.flwsUserNode.role[0] ? str.flwsUserNode.role[0] : '',
@@ -543,14 +550,11 @@ function filterUsersWithOrgInfo(orgsData, checkList) {
 const sendMessage = (gzlid) => {
   let letDataCheck = []
   let userList = []
-  console.log(checkListData.value);
-
   for (let i = 0; i < checkListData.value.length; i++) {
     letDataCheck = [...letDataCheck, ...checkListData.value[i].checkList]
   userList.push(checkListData.value[i].userList)
   }
-  console.log(letDataCheck);
-  console.log(userList);
+
   const bkshrSfzh = filterUsersWithOrgInfo(userList, letDataCheck).map(item => {
         return {
       bkshrXm: item.username,