init

src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html

@@ -149,11 +149,13 @@ layout("/mobile/platform.html"){
             <van-form>
                 <van-field label="审核人员" readonly name="username" v-model="formData.username" required></van-field>
                 <van-field label="审核时间" readonly name="auditTime" v-model="formData.auditTime" required></van-field>
-                <van-field label="审核意见" name="auditOpinion" v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
+                <van-field label="审核意见" name="auditOpinion"
+                           type="textarea" maxlength="200" show-word-limit
+                           v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="default" block @click="infoShow=false">取消</van-button>
-                <van-button type="danger" block @click.submit="doApproval(2)">退回申请</van-button>
+<!--                <van-button type="danger" block @click.submit="doApproval(2)">退回申请</van-button>-->
                 <van-button type="danger" block @click.submit="doApproval(0)">拒绝接收</van-button>
                 <van-button type="primary" block @click.submit="doApproval(1)">同意接收</van-button>
             </div>
@@ -234,7 +236,7 @@ layout("/mobile/platform.html"){
                 }
                 let msg = '确定要通过此条申请吗？'
                 if (approvalType === 0) {
-                    msg = '拒绝后不可撤回，确定要拒绝此条申请吗？'
+                    msg = '确定要拒绝接收该教工的工会关系吗？'
                 } else if (approvalType === 2) {
                     msg = '确定要退回此条申请吗？'
                 }

src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js

@@ -41,8 +41,8 @@ const MEMBER_APPLY_AUDIT_INFO = {
                             <van-cell title="人员类型">{{ viewData.personType }}</van-cell>
                             <van-cell title="人员性质">{{ viewData.preparedBy || '暂无' }}</van-cell>
 
-                            <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>
-                            <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>
+<!--                            <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>-->
+<!--                            <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>-->
 
                             <van-cell title="家庭成员" class="column-cell">
                                 <table class="family-table">
@@ -67,11 +67,20 @@ const MEMBER_APPLY_AUDIT_INFO = {
                                 </table>
                             </van-cell>
                             <van-cell title="个人简历">
-                                <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
-                                <span v-else>无数据</span>
+                                <template #label>
+                                    <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
+                                    <span style="font-size: 14px" v-else>无数据</span>
+                                </template>
+                            </van-cell>
+
+                            <van-cell title="签字">
+                                <template #label>
+                                    <van-image width="200" height="100" :src="CREATE_PREVIEW_URL(viewData.sign)"
+                                               v-if="viewData.sign"></van-image>
+                                    <span style="font-size: 14px" v-else>暂无</span>
+                                </template>
                             </van-cell>
                         </template>
-                        
                     </van-cell-group>
                 </van-tab>
 

src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html

@@ -125,7 +125,7 @@ layout("/mobile/platform.html"){
                             <van-button size="small" type="primary"
                                         v-if="[20, 70].includes(item.applyStateId)"
                                         @click="openApproval(item)"
-                                        style="margin-right: 4px">审核
+                                        style="margin-right: 4px">{{ item.applyStateId === 70 ? '重新审核' : '审核' }}
                             </van-button>
                             <van-button size="small" type="danger"
                                         v-if="[30, 50].includes(item.applyStateId)"
@@ -155,7 +155,9 @@ layout("/mobile/platform.html"){
                 <van-field label="分配工会" v-model="formData.unionName" readonly clickable required
                            @click="unionPicker = true" placeholder="请选择分配工会"
                            :rules="[{ required:true, message: '请选择分配工会' }]"></van-field>
-                <van-popup v-model="unionPicker" position="bottom">
+                <van-popup v-model="unionPicker" position="bottom"
+                           get-container="body"
+                           safe-area-inset-bottom>
                     <van-picker
                         show-toolbar
                         :columns="unions"
@@ -163,11 +165,13 @@ layout("/mobile/platform.html"){
                         @cancel="unionPicker = false"
                     ></van-picker>
                 </van-popup>
-                <van-field label="审核意见" name="auditOpinion" v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
+                <van-field label="审核意见" name="auditOpinion"
+                           type="textarea" maxlength="200" show-word-limit
+                           v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="default" block @click="infoShow=false">取消</van-button>
-                <van-button type="danger" block @click.submit="doApproval(2)">退回申请</van-button>
+<!--                <van-button type="danger" block @click.submit="doApproval(2)">退回申请</van-button>-->
                 <van-button type="danger" block @click.submit="doApproval(0)">拒绝申请</van-button>
                 <van-button type="primary" block @click.submit="doApproval(1)">同意申请</van-button>
             </div>

src/main/resources/views/mobile/member/apply/submit/index.html

@@ -143,9 +143,9 @@ layout("/mobile/platform.html"){
             <van-field label="在职状态" :value="formData.userState" readonly></van-field>
             <van-field label="人员类型" :value="formData.personType" readonly></van-field>
 
-            <van-field label="身份证号码" v-model="formData.idCard" placeholder="请输入身份证号码"
+            <van-field label="身份证号码" disabled v-model="formData.idCard" placeholder="请输入身份证号码"
                        :rules="[{ pattern :/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, message: '身份证号码格式错误' }]"></van-field>
-            <van-field label="联系电话" v-model="formData.mobile" type="tel" placeholder="请输入联系电话"
+            <van-field label="联系电话" disabled v-model="formData.mobile" type="tel" placeholder="请输入联系电话"
                        :rules="[{ pattern :/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/, message: '联系电话格式错误' }]"></van-field>
             <van-field label="电子邮箱" v-model="formData.email" placeholder="请输入电子邮箱"
                        :rules="[{ pattern :/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, message: '邮箱格式错误' }]"></van-field>
@@ -204,6 +204,22 @@ layout("/mobile/platform.html"){
                     <text-editor style="z-index: 1" v-model="formData.vita"></text-editor>
                 </template>
             </van-field>
+
+            <van-cell title="入会意愿">
+                <template #label>
+                    <van-checkbox style="font-size: 16px;color: #F56C6C" icon-size="24px"
+                                  v-model="formData.isVoluntary" shape="square">
+                        我自愿加入中华全国总工会，遵守工会章程，执行工会决议，积极参加工会活动，为全面建成小康社会、把我国建设成为富强民主文明和谐的社会主义现代化国家、实现中华民族伟大复兴的中国梦而奋斗。
+                    </van-checkbox>
+                </template>
+            </van-cell>
+
+            <van-cell title="签字">
+                <template #label>
+                    <mobile-sign :is_value_base64="false" v-model="formData.sign" prefix="MEMBER_APPLY"
+                                 ref="signature"></mobile-sign>
+                </template>
+            </van-cell>
         </van-form>
         <div v-if="!user.member" style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
             <van-button block v-if="formData.id" type="default" @click.submit="pjaxReplace('/platform/member/apply/mine/h5')">返 回</van-button>
@@ -256,6 +272,16 @@ layout("/mobile/platform.html"){
                 })
             },
             doSubmit(){
+                if (!this.formData.isVoluntary) {
+                    this.$toast.fail('请同意入会意愿')
+                    return
+                }
+
+                if (!this.formData.sign) {
+                    this.$toast.fail('请签字')
+                    return
+                }
+
                 this.$dialog.confirm({
                     title: "保存",
                     message: "提交后将进入审核流程，无法再进行编辑，您确定要提交申请吗？",