Browse Source

财务修改-页面修改

953954216 5 months ago
parent
commit
74f336f8d7

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

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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,
+        a.xbzt, a.jzmj jgjzmj,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1') nmzgrs,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  xb = '2') nzgrs,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  zylx in ('01','02','03','06','09','10')) yhry,

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

@@ -43,7 +43,7 @@
 
     <!-- 添加或修改先进个人管理对话框 -->
     <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">
+      <el-form class="add-form" ref="form" :model="form" :rules="rules" :disabled="true" label-width="180px" :inline="true" >
         <div v-for="(it,ind) in optData" :key="it.label">
           <h3>{{it.label}}:</h3>
           <div class="formFlex" style="position: relative">
@@ -506,7 +506,7 @@ export default {
 };
 </script>
 <style ref="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-input__inner{
+.add-form ::v-deep .el-input__inner{
   width: 220px;
 }
 .formBox {