master
Tuzki 1 year ago
parent e6858b904e
commit aae237dab9
  1. 8
      ruoyi-ui/src/api/system/member.js
  2. BIN
      ruoyi-ui/src/assets/images/guider-bg.png
  3. BIN
      ruoyi-ui/src/assets/images/zu1@2x.png
  4. BIN
      ruoyi-ui/src/assets/images/zu2@2x.png
  5. BIN
      ruoyi-ui/src/assets/images/zu3@2x.png
  6. BIN
      ruoyi-ui/src/assets/images/zu4@2x.png
  7. 4
      ruoyi-ui/src/permission.js
  8. 10
      ruoyi-ui/src/router/index.js
  9. 124
      ruoyi-ui/src/views/h5/guider/index.vue
  10. 85
      ruoyi-ui/src/views/h5/introContentss/index.vue
  11. 174
      ruoyi-ui/src/views/h5/member/index.vue
  12. 227
      ruoyi-ui/src/views/h5/personalmember/index.vue

@ -42,3 +42,11 @@ export function delMember(id) {
method: 'delete'
})
}
//省市县
export function getTreeData() {
return request({
url: 'region/getTreeData',
method: 'get'
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 KiB

@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register','/welcome','/member','/personalmember','/introContent','/introContents']
const whiteList = ['/login', '/register','/welcome','/member','/personalmember','/introContent','/introContents','/introContentss','/guider']
router.beforeEach((to, from, next) => {
debugger
@ -17,7 +17,7 @@ router.beforeEach((to, from, next) => {
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
/* has token*/
if (to.path === '/login') {
next({ path: '/login' })
next({ ...to, replace: true })
NProgress.done()
} else if (whiteList.indexOf(to.path) !== -1) {
next()

@ -112,6 +112,16 @@ export const constantRoutes = [
path: '/introContents',
component: () => import('@/views/h5/introContents/index'),
hidden: true
},
{
path: '/introContentss',
component: () => import('@/views/h5/introContentss/index'),
hidden: true
},
{
path: '/guider',
component: () => import('@/views/h5/guider/index'),
hidden: true
}
]

@ -0,0 +1,124 @@
<template>
<div class="m-container">
<div v-if="checkIsMobile() && isWx" class="m-guider">
<div class="m-btn-box" @click="goRotue(1)">
<img alt="" class="m-img" src="../../../assets/images/zu1@2x.png">
</div>
<div class="m-btn-box" @click="goRotue(2)">
<img alt="" class="m-img" src="../../../assets/images/zu2@2x.png">
</div>
<div class="m-btn-box" @click="goRotue(3)">
<img alt="" class="m-img" src="../../../assets/images/zu3@2x.png">
</div>
<div class="m-btn-box" @click="goRotue(4)">
<img alt="" class="m-img" src="../../../assets/images/zu4@2x.png">
</div>
<div class="m-tel">
协会联系电话8787060487024648转82068066
</div>
</div>
<div v-if="checkIsMobile() && !isWx" class="m-mask">
<img alt="" class="mask-img" src="../../../assets/images/mask.png">
</div>
</div>
</template>
<script>
export default {
name: "index",
data() {
return {
isWx: false,
}
},
created() {
if (/(micromessenger)/i.test(navigator.userAgent)) {
//
if (/(WindowsWechat)/i.test(navigator.userAgent) || /(wechatdevtools)/i.test(navigator.userAgent)) {
this.isWx = false
} else {
//
this.isWx = false
}
} else {
this.isWx = true
}
},
methods: {
goRotue(val) {
console.log(val)
switch (val) {
case 1:
this.$router.push({path: '/introContent' || "/"}).catch(() => {
});
break;
case 2:
this.$router.push({path: '/introContentss' || "/"}).catch(() => {
});
break;
case 3:
this.$router.push({path: '/register' || "/"}).catch(() => {
});
break;
case 4:
this.$router.push({path: '/login' || "/"}).catch(() => {
});
break;
default:
console.log(val)
}
},
checkIsMobile() {
const userAgentInfo = navigator.userAgent;
const mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
for (let i = 0; i < mobileAgents.length; i++) {
if (userAgentInfo.indexOf(mobileAgents[i]) > 0) {
return true;
}
}
return false;
},
}
}
</script>
<style lang="scss" scoped>
.m-container {
display: flex;
justify-content: center;
align-items: unset;
height: 100%;
background-size: cover;
background-image: url("../../../assets/images/guider-bg.png");
background-repeat: no-repeat;
.m-guider {
margin: 120px 0 0;
padding: 20px 50px;
display: flex;
flex-direction: column;
align-items: center;
.m-btn-box {
width: 100%;
height: 95px;
margin-bottom: 35px;
border-radius: 15px;
.m-img {
width: 100%;
}
}
.m-tel {
font-family: Source Han Sans SC;
font-weight: 500;
font-size: 13px;
color: #723233;
line-height: 40px;
text-align: center;
white-space: nowrap;
}
}
}
</style>

@ -0,0 +1,85 @@
<template>
<div class="intro-box">
<div class="intro-title">
会员入会和权利义务
</div>
<div class="intro-content">
<p class="m-content-title">符合下列条件的可以自愿申请加入本会</p>
<p class="m-content-line">
1国家级和省级非物质文化遗产代表性项目保护单位代表性传承人
</p>
<p class="m-content-line">
2国家级和省级非物质文化遗产生产性保护示范基地传播基地研究基地传承示范基地和依托省级以上非遗项目建立的非遗工坊等
</p>
<p class="m-content-line">
3国家级和省级文化产业示范园区基地中与非物质文化遗产保护密切相关的单位
</p>
<p class="m-content-line">
4在非物质文化遗产保护或相关领域具有一定影响的其他单位和个人
</p>
<p class="m-content-line">
5个人会员应当具有完全民事行为能力
</p>
<p class="m-content-title">会员入会的程序是</p>
<p class="m-content-line">
1提交入会申请书
</p>
<p class="m-content-line">
2按要求提交证明材料如单位章程营业执照资质证书复印件等
</p>
<p class="m-content-line">
3理事会或者常务理事会授权的机构讨论通过
</p>
<p class="m-content-line">
4办理会员登记颁发会员证书
</p>
<p class="m-content-title">会员享有下列权利</p>
<p class="m-content-line">1选举权被选举权和表决权</p>
<p class="m-content-line">2对本会工作的知情权建议权和监督权</p>
<p class="m-content-line">3参加本会活动并获得本会服务的优先权</p>
<p class="m-content-line">4根据工作需要查阅本会相关规章制度和决策决议资料</p>
<p class="m-content-line">5反映会员呼声维护会员权益</p>
<p class="m-content-line">6入会自愿退会自由</p>
<p class="m-content-title"> 会员履行下列义务</p>
<p class="m-content-line">1遵守本会章程和各项规定</p>
<p class="m-content-line">2执行本会决议</p>
<p class="m-content-line">3按规定交纳会费;</p>
<p class="m-content-line">4维护本会及其会员的合法权益</p>
<p class="m-content-line">5向本会反映情况提供有关资料</p>
<p class="m-content-line">6参加本会组织的活动</p>
<p class="m-content-line">7完成本会交办的工作</p>
</div>
</div>
</template>
<script>
export default {
name: "index"
}
</script>
<style lang="scss" scoped>
.intro-box {
width: 100%;
height: fit-content;
background-image: url(../../../assets/images/intro_content_bg.png);
background-size: cover;
background-repeat: no-repeat;
padding: 40px 20px;
font-size: 16px;
.intro-title {
font-family: Source Han Sans SC;
font-weight: bold;
font-size: 18px;
text-align: center;
color: #723233;
line-height: 40px;
}
.m-content-line{
text-indent: 2em;
}
}
</style>

@ -3,10 +3,10 @@
<el-form ref="form" :model="form" :rules="rules" class="m-form" label-width="20px">
<h4 class="titles">单位会员信息填写</h4>
<el-form-item label="单位名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入单位名称"/>
<el-input class="m-custom-input" v-model="form.companyName" placeholder="与法人登记证书或营业执照登记信息一致,与单位印章一致"/>
</el-form-item>
<el-form-item label="单位住所" prop="unitResidence">
<el-input v-model="form.unitResidence" placeholder="请输入单位住所"/>
<el-input v-model="form.unitResidence" placeholder="与法人登记证书或营业执照登记信息一致"/>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<el-input v-model="form.unifiedSocialCreditCode" placeholder="请输入统一社会信用代码"/>
@ -19,14 +19,44 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="登记机关县" prop="registrationAuthorityCity">
<el-input v-model="form.registrationAuthorityCity" placeholder="请输入登记机关县"/>
<el-form-item label="登记机关省" prop="registrationAuthorityProvince">
<el-select class="m-select" v-model="form.registrationAuthorityProvince" placeholder="选择省" @change="handleProvinceChange">
<el-option
v-for="province in treeData"
:key="province.areaCode"
:label="province.areaName"
:value="province.areaCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="登记机关市" prop="registrationAuthorityCity">
<el-select class="m-select" v-model="form.registrationAuthorityCity" placeholder="选择市" @change="handleCityChange" v-if="cities.length">
<el-option
v-for="city in cities"
:key="city.areaCode"
:label="city.areaName"
:value="city.areaCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="登记机关区" prop="registrationAuthorityArea">
<el-input v-model="form.registrationAuthorityArea" placeholder="请输入登记机关区"/>
<el-select class="m-select" v-model="form.registrationAuthorityArea" placeholder="选择区" v-if="districts.length">
<el-option
v-for="district in districts"
:key="district.areaCode"
:label="district.areaName"
:value="district.areaCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="行政审批局" prop="administrativeApprovalBureau">
<el-input v-model="form.administrativeApprovalBureau" placeholder="请输入行政审批局" />
</el-form-item>
<el-form-item label="注册资金(万元)" prop="registeredCapital">
<el-input v-model="form.registeredCapital" placeholder="请输入注册资金(万元)"/>
<!-- <el-input v-model="form.registeredCapital" placeholder="请输入注册资金(万元)"/>-->
<el-input-number class="m-input-number" v-model="form.registeredCapital" placeholder="请输入注册资金(万元),保留两位小数" :precision="2" :step="0.1" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="法定代表人" prop="legalRepresentative">
<el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人"/>
@ -45,6 +75,28 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.unitType == 1" label="企业法人" prop="corporate">
<el-radio-group v-model="form.corporate" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.corporate"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.unitType == 2" label="非法人组织" prop="unincorporatedOrganizations">
<el-radio-group v-model="form.unincorporatedOrganizations" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.unincorporated_organizations"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="申请级别" prop="applicationLevel">
<el-radio-group v-model="form.applicationLevel" class="m-radio-group">
<el-radio
@ -88,31 +140,10 @@
<el-form-item label="授权代表人-联系电话" prop="contactNumber">
<el-input v-model="form.contactNumber" placeholder="请输入联系电话"/>
</el-form-item>
<el-form-item label="授权代表人-单位基本信息(300)字以内" prop="basicInformationOfTheUnit">
<el-input :show-word-limit="true" :maxlength="300" v-model="form.basicInformationOfTheUnit" placeholder="请输入内容" type="textarea"/>
</el-form-item>
<el-form-item label="企业法人" prop="corporate">
<el-radio-group v-model="form.corporate" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.corporate"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="非法人组织" prop="unincorporatedOrganizations">
<el-radio-group v-model="form.unincorporatedOrganizations" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.unincorporated_organizations"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
<el-form-item label="单位基本信息" prop="basicInformationOfTheUnit">
<el-input class="m-textarea" autosize :show-word-limit="true" :maxlength="300" v-model="form.basicInformationOfTheUnit" placeholder="主要指:企业、社会团体、基金会、服务机构、经济组织的经基本营或者业务范围,事业单位工作职责。非物质文化遗产代表性项信息目名称、保护级别、代表性传承人等,300字以内" type="textarea"/>
</el-form-item>
</el-form>
<el-button class="m-prime-btn" type="primary" @click="submitForm"> </el-button>
@ -122,7 +153,7 @@
</template>
<script>
import {listMember, getMember, delMember, addMember, updateMember} from "@/api/system/member";
import {listMember, getMember, delMember, addMember, updateMember,getTreeData} from "@/api/system/member";
export default {
name: "Member",
@ -146,6 +177,10 @@ export default {
}, 100)
}
return {
provinces: [], //
cities: [], //
districts: [], //
treeData:[],
memberId:"",
//
loading: true,
@ -173,6 +208,7 @@ export default {
unitResidence: null,
unifiedSocialCreditCode: null,
dateOfEstablishment: null,
administrativeApprovalBureau: null,
registrationAuthorityCity: null,
registrationAuthorityArea: null,
registeredCapital: null,
@ -208,6 +244,12 @@ export default {
dateOfEstablishment:[
{required: true, message: '请选择成立日期', trigger: 'blur'},//
],
registrationAuthorityProvince:[
{required: true, message: '请选择登记机关省', trigger: 'blur'},//
],
administrativeApprovalBureau:[
{required: true, message: '请输入行政审批局', trigger: 'blur'},//
],
registrationAuthorityCity:[
{required: true, message: '请输入登记机关县', trigger: 'blur'},//
],
@ -279,8 +321,32 @@ export default {
}else{
this.reset()
}
this.getTreeData()
},
methods: {
getTreeData(){
getTreeData().then(res=>{
console.log(res)
this.treeData=res.data
})
},
handleProvinceChange() {
//
const selectedProvince = this.treeData.find(p => p.id === this.form.registrationAuthorityProvince);
if (selectedProvince) {
this.cities = selectedProvince.children;
this.form.registrationAuthorityCity = null;
this.form.registrationAuthorityArea = null;
}
},
handleCityChange() {
//
const selectedCity = this.cities.find(c => c.id === this.form.registrationAuthorityCity);
if (selectedCity) {
this.districts = selectedCity.children;
this.form.registrationAuthorityArea = null;
}
},
/** 查询单位会员列表 */
getList() {
this.loading = true;
@ -303,6 +369,8 @@ export default {
unitResidence: null,
unifiedSocialCreditCode: null,
dateOfEstablishment: null,
administrativeApprovalBureau: null,
registrationAuthorityProvince: null,
registrationAuthorityCity: null,
registrationAuthorityArea: null,
registeredCapital: null,
@ -352,7 +420,18 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
let this_ = this
getMember(this.memberId).then(response => {
debugger
this_.getTreeData()
const selectedProvince = this_.treeData.find(p => p.id === response.data.registrationAuthorityProvince);
if (selectedProvince) {
this_.cities = selectedProvince.children;
}
const selectedCity = this_.cities.find(c => c.id === response.data.registrationAuthorityCity);
if (selectedCity) {
this_.districts = selectedCity.children;
}
this.form = response.data;
});
},
@ -523,4 +602,37 @@ export default {
font-size: 22px;
}
}
.m-textarea{
.el-input__count{
background: transparent;
line-height: 20px;
}
}
.m-custom-input{
.el-input__inner::placeholder {
font-size: 12px;
}
}
.m-input-number{
width: 100%;
.el-input-number__decrease{
display: none;
}
.el-input-number__increase{
display: none;
}
.el-input__inner{
padding: 0 16px;
text-align: left;
}
}
.m-select{
width: 100%;
}
</style>

@ -30,7 +30,7 @@
<el-input v-model="form.contactNumber" placeholder="请输入联系电话"/>
</el-form-item>
<el-form-item label="通讯地址" prop="mailingAddress">
<el-input v-model="form.mailingAddress" placeholder="请输入通讯地址"/>
<el-input v-model="form.mailingAddress" placeholder="填写经常居住地"/>
</el-form-item>
<el-form-item label="照片" prop="imageUrl">
<image-upload v-model="form.imageUrl" :limit="1"/>
@ -46,70 +46,103 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所在单位名称" prop="nameOfTheUnit">
<el-input v-model="form.nameOfTheUnit" placeholder="请输入所在单位名称"/>
<el-form-item label="传承项目名称" prop="nameOfInheritanceProject">
<el-input v-model="form.nameOfInheritanceProject" placeholder="请输入传承项目名称"/>
</el-form-item>
<el-form-item label="单位类型" prop="unitType">
<el-radio-group v-model="form.unitType" class="m-radio-group">
<el-radio
v-for="dict in dict.type.unit_type"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="单位职务" prop="unitPosition">
<el-input v-model="form.unitPosition" placeholder="请输入单位职务"/>
</el-form-item>
<el-form-item label="单位统一社会信用代码" prop="unifiedSocialCreditCodeOfTheUnit">
<el-input v-model="form.unifiedSocialCreditCodeOfTheUnit" placeholder="请输入单位统一社会信用代码"/>
</el-form-item>
<el-form-item label="是否为现职党政领导干部" prop="currentJob">
<el-radio-group v-model="form.currentJob" class="m-radio-group">
<el-radio
v-for="dict in dict.type.current_job"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.currentJob == 1" label="在职级别" prop="workingLevel">
<el-radio-group v-model="form.workingLevel" class="m-radio-group">
<el-radio
v-for="dict in dict.type.working_level"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否为退(离)休党政领导干部" prop="retiredOrNot">
<el-radio-group v-model="form.retiredOrNot" class="m-radio-group">
<el-radio
v-for="dict in dict.type.current_job"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.retiredOrNot == 1" label="退休级别" prop="retireLevel">
<el-radio-group v-model="form.retireLevel" class="m-radio-group">
<el-radio
v-for="dict in dict.type.working_level"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
<el-form-item label="所在单位" prop="theUnit">
<el-select class="m-select" v-model="form.theUnit" clearable placeholder="请选择">
<el-option v-for="dict in dict.type.the_unit"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<template v-if="form.theUnit!=3&&form.theUnit!=null">
<el-form-item label="所在单位名称" prop="nameOfTheUnit">
<el-input v-model="form.nameOfTheUnit" placeholder="请输入所在单位名称"/>
</el-form-item>
<el-form-item label="单位类型" prop="unitType">
<el-radio-group v-model="form.unitType" class="m-radio-group">
<el-radio
v-for="dict in dict.type.unit_type"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.unitType == 1" label="企业法人" prop="corporate">
<el-radio-group v-model="form.corporate" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.corporate"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.unitType == 2" label="非法人组织" prop="unincorporatedOrganizations">
<el-radio-group v-model="form.unincorporatedOrganizations" class="m-radio-group">
<el-radio
class="m-radio"
v-for="dict in dict.type.unincorporated_organizations"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="单位职务" prop="unitPosition">
<el-input v-model="form.unitPosition" placeholder="请输入单位职务"/>
</el-form-item>
<el-form-item label="单位统一社会信用代码" prop="unifiedSocialCreditCodeOfTheUnit">
<el-input v-model="form.unifiedSocialCreditCodeOfTheUnit" placeholder="请输入单位统一社会信用代码"/>
</el-form-item>
<el-form-item label="是否为现职党政领导干部" prop="currentJob">
<el-radio-group v-model="form.currentJob" class="m-radio-group">
<el-radio
v-for="dict in dict.type.current_job"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.currentJob == 1" label="在职级别" prop="workingLevel">
<el-radio-group v-model="form.workingLevel" class="m-radio-group">
<el-radio
v-for="dict in dict.type.working_level"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否为退(离)休党政领导干部" prop="retiredOrNot">
<el-radio-group v-model="form.retiredOrNot" class="m-radio-group">
<el-radio
v-for="dict in dict.type.current_job"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.retiredOrNot == 1" label="退休级别" prop="retireLevel">
<el-radio-group v-model="form.retireLevel" class="m-radio-group">
<el-radio
v-for="dict in dict.type.working_level"
:key="dict.value"
:label="dict.value"
class="m-radio"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</template>
<el-form-item label="其他社会职务" prop="otherSocialDuties">
<el-input v-model="form.otherSocialDuties" placeholder="请输入其他社会职务"/>
</el-form-item>
@ -165,7 +198,7 @@ import {addMember, updateMember} from "@/api/system/member";
export default {
name: "Personalmember",
dicts: ['working_level', 'current_job', 'application_level', 'sys_user_sex', 'current_job', 'working_level', 'unit_type', 'intangible_cultural_heritage_inheritor_level'],
dicts: ['corporate','unincorporated_organizations','working_level', 'current_job', 'application_level', 'sys_user_sex', 'current_job', 'working_level', 'unit_type', 'intangible_cultural_heritage_inheritor_level', 'the_unit'],
data() {
var checkPhone = (rule, value, callback) => {//
const phoneReg = /^1[3|4|5|7|8|9][0-9]{9}$/
@ -239,6 +272,7 @@ export default {
mailingAddress: null,
imageUrl: null,
intangibleCulturalHeritageInheritorLevel: null,
nameOfInheritanceProject: null,
nameOfTheUnit: null,
unitType: null,
unitPosition: null,
@ -250,11 +284,19 @@ export default {
otherSocialDuties: null,
applyForMembershipLevel: null,
myMainWorkExperience: null,
corporate: null,
unincorporatedOrganizations: null
},
//
form: {},
//
rules: {
corporate: [
{required: true, message: '请选择企业法人', trigger: 'blur'},
],
unincorporatedOrganizations: [
{required: true, message: '请选择非法人组织', trigger: 'blur'},
],
name: [
{required: true, message: '请输入姓名', trigger: 'blur'},//
],
@ -276,6 +318,15 @@ export default {
intangibleCulturalHeritageInheritorLevel: [
{required: true, message: '请选择非遗传承人级别', trigger: 'blur'},//
],
nameOfInheritanceProject: [
{required: true, message: '请输入传承项目名称', trigger: 'blur'},//
],
theUnit: [
{required: true, message: '请选择所在单位', trigger: 'blur'},//
],
nameOfTheUnit: [
{required: true, message: '请输入所在单位名称', trigger: 'blur'},//
],
unitType: [
{required: true, message: '请选择单位类型', trigger: 'blur'},//
],
@ -363,6 +414,7 @@ export default {
mailingAddress: null,
imageUrl: null,
intangibleCulturalHeritageInheritorLevel: null,
nameOfInheritanceProject: null,
nameOfTheUnit: null,
unitType: null,
unitPosition: null,
@ -377,7 +429,11 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null,
theUnit: null,
corporate: null,
unincorporatedOrganizations: null
};
this.workHistroy = [
{
@ -459,9 +515,9 @@ export default {
this.$confirm('请确认信息无误,是否提交?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass:'m-info-message',
center:true,
offset:150,
customClass: 'm-info-message',
center: true,
offset: 150,
type: 'warning'
}).then(() => {
if (this.form.id != null) {
@ -476,15 +532,15 @@ export default {
this.$message({
type: 'success',
message: '提交成功',
offset:80,
center:true,
duration:1500
offset: 80,
center: true,
duration: 1500
});
this.open = false;
this.getList();
setTimeout(()=>{
setTimeout(() => {
this.$router.push('/welcome')
},1000)
}, 1000)
});
} else {
let arr = []
@ -501,22 +557,22 @@ export default {
this.$message({
type: 'success',
message: '提交成功',
offset:80,
center:true,
duration:1500
offset: 80,
center: true,
duration: 1500
});
this.open = false;
this.getList();
setTimeout(()=>{
setTimeout(() => {
this.$router.push('/welcome')
},1000)
}, 1000)
});
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消',
offset:20
offset: 20
});
});
}
@ -639,14 +695,21 @@ export default {
}
}
}
.m-info-message{
.m-info-message {
width: 80%;
}
.m-success-message{
.m-success-message {
min-width: 60%;
padding: 20px;
.el-message__content{
.el-message__content {
font-size: 22px;
}
}
.m-select{
width: 100%;
}
</style>

Loading…
Cancel
Save