diff --git a/20241205091835.nb3 b/20241205091835.nb3 deleted file mode 100644 index 87bca05..0000000 Binary files a/20241205091835.nb3 and /dev/null differ diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java b/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java index 63fb9f9..90d0d11 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java @@ -103,7 +103,7 @@ public class Zgfw_knbf implements Serializable { @Column @Comment("出生日期") - @ColDefine(type = ColType.DATE) + @ColDefine(type = ColType.DATETIME) private Date birthday; @Column diff --git a/src/main/resources/static/assets/mobile/css/theme.css b/src/main/resources/static/assets/mobile/css/theme.css index c043f18..b9aedff 100644 --- a/src/main/resources/static/assets/mobile/css/theme.css +++ b/src/main/resources/static/assets/mobile/css/theme.css @@ -77,7 +77,7 @@ box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%); } -.van-empty { +/*.van-empty { background-color: #FFFFFF; position: absolute; left: 50%; @@ -86,7 +86,7 @@ width: 100%; height: 100%; z-index: 0; -} +}*/ .van-dropdown-item__content { border-bottom-right-radius: 15px; diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index a40cf62..32130ec 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -123,6 +123,8 @@ var loginPjax = "${@shiro.getPrincipalProperty('loginPjax')}" const LOGO_URL = "${config.logoUrl!}" + window.sessionStorage.setItem("user", JSON.stringify(${json(@shiro.getPrincipal())})) + ELEMENT.locale(ELEMENT.lang["${lang,escape}"]) Vue.component("vuedraggable", window.vuedraggable) diff --git a/src/main/resources/views/mobile/condolence/apply.html b/src/main/resources/views/mobile/condolence/apply.html index ce36c8b..abab8d2 100644 --- a/src/main/resources/views/mobile/condolence/apply.html +++ b/src/main/resources/views/mobile/condolence/apply.html @@ -3,149 +3,208 @@ layout("/mobile/platform.html"){ #-->
- + - - - - - - - + + + + - - - + + - - + - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - + @@ -153,8 +212,7 @@ layout("/mobile/platform.html"){ - + @@ -162,8 +220,8 @@ layout("/mobile/platform.html"){ -
- 上传附件说明：{{ uploadFileDesc }} +
+ 上传附件说明：{{ uploadFileDesc }}
@@ -179,26 +237,21 @@ layout("/mobile/platform.html"){
- - 提 交 - + 提 交
- 慰问申请 - - 慰问记录 - + 慰问申请 + 慰问记录
-
- +
@@ -29,14 +30,11 @@ layout("/mobile/platform.html"){
- +
- - {{o.be_username}} - + {{o.be_username}} {{o.apply_time}} {{o.type_name}} @@ -49,69 +47,61 @@ layout("/mobile/platform.html"){
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
- - +
- 慰问申请 - - 慰问记录 - + 慰问申请 + 慰问记录
- + @@ -49,6 +49,10 @@ + + - diff --git a/src/main/resources/views/platform/zgfw/difficulty/common/info.js b/src/main/resources/views/platform/zgfw/difficulty/common/info.js index c221f40..da785a7 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/common/info.js +++ b/src/main/resources/views/platform/zgfw/difficulty/common/info.js @@ -1,6 +1,6 @@ const info = { - template:/*language=HTML*/ - ` + /*language=HTML*/ + template: `
@@ -9,9 +9,9 @@ {{ viewData.proxyUserName }} {{ viewData.proxyLoginName }} - {{ viewData.userName }} - {{ viewData.loginName }} - {{ viewData.sex }} + {{ viewData.userName }} + {{ viewData.loginName }} + {{ viewData.sex }} {{ viewData.unitName }} {{ viewData.unionName }} {{ viewData.monthlyIncome }} @@ -82,7 +82,7 @@ - + {{ viewData.schoolUnionFinalAudit.username }} {{ viewData.schoolUnionFinalAudit.auditTime }} @@ -105,19 +105,18 @@ data() { return { viewData: {}, - activeName: '1' + activeName: "1" } }, methods: { - onOpen(id, activeName = '1') { + onOpen(id, activeName = "1") { this.activeName = activeName - $.get('/platform/difficulty/common/findOne', {id}).then(res => { + $.get("/platform/difficulty/common/findOne", { id }).then((res) => { if (res.code === 0) { try { res.data.familyList = JSON.parse(res.data.familyList) res.data.files = JSON.parse(res.data.files) - } catch (e) { - } + } catch (e) {} this.viewData = res.data console.log(this.viewData) } @@ -125,12 +124,10 @@ } }, style: - /*language=CSS*/ - ` + /*language=CSS*/ + ` .applyInfo .el-descriptions__table{ table-layout: fixed; } ` - - } diff --git a/src/main/resources/views/platform/zgfw/difficulty/reading.html b/src/main/resources/views/platform/zgfw/difficulty/reading.html index 80b225e..744a105 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/reading.html +++ b/src/main/resources/views/platform/zgfw/difficulty/reading.html @@ -6,46 +6,44 @@ layout("/layouts/platform.html"){ -
@@ -132,7 +118,7 @@ layout("/layouts/platform.html"){ const vue = new Vue({ - el: '#app', + el: "#app", mixins: [initTableMixins], components: { info @@ -142,13 +128,13 @@ layout("/layouts/platform.html"){ unions: [], units: [], pageForm: { - unitId: '', - unionId: '', + unitId: "", + unionId: "", unit: "", year: "", searchName: "info.loginName" }, - unitOptions: [], + unitOptions: [] } }, methods: { @@ -165,14 +151,14 @@ layout("/layouts/platform.html"){ this.pageData() }, dropdownCommand(command) { - const {type, data} = command - if (type == 'view') { + const { type, data } = command + if (type == "view") { this.openView(data) - } else if (type == 'downloadAnnex') { + } else if (type == "downloadAnnex") { window.location.href = "/platform/difficulty/reading/downloadAnnex?id=" + data.id - } else if (type == 'doExport') { + } else if (type == "doExport") { window.location.href = "/platform/difficulty/reading/doExport?id=" + data.id - } else if (type == 'export') { + } else if (type == "export") { window.location.href = "/platform/difficulty/reading/export?id=" + data.id } }, @@ -181,34 +167,33 @@ layout("/layouts/platform.html"){ this.$refs.viewInfoRef.onOpen(row.id) }, doExcel() { - const {unionId, unitId, _dateRange} = this.pageForm - window.open("/platform/difficulty/reading/doExcel?dateRange=" + JSON.stringify(_dateRange) - + "&unionId=" + unionId + "&unitId=" + unitId) + const { unionId, unitId, _dateRange } = this.pageForm + window.open( + "/platform/difficulty/reading/doExcel?dateRange=" + JSON.stringify(_dateRange) + "&unionId=" + unionId + "&unitId=" + unitId + ) }, doWholeExcel() { - window.open("/platform/difficulty/reading/doWholeExcel?dateRange=" + JSON.stringify(_dateRange) - + "&unionId=" + unionId - + "&unitId=" + unitId) + window.open( + "/platform/difficulty/reading/doWholeExcel?dateRange=" + JSON.stringify(_dateRange) + "&unionId=" + unionId + "&unitId=" + unitId + ) }, async flushUnits() { this.$set(this.pageForm, "unitId", "") - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === "true") { this.units = await getUnits(this.pageForm.unionId) } else { this.units = await getUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}") } - }, + } }, async created() { this.pageData() this.unions = await getUnions() this.flushUnits() - } }) -