From 6a7257f9d8f659c508cf826726126c0fa4363eef Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 14 四月 2025 17:04:39 +0800
Subject: [PATCH] 盘点单没有数据时一直加载中

---
 src/views/tigerprojects/system/lowcode/composition/index.vue |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/tigerprojects/system/lowcode/composition/index.vue b/src/views/tigerprojects/system/lowcode/composition/index.vue
index 8b4d180..58504c3 100644
--- a/src/views/tigerprojects/system/lowcode/composition/index.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/index.vue
@@ -4,13 +4,11 @@
  * @version: 
  * @Date: 2024-06-18 23:30:30
  * @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-23 23:16:58
+ * @LastEditTime: 2024-10-21 23:03:27
 -->
 <template>
   <PageWrapper
-    :dense="dense"
     contentFullHeight
-    fixedHeight
     contentClass="flex"
     :title="pageTitle"
     :content="pageContent"
@@ -29,7 +27,12 @@
             </div>
           </template>
         </CarGridNav>
-        <Config v-if="showConfig" :configType="configType" @success="configSuccess" />
+        <Config
+          v-if="showConfig"
+          :configType="configType"
+          :OtherTableName="OtherTableName"
+          @success="configSuccess"
+        />
       </div>
     </Suspense>
     <!-- <BasicTable class="w-3/4 xl:w-4/5" @register="registerTable">
@@ -80,10 +83,9 @@
   import GeneralModal from '/@/views/components/GeneralModal.vue';
   import CarGridNav from './CarGridNav.vue';
   import Config from './Config.vue';
-  import LeftTree from './LeftTree.vue';
   import CustModal from '/@/views/components/CustModal.vue';
   import { OpenCustModal, initRoute } from '../data';
-  import { Ref, VNode, onMounted, provide, ref, unref } from 'vue';
+  import { Ref, VNode, defineAsyncComponent, onMounted, provide, ref, unref } from 'vue';
   import { FlowChartView } from '/@/components/FlowChart';
   import { useRoute } from 'vue-router';
   import { BasicForm, useForm } from '/@/components/Form/index';
@@ -93,8 +95,9 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import LogicFlow from '@logicflow/core';
 
-  defineOptions({ name: 'DeptManagement' });
+  defineOptions({ name: '宸ュ崟宸ヨ壓缁戝畾' });
 
+  const LeftTree = defineAsyncComponent(() => import('./LeftTree.vue'));
   const { notification, createErrorModal } = useMessage();
   const go = useGo();
   const route = useRoute();
@@ -119,14 +122,16 @@
   const isMounted = ref(false);
   const showNav = ref(false);
   const showConfig = ref(false);
+  const showOtherTable = ref(false);
   const configType = ref('');
+  const OtherTableName = ref('');
   const nodes = ref([]);
   const routeData = ref({
     nodes: [],
     edges: [],
   });
   const custImport = ref<any>(null);
-  const [registerCust, { openModal: openCustomModal, closeModal }] = useModal();
+  const [registerCust] = useModal();
   provide<Ref<any>>('objParams', objParams);
   provide<Ref<any>>('selectedNodes', nodes);
   setTitle(objParams.value.Title); //璁剧疆鏍囩椤垫爣棰�
@@ -139,7 +144,7 @@
     if (!isNullOrUnDef(custImport.value)) {
       const [{ GetHomeUrl }] = custImport.value['default']();
       // 鏈緥鐨勬晥鏋滄椂鐐瑰嚮杩斿洖濮嬬粓璺宠浆鍒拌处鍙峰垪琛ㄩ〉锛屽疄闄呭簲鐢ㄦ椂鍙繑鍥炰笂涓�椤�
-      go(GetHomeUrl({ colSlots: colSlots.value }));
+      go(GetHomeUrl({ colSlots: colSlots.value, sName:objParams.value.firstSessionName  }));
     }
   }
 
@@ -163,12 +168,12 @@
 
   const currlf = ref(null) as Ref<LogicFlow | null>;
   /**
-   * @description: 宸ヨ壓璺嚎鍒濆鍖�
+   * @description: 宸ヨ壓璺嚎鍒濆鍖栵紝鐗规畩椤甸潰鑷畾涔夊唴瀹�
    * @param {*} lf
    * @return {*}
    */
   async function init(lf, rotId) {
-    initRoute(lf, rotId, routeData, currlf);
+    initRoute(lf, rotId, routeData, currlf, objParams.value.rotType);
   }
 
   /**
@@ -178,15 +183,22 @@
    */
   function NodeSelect(e) {
     showConfig.value = e.showConfig;
+    showOtherTable.value = e.showOtherTable;
     showNav.value = e.showNav;
     configType.value = e.type;
+    OtherTableName.value = objParams.value.OtherTableName;
     nodes.value = e.nodes;
     routeData.value = {
       nodes: [],
       edges: [],
     };
-    if ((e.nodes[0].type == 'Route')) {
-      initRoute(currlf, e.nodes[0].code, routeData, currlf);
+    /* 鑷畾涔夊唴瀹癸紝鍙湁鏄剧ず宸ヨ壓璺嚎鐨勭粍鍚堥〉闈細杩涙潵 */
+    if (e.nodes[0].type == 'Route') {
+      let _rotId = e.nodes[0].code;
+      if (objParams.value.rotType == 'Wo') {
+        _rotId = e.nodes[0].wo;
+      }
+      initRoute(currlf, _rotId, routeData, currlf, objParams.value.rotType);
     }
   }
 
@@ -194,7 +206,7 @@
    * @description: 鍒犻櫎鑺傜偣鍚庡洖璋�
    * @param {*} node
    * @return {*}
-   */  
+   */
   function delCallback(node) {
     refreshPage();
   }
@@ -254,3 +266,8 @@
     ); //[openRvModal], selectVals.value['ID']杩欐槸鑷畾涔夊弬鏁帮紝鎸夊疄闄呴渶姹�
   }
 </script>
+<style lang="less">
+.vben-page-wrapper .vben-page-wrapper-content {
+    margin: 1px;
+}
+</style>

--
Gitblit v1.9.3