Browse Source

财务修改-页面修改

953954216 5 months ago
parent
commit
6a1980ff24

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCwxxTbMapper.xml

@@ -101,9 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
-        a.id as jg_id , a.jlrq djsj, a.tyshxydm tyxydm, a.jgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
+        a.id as jg_id , a.jlrq djsj, a.cwtyshxydm tyxydm, a.cwjgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
         a.frdjjg djbm, a.frlxfs dh, a.sczt bdlx, a.cwbj lx,
-
         ( case when SUBSTRING(dwxz,1,1) =3 then 10 when SUBSTRING(dwxz,1,1) =2 then 30 when dwxz =42 then 42  else null end) jglx,
         ( case when SUBSTRING(dwxz,1,1) =3 then 2 when SUBSTRING(dwxz,1,1) =2 then 1 when dwxz =42 then 3 else null	end	) xz,
         a.xbzt, a.yljgzyxkzh yljgzyxkzdjh, a.jzmj jgjzmj,

+ 3 - 0
ruoyi-ui/src/views/business/fwjggl/cwxxtb/index.vue

@@ -38,6 +38,9 @@
       </el-table-column>
     </el-table>
 
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                @pagination="getList" />
+
     <!-- 添加或修改先进个人管理对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1600px" append-to-body>
       <el-form class="add-form" ref="form" :model="form" :rules="rules" :disabled="true" label-width="180px" :inline="true">