瀏覽代碼

普通报销台账更新

chenjun 1 年之前
父節點
當前提交
9e80fc46fd

+ 20 - 6
client/src/views/OaSystem/financialManagement/ptbxPage/index.vue

@@ -102,13 +102,17 @@
             color: '#121518',
             height: '50px'
           }"
+          table-layout="fixed"
         >
-          <el-table-column align="center" label="序号" width="60">
-            <template #default="scope">{{ scope.$index + 1 }}</template>
-          </el-table-column>
+          <el-table-column type="index" />
           <el-table-column align="center" prop="commonCostNo" label="报销单号" />
           <el-table-column align="center" prop="userNickname" label="报销人" />
-          <el-table-column align="center" prop="deptName" label="报销人部门" />
+          <el-table-column
+            show-overflow-tooltip="true"
+            align="center"
+            prop="deptName"
+            label="报销人部门"
+          />
           <el-table-column
             align="center"
             prop="applyTime"
@@ -116,8 +120,18 @@
             label="申请时间"
           />
           <el-table-column align="center" prop="totalAmount" label="报销总金额" />
-          <el-table-column align="center" prop="xmjl" label="项目名称" />
-          <el-table-column align="center" prop="lxsj" label="项目部门" />
+          <el-table-column
+            show-overflow-tooltip="true"
+            align="center"
+            prop="xmjl"
+            label="项目名称"
+          />
+          <el-table-column
+            show-overflow-tooltip="true"
+            align="center"
+            prop="lxsj"
+            label="项目部门"
+          />
           <el-table-column align="center" prop="yssj" label="状态" />
           <el-table-column align="center" label="操作" width="80">
             <template #default="scope">

+ 1 - 1
zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/dao/CommonCostDao.java

@@ -21,6 +21,6 @@ public interface CommonCostDao extends BaseMapperX<CommonCostDO> {
     }
 
     default PageResult<CommonCostDO> getCommonCostPage(CommonCostPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<CommonCostDO>());
+        return selectPage(reqVO, new LambdaQueryWrapperX<CommonCostDO>().orderByDesc(CommonCostDO::getApplyTime));
     }
 }