1、解决办件作废和作废回复功能，及流程描述展示等

2、新增访问工资分页接口

client/src/api/salary/index.ts

@@ -0,0 +1,6 @@
+import request from '@/config/axios'
+import { SalaryInfoPageDTO } from './types'
+
+export const getSalaryPage = async (json: SalaryInfoPageDTO) => {
+  return await request.post({ url: '/salary/page', data: json }, '/business')
+}

client/src/api/salary/types.ts

@@ -0,0 +1 @@
+export type SalaryInfoPageDTO = {}

client/src/views/OaSystem/mainOfficeCenter/callback.ts

@@ -30,8 +30,8 @@ const useCallback = (option: CallbackOptionType) => {
   }
   const callbackActivity = (item: any) => {
     getCalBackActivityNew({
-      activityInstanceId: item['ACTIVITYINSID'],
-      flowInsId: item['FLOWINSID']
+      activityInstanceId: item['activityinsid'],
+      flowInsId: item['flowinsid']
     }).then((result: any) => {
       callbackVisible.value = true
       initCallbackFormData(result)

client/src/views/OaSystem/mainOfficeCenter/inullyApply.ts

@@ -43,7 +43,14 @@ const useInullyApply = (option: InullyApplyOptionType) => {
     inullyApplyForm.nullyApplyTime = getCurrentDate()
     inullyApplyForm.iNullied = iNullied
     inullyApplyForm.flowInstanceId = generateUUID()
-    inullyApplyForm.voidFlowInstanceId = row?.flowinsid ?? ''
+    inullyApplyForm.voidFlowInstanceId = ''
+    if (row) {
+      if (row.flowinsid) {
+        inullyApplyForm.voidFlowInstanceId = row.flowinsid
+      } else if (row.FLOWINSID) {
+        inullyApplyForm.voidFlowInstanceId = row.FLOWINSID
+      }
+    }
     inullyApplyForm.voidFlowCode = row?.code ?? ''
     inullyApplyForm.voidFlowDesc = row?.describtion ?? ''
     inullyApplyForm.voidFlowName = row?.activityname ?? ''

client/src/views/OaSystem/mainOfficeCenter/lookAndApplyFlow.ts

@@ -27,7 +27,7 @@ const useLookAndApplyFlow = () => {
    */
   const openFlowHandle = (item: any, status?: string) => {
     const saveAndGetUrlReqParam = {
-      activityInsId: status == '160' ? item['nullyId'] : item['activityinsid'] || '',
+      activityInsId: '',
       flowInsId: status == '160' ? item['FLOWINSID'] : item['flowinsid'] || '',
       participantId: item['participantid'] || '',
       status: item['status'] || status,

client/src/views/OaSystem/oaLayout/menusActive.vue

@@ -46,17 +46,29 @@ const menuClick = (item: any) => {
     path &&
     (path.toLocaleLowerCase().startsWith('http') || path.toLocaleLowerCase().startsWith('https'))
   ) {
-    // 遍历查询对应名称的流程模板ID
-    flowTemplateTree.value.forEach((element: any) => {
-      if (element.name === name) {
-        id = element.id
-      }
-    })
-    // 根据流程模板ID添加流程实例
-    addTProcessEngine(id).then((result: any) => {
-      // 跳转到流程实例具体页面
-      openFlow(router, result, name)
-    })
+    if (!path.includes('workflow')) {
+      // 遍历查询对应名称的流程模板ID
+      flowTemplateTree.value.forEach((element: any) => {
+        if (element.name === name) {
+          id = element.id
+        }
+      })
+      // 根据流程模板ID添加流程实例
+      addTProcessEngine(id).then((result: any) => {
+        // 跳转到流程实例具体页面
+        openFlow(router, result, name)
+      })
+    } else {
+      // push({
+      //   path: item['componentName'],
+      //   query: {
+      //     iframe: '1',
+      //     url: path,
+      //     title: name,
+      //     iFrameId: `${item['componentName']}_001`
+      //   }
+      // })
+    }
     return
   }
   push('/OaSystem/' + pushName.value + '/' + item.path)

client/src/views/OaSystem/searchCenter/salary/index.vue

@@ -17,18 +17,19 @@
   </div>
   <div class="container-main">
     <el-table style="width: 100%" :data="list" @row-click="handleRowClick">
-      <!-- 年度、月份、导入时间、人员类型（excel 导入）、身份证号码、银行卡号、银行、单位、应发工资合计、扣发工资合计、实发工资合计 -->
-      <el-table-column prop="supplierName" label="年度" />
-      <el-table-column prop="contactPerson" label="月份" />
-      <el-table-column prop="contactPhone" label="导入时间" />
-      <el-table-column prop="unitAddress" label="人员类型" />
-      <el-table-column prop="unitAddress" label="身份证号码" />
-      <el-table-column prop="unitAddress" label="银行卡号" />
-      <el-table-column prop="unitAddress" label="银行" />
-      <el-table-column prop="unitAddress" label="单位" />
-      <el-table-column prop="unitAddress" label="应发工资合计" />
-      <el-table-column prop="unitAddress" label="扣发工资合计" />
-      <el-table-column prop="unitAddress" label="实发工资合计" />
+      <el-table-column prop="id" label="" v-if="false" />
+      <el-table-column prop="year" label="年度" />
+      <el-table-column prop="month" label="月份" />
+      <el-table-column prop="importDate" label="导入时间" />
+      <el-table-column prop="name" label="姓名" />
+      <el-table-column prop="personnelType" label="人员类型" />
+      <el-table-column prop="idCard" label="身份证号码" />
+      <el-table-column prop="bankCard" label="银行卡号" />
+      <el-table-column prop="bank" label="银行" />
+      <el-table-column prop="workUnint" label="单位" />
+      <el-table-column prop="totalPayable" label="应发工资合计(元)" />
+      <el-table-column prop="totalDeducted" label="扣发工资合计(元)" />
+      <el-table-column prop="actualPay" label="实发工资合计(元)" />
     </el-table>
     <el-pagination
       background
@@ -41,7 +42,24 @@
   </div>
 </template>
 
-<script lang="ts" scoped></script>
+<script lang="ts" scoped>
+import { ref, reactive } from 'vue'
+import * as SalaryApi from '@/api/salary'
+
+const total = ref(0)
+const list = ref([])
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+
+// 获取工资列表
+const salaryList = async (json) => {
+  const data = await SalaryApi.getSalaryPage(json)
+  total.value = data.total
+  list.value = data.records
+}
+</script>
 
 <style lang="scss" scoped>
 @import './index.scss';