commit

src/main/resources/views/mobile/difficulty/apply.html

@@ -5,7 +5,7 @@ layout("/mobile/platform.html"){
 <div id="app" v-cloak>
     <van-nav-bar title="困难补助申请" left-arrow placeholder fixed
                  @click-left="history.back()"></van-nav-bar>
-    <van-form ref="addForm" :show-error-message="false" input-align="right">
+    <van-form ref="addForm" :show-error-message="false" input-align="right" style="margin-bottom: 60px">
         <van-cell-group inset class="mt10">
             <van-field readonly
                        value="${@shiro.getPrincipalProperty('username')} ( ${@shiro.getPrincipalProperty('loginname')} )"
@@ -114,6 +114,17 @@ layout("/mobile/platform.html"){
             </van-button>
         </div>
     </van-form>
+
+    <div>
+        <van-tabbar v-model="tarBarActive" style="z-index: 99">
+            <van-tabbar-item icon="home-o" replace url="/mobile/difficulty/apply/index">困难补助申请
+            </van-tabbar-item>
+            <van-tabbar-item icon="manager-o" replace url="/mobile/difficulty/apply/apply_list">
+                困难补助记录
+            </van-tabbar-item>
+        </van-tabbar>
+    </div>
+
 </div>
 <script src="/assets/platform/module/difficulty/common.js?v=1.0.0"></script>
 
@@ -123,6 +134,7 @@ layout("/mobile/platform.html"){
         mixins: [mobileMixins],
         data() {
             return {
+                tarBarActive: 0,
                 id: GetQueryString("id"),
                 hospitalized_timeShow: false,
                 sq_bzlxShow: false,
@@ -173,7 +185,7 @@ layout("/mobile/platform.html"){
                     this.$set(this.formData, 'unitname', "${@shiro.getPrincipalProperty('unit').getName()}")
                     this.$set(this.formData, 'birthday', "${@shiro.getPrincipalProperty('birthday')}")
                     this.$set(this.formData, 'lxfs', "${@shiro.getPrincipalProperty('mobile')}")
-                    this.$set(this.formData, 'idcard', "${@shiro.getPrincipalProperty('idCard')}")
+                    this.$set(this.formData, 'idcard', "${@shiro.getPrincipalProperty('idcard')}")
                 } else if (val === 2) {
                     this.formData = {}
                     this.$set(this.formData, 'apply_mode', 2)
@@ -216,6 +228,7 @@ layout("/mobile/platform.html"){
                 formData.files = JSON.stringify(formData.files)
                 formData.applicantsign = formData.sqsign
                 formData.bbzrusername = formData.difficultyUser
+                formData.flag = true
                 this.$refs['addForm'].validate().then(async () => {
                     this.$toast.loading('提交中...')
                     const res = await $.post('/platform/fw/difficulty/apply/doAdd', formData)
@@ -269,4 +282,4 @@ layout("/mobile/platform.html"){
 </script>
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/difficulty/audit_list.html

@@ -103,7 +103,7 @@ layout("/mobile/platform.html"){
                 }, 600)
             },
             async flushUnits() {
-                if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
+                if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === 'true') {
                     await mCommon.getUnitList(this.pageForm.unionId)
                 } else {
                     await mCommon.getUnitList("${@shiro.getPrincipalProperty('unit').getUnionid()}")

src/main/resources/views/mobile/difficulty/school_Audit.html

@@ -23,7 +23,7 @@ layout("/mobile/platform.html"){
                 ></van-field>
 
                 <van-field v-model="formData.auditTime" label="审核时间" readonly></van-field>
-                <van-field v-model="formData.xghbzje" label="补助金额"></van-field>
+                <van-field v-model="formData.xghbzje" label="初审金额"></van-field>
 
                 <van-field v-model="formData.opinion"
                            rows="1"
@@ -91,10 +91,7 @@ layout("/mobile/platform.html"){
                     return
                 }
                 this.$refs.signature.submitSign()
-                if (this.$refs.signature.checkNull()) {
-                    vant.Toast('请签名')
-                    return
-                }
+
                 await this.$refs.signature.updateSign()
                 this.formData.pass = pass
                 const resp = await $.post("/platform/fw/difficulty/schoolmanager/doReview", this.formData)

src/main/resources/views/mobile/difficulty/union_Audit.html

@@ -11,7 +11,7 @@ layout("/mobile/platform.html"){
         <template #handle>
             <div class="van-cell-group__title">
                 <div class="van-sidebar-item van-sidebar-item--select">
-                    院级工会主席审核
+                    分工会主席审核
                 </div>
             </div>
             <van-form>
@@ -90,10 +90,6 @@ layout("/mobile/platform.html"){
                     return
                 }
                 this.$refs.signature.submitSign()
-                if (this.$refs.signature.checkNull()) {
-                    vant.Toast('请签名')
-                    return
-                }
                 await this.$refs.signature.updateSign()
                 this.formData.pass = pass
                 const resp = await $.post("/platform/fw/difficulty/unionchairman/doReview", this.formData)