From 9f432e2b33b1388461b43610cf0491b457b7e085 Mon Sep 17 00:00:00 2001
From: "825299534@qq.com" <Aa825299534>
Date: Wed, 26 Mar 2025 11:05:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9=E6=9C=89=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?2.=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1=E4=B8=8B=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81,=E6=B7=BB=E5=8A=A0=E5=B8=A6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/components/CodeGeneratorModal.vue  |   2 +-
 src/views/form/template/index.vue             | 245 ++++++++++++------
 2 files changed, 161 insertions(+), 86 deletions(-)

diff --git a/src/views/form/design/components/CodeGeneratorModal.vue b/src/views/form/design/components/CodeGeneratorModal.vue
index 568bf2c..1a6f4c6 100644
--- a/src/views/form/design/components/CodeGeneratorModal.vue
+++ b/src/views/form/design/components/CodeGeneratorModal.vue
@@ -161,6 +161,7 @@
     generatorConfig.tableStructureConfigs = formJson.tableStructureConfigs;
     generatorConfig.formEventConfig = formJson.formEventConfig;
     generatorConfig.outputConfig.dataAuthList = formJson.dataAuthList;
+    generatorConfig.outputConfig.type =res.formDesignType
     generatorConfig.outputConfig.isDataAuth = formJson.isDataAuth;
     isGetInfo.value = true;
   });
@@ -200,7 +201,6 @@
       tableInfo.value,
       buildOption(generatorConfig.formJson) as FormProps,
     );
-
     await dataFirstGeneratorCode(data);
     closeModal();
     emits('success');
diff --git a/src/views/form/template/index.vue b/src/views/form/template/index.vue
index 64683a3..cde5c0a 100644
--- a/src/views/form/template/index.vue
+++ b/src/views/form/template/index.vue
@@ -8,7 +8,8 @@
         :clickRowToExpand="true"
         :treeData="treeData"
         :fieldNames="fieldNames"
-        @select="handleSelect"
+        @row-dbClick="dbClickRow"
+        :row-selection="rowSelection"
       >
         <template #title="item">
           <template v-if="item.renderIcon === 'parentIcon'">
@@ -210,6 +211,9 @@
   const { currentRoute } = useRouter();
   const { path } = unref(currentRoute);
   const printMenuId = computed(() => currentRoute.value.meta.menuId as string);
+  const schemaIdComputedRef = ref();
+  schemaIdComputedRef.value = currentRoute.value.meta.schemaId
+  const router = useRouter();
   const { filterColumnAuth, filterButtonAuth } = usePermission();
 
   let columns: BasicColumn[] = [], //列表配置
@@ -321,6 +325,7 @@
     view: handleView,
     add: handleAdd,
     edit: handleEdit,
+    startwork : handleStartwork,
     delete: handleDelete,
     batchdelete: handleBatchdelete,
     batchSetUserId: handleBatchSetUserId,
