songxy 11 miesięcy temu
rodzic
commit
5c34a453d2

+ 5 - 1
client/src/api/oa/workflow/index.ts

@@ -79,7 +79,11 @@ export const addTProcessEngine = async (templateId: string) => {
 // 获取办件中心汇总数据
 export const getHandlerCaseCenterCount = async (data) => {
   return await request.postOriginal(
-    { url: '/HandlerCaseCenter/count', data: data, headersType: 'application/form-data' },
+    {
+      url: '/HandlerCaseCenter/count',
+      data: jsonToFormData(data),
+      headersType: 'application/form-data'
+    },
     '/workflow'
   )
 }

+ 2 - 2
client/src/views/OaSystem/officeCenter/mainOfficeCenter/common.ts

@@ -72,7 +72,7 @@ export const TabColumns = {
         tooltip: true
       },
       { label: '流程名称', align: 'left', name: 'NAME', width: 130 },
-      { label: '完成环节', align: 'center', name: 'ACTIVITYNAME', width: 160 },
+      { label: '完成环节', align: 'center', name: 'ACTIVITYNAME', width: 160, tooltip: true },
       {
         label: '完成时间',
         align: 'center',
@@ -120,7 +120,7 @@ export const TabColumns = {
         tooltip: true
       },
       { label: '流程名称', align: 'left', name: 'NAME', width: 130 },
-      { label: '完成环节', align: 'center', name: 'ACTIVITYNAME', width: 160 },
+      { label: '完成环节', align: 'center', name: 'ACTIVITYNAME', width: 160, tooltip: true },
       {
         label: '完成时间',
         align: 'center',

+ 9 - 7
client/src/views/OaSystem/officeCenter/mainOfficeCenter/index.vue

@@ -45,6 +45,11 @@
         <el-form :inline="true" :model="searchForm" class="demo-form-inline">
           <el-form-item label="流程名称">
             <el-tree-select
+              v-model="flowTemIds"
+              multiple
+              node-key="id"
+              collapse-tags
+              collapse-tags-tooltip
               :data="flowTemplates"
               :props="defaultProps"
               :render-after-expand="false"
@@ -294,6 +299,7 @@ defineOptions({
   name: 'MainOfficeCenter2'
 })
 const message = useMessage()
+const flowTemIds = ref<any[]>([])
 const currentTab = ref<string>('1')
 const sendData = reactive({
   _search: false,
@@ -366,12 +372,7 @@ const queryOfficeCenterModule = async () => {
   return tabList
 }
 const queryHandlerCaseCenterCount = async () => {
-  const formData = new FormData()
-  const keys = Object.keys(sendData)
-  for (let key of keys) {
-    formData.set(key, sendData[key])
-  }
-  getHandlerCaseCenterCount(formData).then((result) => {
+  getHandlerCaseCenterCount(sendData).then((result) => {
     tabList.value.forEach((item) => {
       item['value'] = result[keyValMap[item['key']]]
     })
@@ -448,7 +449,8 @@ const searchForm = ref({
 })
 const treeRef = ref()
 const searchHandle = () => {
-  sendData.flowTemIds = treeRef.value.getCheckedNodes(false).map((item) => item['id'])
+  //@ts-ignore
+  sendData.flowTemIds = flowTemIds.value
   queryHandlerCaseCenterCount()
   handleCurrentChange(1)
 }