通知公告功能优化

client/.env.dev

@@ -10,6 +10,9 @@ VITE_BASE_URL='http://10.10.10.7:48080'
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'
 
+# File上传路径
+VITE_FILE_BASE_URI='/infra/file'
+
 # 流程详情页面路径
 VITE_PROCESS_DETAIL_URI = 'http://10.10.10.7:48080/workflow'
 

client/src/utils/dict.ts

@@ -147,5 +147,6 @@ export enum DICT_TYPE {
   CONTRACT_SECOND_TYPE = 'contract_second_type',
   PROJECT_HY = 'project_hy',
   POST_TYPE = 'post_type',
-  ABILITY_LEVEL = 'ABILITY_LEVEL'
+  ABILITY_LEVEL = 'ABILITY_LEVEL',
+  INVOICE_OUT_STATUS = 'INVOICE_OUT_STATUS'
 }

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -32,7 +32,19 @@
       </div>
       <div class="form">
         <span class="formSpan">开票状态：</span>
-        <el-input v-model="queryParams.status" style="width: 160px" />
+        <el-select
+          v-model="queryParams.flowStatus"
+          placeholder="请选择开票状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.INVOICE_OUT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </div>
 
       <div class="form" style="width: 380px">
@@ -138,9 +150,9 @@
           prop="returnDate"
           label="回款日期"
         />
-        <el-table-column prop="state" label="开票状态" width="100">
+        <el-table-column prop="state" label="开票状态" width="120">
           <template #default="scope">
-            {{ xmztMap[scope.row.flowStatus] }}
+            {{ getDictLabel(DICT_TYPE.INVOICE_OUT_STATUS, scope.row.flowStatus) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="160" fixed="right">
@@ -170,20 +182,13 @@
 import * as kpglApi from '@/api/oa/kpgl'
 import { getFlowUrl } from '@/api/oa/index'
 import { openFlow } from '@/utils/flow'
+import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
 import { formatDate, dateFormatter2 } from '@/utils/formatTime'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
 
 defineOptions({ name: 'CommonCost' })
-const xmztMap: any = {
-  0: '开票中',
-  1: '回款完成',
-  2: '已开票',
-  3: '票已送达',
-  4: '部分回款',
-  20: '开票申请完成'
-}
 
 const invoiceTime = ref([])
 const returnTime = ref([])

client/src/views/OaSystem/marketCenter/khglPage/CustomerTable.vue

@@ -142,8 +142,8 @@ const newCustomer = (isAdd: boolean, row?) => {
   const params = !isAdd
     ? `/editCustomer?id=${row.id}&edit=true`
     : row
-      ? `/newCustomer?id=${row.id}`
-      : '/newCustomer'
+    ? `/newCustomer?id=${row.id}`
+    : '/newCustomer'
   push(params)
 }
 // 查看客户详情

client/src/views/OaSystem/officeCenter/notice/index.vue

@@ -44,7 +44,7 @@
         <el-table-column prop="title" label="标题">
           <template #default="scope">
             <a
-              :class="{ 'line-primary': true, active: !scope.row['readState'] }"
+              :class="{ 'line-primary': true }"
               href="javascript:void(0)"
               @click="toLookDetail(scope.row)"
               >{{ scope.row['title'] }}</a

client/src/views/OaSystem/officeCenter/noticeAndLearn/addoreditor.vue

@@ -36,7 +36,9 @@
     </el-form>
     <div class="btnGroup" style="text-align: right">
       <span>
-        <el-button type="primary" @click="onSubmit(ruleFormRef)">保存</el-button>
+        <el-button type="primary" @click="onSubmit(ruleFormRef)">{{
+          eTypeRef === 'add' ? '发布' : '保存'
+        }}</el-button>
       </span>
       <el-button @click="router.back()">取消</el-button>
     </div>

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/ContractReturnedMoney.vue

@@ -32,6 +32,20 @@ const invoiceTypeFilter: (val: number | string) => string = (val: number | strin
   if (!val) return ''
   return invoiceTypeMap[val.toString()]
 }
+/**
+ * 流程查看
+ */
+const router = useRouter()
+const processLookHandle = (row) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url: `${
+        import.meta.env.VITE_PROCESS_DETAIL_URI
+      }/IFlowInstance/redirectFlowPage?flowInstanceId=${row?.instanceId}`
+    }
+  })
+}
 </script>
 
 <template>
@@ -66,7 +80,11 @@ const invoiceTypeFilter: (val: number | string) => string = (val: number | strin
           <td>{{ invoiceTypeFilter(item['invoiceType']) }}</td>
           <td>{{ item['returnDate'] }}</td>
           <td>
-            <span style="text-align: center; color: #2e77e6">查看流程</span>
+            <span
+              style="text-align: center; color: #2e77e6; cursor: pointer"
+              @click="processLookHandle(item)"
+              >查看流程</span
+            >
           </td>
         </tr>
       </tbody>

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/noticeAndLearn/NoticeAndLearnServiceImpl.java

@@ -68,7 +68,7 @@ public class NoticeAndLearnServiceImpl implements NoticeAndLearnService {
                 return false;
             }).collect(Collectors.toList());
         }
-        lists.stream().sorted(Comparator.comparing(NoticeAndLearnRespVO::getCreateTime).reversed());
+        lists = lists.stream().sorted(Comparator.comparing(NoticeAndLearnRespVO::getCreateTime).reversed()).collect(Collectors.toList());
         List<NoticeAndLearnRespVO> pageList = lists.stream().skip((reqVO.getPageNo() - 1) * reqVO.getPageSize())
                 .limit(reqVO.getPageSize())
                 .collect(Collectors.toList());