commit

src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java

@@ -218,6 +218,7 @@ public class WelfareProject extends ViBaseModel implements Serializable, SysHome
 
     @Column
     @Comment("是否禁用")
+    @Default("0")
     @ColDefine(type = ColType.BOOLEAN)
     private Boolean isDisabled;
 

src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java

@@ -91,7 +91,7 @@ public class zczjlbController {
         Double surplusMoney = zcxxes.stream().filter(z -> !List.of("报废", "丢失").contains(z.getZczt())).mapToDouble(Zgfw_Zcxx::getSurplusMoney).sum();
         //累计折旧
         Double depreciationMoney = allMoney - surplusMoney;
-        return Map.of("allMoney", allMoney, "surplusMoney", surplusMoney, "depreciationMoney", String.format("%.2f", depreciationMoney));
+        return Map.of("allMoney", String.format("%.2f", allMoney), "surplusMoney", String.format("%.2f", surplusMoney), "depreciationMoney", String.format("%.2f", depreciationMoney));
     }
 
 

src/main/resources/views/mobile/welfare/mine/address_edit.html

@@ -101,8 +101,8 @@ layout("/mobile/platform.html"){
                 this.addressInfo.name = "${@shiro.getPrincipalProperty('username')}";
                 this.closeLoading()
             }
-            this.areaList.province_list = {320000: "江苏省"}
+            /*this.areaList.province_list = {320000: "江苏省"}
-            this.areaList.city_list = {320200: "无锡市"}
+            this.areaList.city_list = {320200: "无锡市"}*/
 
         }
     })

src/main/resources/views/platform/welfare/addressManage.html

@@ -251,10 +251,10 @@ layout("/layouts/platform.html"){
         },
         async created() {
             this.pageData()
-            if ("${@shiro.hasRole('sysadmin')}" === 'false') {
+           /* if ("${@shiro.hasRole('sysadmin')}" === 'false') {
                 this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省")
                 this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市")
-            }
+            }*/
         }
     })
 </script>

src/main/resources/views/platform/welfare/list/ListMange.html

@@ -1154,11 +1154,11 @@ layout("/layouts/platform.html"){
             }
 
 
-            if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionWelfareAdmin')}" === 'false') {
+            /*if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionWelfareAdmin')}" === 'false') {
                 this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省")
                 this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市")
             }
-
+*/
             await this.getWelfareOptions()
 
         }

src/main/resources/views/platform/welfare/userChoose.html

@@ -745,10 +745,10 @@ layout("/layouts/platform.html"){
                 this.welfareSignMode = res
             })
 
-            if ("${@shiro.hasRole('sysadmin')}" === 'false') {
+           /* if ("${@shiro.hasRole('sysadmin')}" === 'false') {
                 this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省")
                 this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市")
-            }
+            }*/
 
 
         }