财务确认填报修改

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCwxxTb.java

@@ -136,6 +136,7 @@ public class SysCwxxTb extends BaseEntity
     /** 是否为所有权、经营权分离公办养老机构 */
     @Excel(name = "是否为所有权、经营权分离公办养老机构")
     @ApiModelProperty(value = "是否为所有权、经营权分离公办养老机构")
+    @DictV(type = "CZ035",message = "{是否为所有权、经营权分离公办养老机构}")
     @Size(max = 2, message = "{是否为所有权、经营权分离公办养老机构}")
 
     private String isfl;
@@ -155,16 +156,15 @@ public class SysCwxxTb extends BaseEntity
     private String ylbxddyljgzgzjbm;
 
     /** 机构建筑面积（平方米） */
-    @Excel(name = "机构建筑面积", dictType = "平方米")
+    @Excel(name = "机构建筑面积")
     @ApiModelProperty(value = "机构建筑面积（平方米）")
-//    @DictV(type = "平方米",message = "{机构建筑面积}")
+    @Digits(integer = 10,fraction = 2,message = "{机构建筑面积}")
     private String jgjzmj;
 
     /** 相关单位统一社会信用代码 */
     @Excel(name = "相关单位统一社会信用代码")
     @ApiModelProperty(value = "相关单位统一社会信用代码")
     @Size(max = 18, message = "{相关单位统一社会信用代码}")
-
     private String xgdwtyshxydm;
 
     /** 相关单位名称 */

ruoyi-ui/src/views/business/fwjggl/cwxxtbXg/index.vue

@@ -27,7 +27,7 @@
               clearable
             >
               <el-option
-                v-for="dict in dict.type.CZ035"
+                v-for="dict in dict.type.XZ130"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -72,7 +72,7 @@
           <el-table-column label="台卡类型[财务]" align="center" prop="cwbj" />
           <el-table-column label="是否确认" align="center" prop="iscwqr" >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ035" :value="scope.row.iscwqr" />
+              <dict-tag :options="dict.type.XZ130" :value="scope.row.iscwqr" />
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -158,9 +158,9 @@
             </el-form-item>
           </div>
           <div class="formFlex">
-            <el-form-item label="是否认证" prop="iscwqr">
-              <el-select v-model="form.iscwqr" placeholder="请选择是否认证" clearable>
-                <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-form-item label="确认状态" prop="iscwqr">
+              <el-select v-model="form.iscwqr" placeholder="请选择是否确认" clearable>
+                <el-option v-for="dict in dict.type.XZ130" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
           </div>
@@ -176,7 +176,7 @@
 </template>
 
 <script>
-import {getJcxx, listJcxx, updateJgKyzt, updateJcxxCw, getJcxxCw, listJcxxCw} from '@/api/business/fwjggl/jcxx'
+import {getJcxx, updateJcxxCw, getJcxxCw, listJcxxCw} from '@/api/business/fwjggl/jcxx'
 import { mapState } from 'vuex'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
@@ -186,7 +186,7 @@ export default {
     'C0038', 'C0015', 'CH026',
     'CH007', 'CH009', 'CH010', 'CH012', 'CH013', 'CH014', 'C0015', 'CH052', 'CH059', 'CH060',
     'CZ035', 'CZ005', 'CZ026', 'CZ004',
-    'XZ036', 'XZ065', 'XZ070'],
+    'XZ036', 'XZ065', 'XZ070', 'XZ130'],
   data() {
     return {
       optionsTklx: [{