bug修复 管道气审批

src/views/dayPlan/PngAppro/index.vue

@@ -126,12 +126,23 @@
       schemas: customSearchFormSchema,
       fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD HH:mm:ss ', true]],
       showResetButton: true,
+      submitButtonOptions: {
+        text: '搜索',
+        onClick: () => {
+          clearSelectedRowKeys()
+        },
+      },
+      resetButtonOptions: {
+        text: '重置',
+        onClick: () => {
+          clearSelectedRowKeys()
+        },
+      },
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id'};
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit};
     },
     afterFetch: (res) => {
-      clearSelectedRowKeys()
       tableRef.value.setToolBarWidth();
       
     },
@@ -221,8 +232,16 @@
       
   }
   function handleApprove(record: Recordable) {
-
-  }
+    router.push({
+      path: '/dayPlan/PngAppro/createForm',
+      query: {
+        formPath: 'dayPlan/PngAppro',
+        formName: formName,
+        formId:currentRoute.value.meta.formId,
+        id: record.id
+      }
+    });
+}
   function handleCompare (record: Recordable) {
 
   }
@@ -253,9 +272,11 @@
     
     let actionsList: ActionItem[] = [];
     let editAndDelBtn: ActionItem[] = [];
-   let hasFlowRecord = false; 
+    let approveBtn: ActionItem[] = [];
+    let compareBtn: ActionItem[] = [];
+    let hasFlowRecord = false; 
     actionButtonConfig.value?.map((button) => {
-      if (['view', 'copyData'].includes(button.code)) {
+      if (['view', 'copyData', 'compare'].includes(button.code)) {
         actionsList.push({
           icon: button?.icon,
           tooltip: button?.name,
@@ -270,21 +291,31 @@
           onClick: btnEvent[button.code].bind(null, record),
         });
       }
+      if (['approve'].includes(button.code)) {
+        approveBtn.push({
+          icon: button?.icon,
+          tooltip: button?.name,
+          onClick: btnEvent[button.code].bind(null, record),
+        });
+      }
       if (button.code === 'flowRecord') hasFlowRecord = true;
     });
-    if (record.workflowData?.enabled) {
-      //与工作流有关联的表单
-      if (record.workflowData.status) {
-        actionsList.unshift(setIndexFlowStatus(record.workflowData))
-      } else {
-        actionsList = actionsList.concat(editAndDelBtn);
-      }
-    } else {
-      if (!record.workflowData?.processId) {
-        //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
-        actionsList = actionsList.concat(editAndDelBtn);
-      }
+    if (record.approCode == 'XS') {
+      actionsList = actionsList.concat(approveBtn);
     }
+    // if (record.workflowData?.enabled) {
+    //   //与工作流有关联的表单
+    //   if (record.workflowData.status) {
+    //     actionsList.unshift(setIndexFlowStatus(record.workflowData))
+    //   } else {
+    //     actionsList = actionsList.concat(editAndDelBtn);
+    //   }
+    // } else {
+    //   if (!record.workflowData?.processId) {
+    //     //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
+    //     actionsList = actionsList.concat(editAndDelBtn);
+    //   }
+    // }
     return actionsList;
   }
   function handleStartwork(record: Recordable) {