@@ -544,14 +549,20 @@
   }
 
   function handleAdd() {
-    const info = {
-      isUpdate: false,
-      releaseId: menuId.value,
-      pkField: pkField.value,
-      formEventConfig,
-      formProps,
-    };
-    formType.value === 'modal' ? openModal(true, info) : openDrawer(true, info);
+      if (schemaIdComputedRef.value) {
+          router.push({
+              path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow'
+          });
+      } else {
+          const info = {
+              isUpdate: false,
+              releaseId: menuId.value,
+              pkField: pkField.value,
+              formEventConfig,
+              formProps,
+          };
+          formType.value === 'modal' ? openModal(true, info) : openDrawer(true, info);
+      }
   }
 
   function handleEdit(record: Recordable) {
@@ -567,15 +578,36 @@
   }
 
   function handleView(record: Recordable) {
-    const info = {
-      id: record[pkField.value],
-      releaseId: menuId.value,
-      pkField: pkField.value,
-      isView: true,
-      formEventConfig,
-      formProps,
-    };
-    formType.value === 'modal' ? openModal(true, info) : openDrawer(true, info);
+      if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
+          const { processId, taskIds, schemaId } = record.workflowData;
+          router.push({
+              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+              query: {
+                  taskId: taskIds[0],
+                  rtId: currentRoute.value.query.rtId
+              }
+          });
+      } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
+          const { processId, schemaId } = record.workflowData;
+          router.push({
+              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+              query: {
+                  readonly: 1,
+                  taskId: '',
+                  rtId: currentRoute.value.query.rtId
+              }
+          });
+      } else {
+          const info = {
+              id: record[pkField.value],
+              releaseId: menuId.value,
+              pkField: pkField.value,
+              isView: true,
+              formEventConfig,
+              formProps,
+          };
+          formType.value === 'modal' ? openModal(true, info) : openDrawer(true, info);
+      }
   }
 
   function handleCopyData(record: Recordable) {
@@ -841,78 +873,121 @@
     reload();
   });
 
