..
This commit is contained in:
server
@@ -11,7 +11,7 @@ var ACTIVITY_SPORTS_DELETE_USER = {
|
||||
@sort-change="pageOrder"ref="multipleTable" class="vi-table" row-key="id" style="width: 100%;"
|
||||
v-loading="tableLoading">
|
||||
<el-table-column :reserve-selection="true"
|
||||
type="selection"
|
||||
type="selection"align="center" header-align="center"
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号"
|
||||
@@ -82,9 +82,9 @@ var ACTIVITY_SPORTS_DELETE_USER = {
|
||||
},
|
||||
openDelete(data) {
|
||||
this.rowData = data
|
||||
this.applyPageData()
|
||||
this.pageData()
|
||||
},
|
||||
applyPageData() {
|
||||
pageData() {
|
||||
this.tableLoading = true
|
||||
this.pageForm.activityId = this.rowData.activityId
|
||||
this.pageForm.eventId = this.rowData.eventId
|
||||
@@ -102,6 +102,11 @@ var ACTIVITY_SPORTS_DELETE_USER = {
|
||||
|
||||
},
|
||||
joinMemberFamily(id) {
|
||||
const now = moment().valueOf()
|
||||
if (now < moment(this.rowData.applyStartTime).valueOf() || now > moment(this.rowData.applyEndTime).valueOf()) {
|
||||
this.notifyWarning("此活动不在报名时间内")
|
||||
return
|
||||
}
|
||||
if (!id && !this.selection.length) {
|
||||
this.$notify({
|
||||
title: "警告",
|
||||
|
||||
@@ -282,6 +282,8 @@ layout("/layouts/platform.html"){
|
||||
</el-timeline>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序号" width="50" type="index" align="center" header-align="center"></el-table-column>
|
||||
|
||||
<el-table-column align="center" header-align="center" label="年度" prop="year">
|
||||
<template>{{pageForm.year}}</template>
|
||||
</el-table-column>
|
||||
|
||||
+24
-3
@@ -13,8 +13,8 @@ const MEMBER_CHANGE = {
|
||||
<el-descriptions-item label="性别">
|
||||
<el-form-item prop="sex">
|
||||
<el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
|
||||
<el-radio border label="男性"></el-radio>
|
||||
<el-radio border label="女性"></el-radio>
|
||||
<el-radio border label="男"></el-radio>
|
||||
<el-radio border label="女"></el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
@@ -101,7 +101,22 @@ const MEMBER_CHANGE = {
|
||||
:disabled="allowFields('personType')" style="width: 100%"></dict-select>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item></el-descriptions-item>
|
||||
<el-descriptions-item label="聘用方式">
|
||||
<el-form-item prop="preparedBy">
|
||||
<dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
|
||||
:disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="进站时间" >
|
||||
<el-form-item prop="postDoctoralJoinDate">
|
||||
<el-date-picker
|
||||
v-model="formData.postDoctoralJoinDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择进站时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="会员状态">
|
||||
@@ -249,6 +264,9 @@ const MEMBER_CHANGE = {
|
||||
} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// 外国人身份证号码格式正确（15位）
|
||||
callback();
|
||||
} else if (/^[A-Z]\d{6,9}$/.test(value)) {
|
||||
// 香港身份证号码格式正确（8位）
|
||||
callback();
|
||||
} else {
|
||||
// 格式错误，返回错误信息
|
||||
callback(new Error("身份证号码格式错误"));
|
||||
@@ -371,6 +389,7 @@ const MEMBER_CHANGE = {
|
||||
campus,
|
||||
userState,
|
||||
personType,
|
||||
postDoctoralJoinDate,
|
||||
preparedBy,
|
||||
idCard,
|
||||
mobile,
|
||||
@@ -395,7 +414,9 @@ const MEMBER_CHANGE = {
|
||||
this.$set(this.formData, "academicDegree", academicDegree)
|
||||
this.$set(this.formData, "campus", campus)
|
||||
this.$set(this.formData, "userState", userState)
|
||||
this.$set(this.formData, "userState", userState)
|
||||
this.$set(this.formData, "personType", personType)
|
||||
this.$set(this.formData, "postDoctoralJoinDate", postDoctoralJoinDate)
|
||||
this.$set(this.formData, "preparedBy", preparedBy)
|
||||
this.$set(this.formData, "unitName", unit ? unit.name : null)
|
||||
this.$set(this.formData, "unitId", unit ? unit.id : null)
|
||||
|
||||
@@ -402,6 +402,9 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
getChangeTypes(changeTypes){
|
||||
if (!changeTypes || changeTypes === 'undefined' || changeTypes === 'null') {
|
||||
return null;
|
||||
}
|
||||
const changeTypesList = JSON.parse(changeTypes)
|
||||
if (changeTypesList) {
|
||||
if (!changeTypesList || changeTypesList.length === 0 || !this.changeTypeData || this.changeTypeData.length === 0) return null
|
||||
|
||||
@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
|
||||
label="操作"
|
||||
width="100px" fixed="right">
|
||||
<template scope="{row}">
|
||||
<el-button size="mini" type="primary" @click="openView(row.userId)">查看</el-button>
|
||||
<el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -243,23 +243,26 @@ layout("/layouts/platform_h5.html"){
|
||||
bizType: bizType,
|
||||
params: JSON.stringify({ userId: userId, handle: false }),
|
||||
})
|
||||
|
||||
} catch (e) {
|
||||
this.result = {
|
||||
code: 99,
|
||||
msg: '请使用智慧工会系统身份二维码'
|
||||
}
|
||||
} finally {
|
||||
this.resultVisible = true
|
||||
}
|
||||
},
|
||||
|
||||
resultConfirm() {
|
||||
async resultConfirm() {
|
||||
try {
|
||||
const { bizType, userId } = JSON.parse(this.decodedText)
|
||||
this.$axios.post('/platform/scan/handle', {
|
||||
const {bizType, userId} = JSON.parse(this.decodedText)
|
||||
const res = await this.$axios.post('/platform/scan/handle', {
|
||||
bizType: bizType,
|
||||
params: JSON.stringify({ userId: userId, handle: true }),
|
||||
params: JSON.stringify({userId: userId, handle: true}),
|
||||
})
|
||||
if(res.code === 0) {
|
||||
this.$toast.success(res.msg)
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
} finally {
|
||||
@@ -270,7 +273,7 @@ layout("/layouts/platform_h5.html"){
|
||||
},
|
||||
|
||||
async created() {
|
||||
|
||||
await this.initCamera()
|
||||
},
|
||||
|
||||
beforeDestroy() {
|
||||
|
||||
@@ -6,6 +6,12 @@ layout("/layouts/platform_h5.html"){
|
||||
<van-sticky>
|
||||
<van-nav-bar @click-left="back" left-arrow left-text="返回" placeholder title="地址管理"></van-nav-bar>
|
||||
</van-sticky>
|
||||
<van-notice-bar
|
||||
left-icon="volume-o"
|
||||
:scrollable="false"
|
||||
wrapable
|
||||
text="如有两个收货地址，系统将以默认收货地址为准！有两个收货地址的教职工请注意设置。"
|
||||
></van-notice-bar>
|
||||
|
||||
<van-address-list
|
||||
:list="addressList"
|
||||
|
||||
Reference in New Issue
Block a user