-  function getActions(record: Recordable): ActionItem[] {
-    const hasStartWorkButton = buttonConfigs.value?.some((x) => x.code === 'startwork');
-    let actionsList: ActionItem[] = [];
-    let editAndDelBtn: ActionItem[] = [];
-    let hasFlowRecord = false;
-    actionButtonConfig.value?.map((button) => {
-      if (button.code === 'view') {
-        actionsList.push({
-          icon: button?.icon,
-          tooltip: button?.name,
-          onClick: handleView.bind(null, record),
-        });
-      }
-      if (['edit', 'copyData', 'delete'].includes(button.code)) {
-        editAndDelBtn.push({
-          icon: button?.icon,
-          tooltip: button?.name,
-          color: button.code === 'delete' ? 'error' : undefined,
-          onClick: btnEvent[button.code].bind(null, record),
-        });
-      }
-      if (button.code === 'flowRecord') hasFlowRecord = true;
-    });
-    if (record.workflowData?.enabled) {
-      if (!hasStartWorkButton) return actionsList;
-      //与工作流有关联的表单
-      if (record.workflowData.status) {
-        //如果是本人需要审批的数据 就会有taskIds  所以需要修改绑定事件
-        const act: ActionItem = {};
-        if (record.workflowData.taskIds) {
-          act.tooltip = t('查看流程(待审批)');
-          act.icon = 'daishenpi|svg';
-          act.onClick = handleApproveProcess.bind(null, record);
-        } else {
-          act.tooltip =
-            t('查看流程') +
-            (record.workflowData.status === 'ACTIVE' ? t('(审批中)') : t('(已完成)'));
-          act.icon =
-            record.workflowData.status === 'ACTIVE' ? 'jinshenpi|svg' : 'shenpiwancheng|svg';
-          act.onClick = handleViewWorkflow.bind(null, record);
-        }
-        actionsList.unshift(act);
-        if (hasFlowRecord) {
-          actionsList.splice(1, 0, {
-            tooltip: '查看流转记录',
-            icon: 'liuzhuanxinxi|svg',
-            onClick: handleFlowRecord.bind(null, record),
-          });
-        }
+  function getActions(record: Recordable):ActionItem[] {
+
+      let actionsList: ActionItem[] = [];
+      let editAndDelBtn: ActionItem[] = [];
+      let hasFlowRecord = false;
+      actionButtonConfig.value?.map((button) => {
+          if (button.code === 'view') {
+              actionsList.push({
+                  icon: button?.icon,
+                  tooltip: button?.name,
+                  onClick: handleView.bind(null, record),
+              });
+          }
+          if (['edit', 'copyData', 'delete'].includes(button.code)) {
+              editAndDelBtn.push({
+                  icon: button?.icon,
+                  tooltip: button?.name,
+                  color: button.code === 'delete' ? 'error' : undefined,
+                  onClick: btnEvent[button.code].bind(null, record),
+              });
+          }
+          if (button.code === 'flowRecord') hasFlowRecord = true;
+      });
+      if (record.workflowData.enabled) {
+          //与工作流有关联的表单
+          if (record.workflowData.status) {
+              //如果是本人需要审批的数据 就会有taskIds  所以需要修改绑定事件
+              const act: ActionItem = {};
+              if (record.workflowData.taskIds) {
+                  act.tooltip = '查看流程(待审批)';
+                  act.icon = 'daishenpi|svg';
+                  act.onClick = handleApproveProcess.bind(null, record);
+              } else {
+                  act.tooltip =
+                      '查看流程' + (record.workflowData.status === 'ACTIVE' ? '(审批中)' : '(已完成)');
+                  act.icon =
+                      record.workflowData.status === 'ACTIVE' ? 'jinshenpi|svg' : 'shenpiwancheng|svg';
+                  act.onClick = handleStartwork.bind(null, record);
+              }
+              actionsList.unshift(act);
+              if (hasFlowRecord) {
+                  actionsList.splice(1, 0, {
+                      tooltip: '查看流转记录',
+                      icon: 'liuzhuanxinxi|svg',
+                      onClick: handleFlowRecord.bind(null, record),
+                  });
+              }
+
+          } else {
+              actionsList.unshift({
+                  icon: 'faqishenpi|svg',
+                  tooltip: record.workflowData.draftId ? '编辑草稿' : '发起审批' ,
+                  onClick: handleLaunchProcess.bind(null, record),
+              });
+              actionsList = actionsList.concat(editAndDelBtn);
+          }
       } else {
-        actionsList.unshift({
-          icon: 'faqishenpi|svg',
-          tooltip: record.workflowData.draftId ? t('编辑草稿') : t('发起审批'),
-          onClick: handleLaunchProcess.bind(null, record),
-        });
-        actionsList = actionsList.concat(editAndDelBtn);
+          if (!record.workflowData.processId) {
+              //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
+              actionsList = actionsList.concat(editAndDelBtn);
+          }
       }
-    } else {
-      if (!record.workflowData?.processId) {
-        //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
-        actionsList = actionsList.concat(editAndDelBtn);
-      }
-    }
-    return actionsList;
+      return actionsList;
   }
 
-  function handleSelect(selectIds) {
-    selectId.value = selectIds[0];
-    reload({
-      searchInfo: { [listConfig.value.leftMenuConfig?.listFieldName as string]: selectId.value },
-    });
+  function handleStartwork(record: Recordable) {
+      const { processId, schemaId } = record.workflowData;
+      router.push({
+          path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+          query: {
+              readonly: 1,
+              taskId: '',
+          }
+      });
   }
+  function dbClickRow(record) {
+      if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
+          const { processId, taskIds, schemaId } = record.workflowData;
+          router.push({
+              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+              query: {
+                  taskId: taskIds[0],
+                  rtId: currentRoute.value.query.rtId
+              }
+          });
+      } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
+          const { processId, schemaId } = record.workflowData;
+          router.push({
+              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+              query: {
+                  readonly: 1,
+                  taskId: '',
+                  rtId: currentRoute.value.query.rtId
+              }
+          });
+      } else {
+          router.push({
+              path: '/form/infoTaskManageItem/' + record.id + '/viewForm',
+              query: {
+                  formPath: 'infoManage/infoTaskManageItem'
+              }
+          });
+      }
+  }
+
+  const rowSelection: TableProps['rowSelection'] = {
+      onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {
+          selectedKeys.value = selectedRowKeys;
+          selectedRowsData.value = selectedRows;
+      },
+      getCheckboxProps: (record: DataType) => ({
+          disabled: record.workflowData.taskIds === null, // Column configuration not to be checked
+          name: record.workflowData.taskIds,
+      }),
+  };
 
   async function fetchLeftData() {
     //如果是数据字典