huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

学校、省份城市等接口更换

Browse Source
dev
yujialong 3 years ago
parent aa626b7be9
commit 8707612e20
9 changed files with 143 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/store/index.js
  2. 8
      src/utils/api.js
  3. 29
      src/views/customer/AddCustomer.vue
  4. 4
      src/views/customer/Dashboard.vue
  5. 2
      src/views/oder/AddOrder.vue
  6. 2
      src/views/oder/Order.vue
  7. 211
      src/views/setting/Person.vue
  8. 2
      src/views/user/AddUser.vue
  9. 7
      src/views/user/User.vue

4
src/store/index.js
Unescape View File

@ -3,6 +3,7 @@ import Vuex from 'vuex';
Vue.use(Vuex); Vue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
state: { state: {
avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
courseId:'', courseId:'',
userId: '', userId: '',
roleId: '', roleId: '',
@ -17,6 +18,9 @@ const store = new Vuex.Store({
loginToken: '' loginToken: ''
}, },
mutations:{ mutations:{
userAvatar(state,payload){
state.avatar = payload.avatar
},
userData (state, payload) { userData (state, payload) {
state.userId = payload.user_id state.userId = payload.user_id
}, },

8
src/utils/api.js
Unescape View File

@ -35,8 +35,8 @@ export default {
resetPwdCustomer: `${host3}/nakadai/customer/resetPwd`, resetPwdCustomer: `${host3}/nakadai/customer/resetPwd`,
queryCustomerIsExists: `${host3}/nakadai/customer/queryCustomerIsExists`, queryCustomerIsExists: `${host3}/nakadai/customer/queryCustomerIsExists`,
updateEnabled: `${host3}/nakadai/customer/updateEnabled`, updateEnabled: `${host3}/nakadai/customer/updateEnabled`,
queryCustomerIndustryClass: `${host}/liuwanr/customer/queryCustomerIndustryClass`, queryCustomerIndustryClass: `${host3}/nakadai/hrIndustryClass/queryIndustryClass`,
queryCustomerIndustry: `${host}/liuwanr/customer/queryCustomerIndustry`, queryCustomerIndustry: `${host3}/nakadai/hrIndustry/queryIndustry`,
queryPhone: `${host}/liuwanr/user/queryPhone`, queryPhone: `${host}/liuwanr/user/queryPhone`,
querySchoolData: `${host3}/nakadai/school/querySchool`, querySchoolData: `${host3}/nakadai/school/querySchool`,
queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`, queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`,
@ -89,8 +89,8 @@ export default {
querySchool: `${host}/liuwanr/school/querySchool`, //查询学校 querySchool: `${host}/liuwanr/school/querySchool`, //查询学校
querySchoolDetails: `${host}/liuwanr/school/querySchoolDetails`, //查询学校详情 querySchoolDetails: `${host}/liuwanr/school/querySchoolDetails`, //查询学校详情
queryProvince: `${host}/liuwanr/province/queryProvince`, //查询省份 queryProvince: `${host3}/nakadai/province/queryProvince`, //查询省份
queryCity: `${host}/liuwanr/city/queryCity`, //查询城市 queryCity: `${host3}/nakadai/city/queryCity`, //查询城市
queryCourseDiscipline: `${host}/liuwanr/course/queryCourseDiscipline`, //查询课程学科 queryCourseDiscipline: `${host}/liuwanr/course/queryCourseDiscipline`, //查询课程学科
queryCourseProfessionalClass: `${host}/liuwanr/course/queryCourseProfessionalClass`, //查询专业类 queryCourseProfessionalClass: `${host}/liuwanr/course/queryCourseProfessionalClass`, //查询专业类

29
src/views/customer/AddCustomer.vue
Unescape View File

@ -140,14 +140,18 @@
<span>数据平台权限</span> <span>数据平台权限</span>
</div> </div>
<div> <div>
<el-table :data="coursePermissionss" class="orderTable" stripe header-align="center"> <el-table :data="dataPermissionss" class="orderTable" stripe header-align="center">
<el-table-column type="index" width="100" label="序号" align="center"> <el-table-column type="index" width="100" label="序号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="courseName" label="产品名称" align="center"></el-table-column> <el-table-column prop="productName" label="产品名称" align="center"></el-table-column>
<el-table-column prop="usePeriod" label="使用期限" align="center"></el-table-column> <el-table-column prop="periodOfUse" label="使用期限" align="center"></el-table-column>
<el-table-column prop="usePeriod" label="起止日期" align="center"></el-table-column> <el-table-column prop="usePeriod" label="起止日期" align="center">
<el-table-column prop="usePeriod" label="剩余期限" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="usePeriod" label="账号数" align="center"></el-table-column> {{scope.row.startTime}}~{{scope.row.endTime}}
</template>
</el-table-column>
<el-table-column prop="remainingPeriod" label="剩余期限" align="center"></el-table-column>
<el-table-column prop="accountNum" label="账号数" align="center"></el-table-column>
<el-table-column label="端口地址" align="center"> <el-table-column label="端口地址" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="configure(scope.row)">配置</el-button> <el-button @click="configure(scope.row)">配置</el-button>
@ -156,11 +160,10 @@
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.isDeliverGoods" v-model="scope.row.is_enable"
:active-value="1" :active-value="1"
:inactive-value="0" :inactive-value="0"
active-text="启用" :active-text="scope.row.is_enable ? '启用' : '禁用'"
inactive-text="禁用"
disabled> disabled>
</el-switch> </el-switch>
</template> </template>
@ -342,6 +345,7 @@ export default {
schoolList: [], schoolList: [],
contractInformations: [], contractInformations: [],
coursePermissionss: [], coursePermissionss: [],
dataPermissionss: [],
ipVisible: false, ipVisible: false,
IPData: [{ IPData: [{
id: 1, id: 1,
@ -392,6 +396,7 @@ export default {
} }
this.contractInformations = res.result.contractInformations this.contractInformations = res.result.contractInformations
this.coursePermissionss = res.result.coursePermissionss this.coursePermissionss = res.result.coursePermissionss
this.dataPermissionss = res.result.dataPermissionss
this.getCityData() this.getCityData()
this.changIndustryData() this.changIndustryData()
this.getSchoolData() this.getSchoolData()
@ -407,7 +412,7 @@ export default {
provinceId: this.form.provinceId provinceId: this.form.provinceId
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// 清除学校 // 清除学校
@ -453,7 +458,7 @@ export default {
// 获取行业类 // 获取行业类
getIndustryClass(){ getIndustryClass(){
this.$get(this.api.queryCustomerIndustryClass).then(res => { this.$get(this.api.queryCustomerIndustryClass).then(res => {
this.IndustryClassList = res.message this.IndustryClassList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// 清除行业类 // 清除行业类
@ -470,7 +475,7 @@ export default {
industryClassId: this.form.industryClassId industryClassId: this.form.industryClassId
} }
this.$get(this.api.queryCustomerIndustry,data).then(res => { this.$get(this.api.queryCustomerIndustry,data).then(res => {
this.industryList = res.message this.industryList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
saveAdd(formName){ saveAdd(formName){

4
src/views/customer/Dashboard.vue
Unescape View File

@ -155,7 +155,7 @@ export default {
}, },
getProvince(){ getProvince(){
this.$get(this.api.queryProvince).then(res => { this.$get(this.api.queryProvince).then(res => {
this.provinceList = res.message this.provinceList = res.list
this.$store.commit("provinceData", { provinceList : this.provinceList}) this.$store.commit("provinceData", { provinceList : this.provinceList})
}).catch(res => {}) }).catch(res => {})
}, },
@ -173,7 +173,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}) }).catch(res => {})
}, },
permission(){ permission(){

2
src/views/oder/AddOrder.vue
Unescape View File

@ -638,7 +638,7 @@ export default {
provinceId: this.form.provinceId provinceId: this.form.provinceId
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// 清除城市 // 清除城市

2
src/views/oder/Order.vue
Unescape View File

@ -180,7 +180,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
addOrder(){ addOrder(){

211
src/views/setting/Person.vue
Unescape View File

@ -8,7 +8,7 @@
:action="this.api.updateUserAvatars" :action="this.api.updateUserAvatars"
:data="{userId:this.userId}" :data="{userId:this.userId}"
name="file" name="file"
:limit="3" :limit="1"
:on-success="getRes" :on-success="getRes"
> >
<div>点击更改头像</div> <div>点击更改头像</div>
@ -28,12 +28,12 @@
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>姓名</span> <span>姓名</span>
<input id="username" class="username" placeholder="请输入姓名" type="text" v-model="personalInformation.userName"/> <input id="username" class="username" placeholder="请输入姓名" type="text" v-model="form.userName"/>
</div> </div>
<div class="item"> <div class="item">
<span>所在国家</span> <span>所在国家</span>
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -49,15 +49,15 @@
<div class="item"> <div class="item">
<span>性别</span> <span>性别</span>
<div class="sexRadio"> <div class="sexRadio">
<el-radio v-model="personalInformation.sex" :label="1">男</el-radio> <el-radio v-model="form.sex" :label="1">男</el-radio>
<el-radio v-model="personalInformation.sex" :label="2">女</el-radio> <el-radio v-model="form.sex" :label="2">女</el-radio>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span>所在地</span> <span>所在地</span>
<div class="selects"> <div class="selects">
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -68,7 +68,7 @@
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
v-model="personalInformation.provinceId" v-model="form.provinceId"
placeholder placeholder
@change="id => getCity(id,1)" @change="id => getCity(id,1)"
> >
@ -80,9 +80,9 @@
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
v-model="personalInformation.cityId" v-model="form.cityId"
placeholder placeholder
:disabled="personalInformation.provinceId ? false : true" :disabled="form.provinceId ? false : true"
> >
<el-option <el-option
v-for="item in cityList" v-for="item in cityList"
@ -98,7 +98,7 @@
<div class="item"> <div class="item">
<span>出生年月日</span> <span>出生年月日</span>
<el-date-picker <el-date-picker
v-model="personalInformation.dateBirth" v-model="form.dateBirth"
:clearable="false" :clearable="false"
class="block-right" class="block-right"
type="date"> type="date">
@ -106,14 +106,14 @@
</div> </div>
<div class="item"> <div class="item">
<span>证件</span> <span>证件</span>
<input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="personalInformation.idNumber"/> <input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="form.idNumber"/>
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>教育程度</span> <span>教育程度</span>
<el-select <el-select
v-model="personalInformation.educationDegree" v-model="form.educationDegree"
placeholder="请选择教育程度" placeholder="请选择教育程度"
> >
<el-option <el-option
@ -125,8 +125,19 @@
</el-select> </el-select>
</div> </div>
<div class="item"> <div class="item">
<span>当前所在学校</span> <span>所在学校</span>
<input id="schoolName" class="school" disabled placeholder="所在学校" type="text" v-model="personalInformation.schoolName"/> <el-select
v-model="form.schoolId"
filterable
placeholder="请选择所在学校"
>
<el-option
v-for="item in schoolList"
:key="item.value"
:label="item.schoolName"
:value="item.schoolId"
></el-option>
</el-select>
</div> </div>
</div> </div>
@ -156,7 +167,7 @@
<div class="item"> <div class="item">
<span>国家</span> <span>国家</span>
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -257,14 +268,14 @@
id="account" id="account"
type="text" type="text"
class="username" placeholder="请输入用户账号" class="username" placeholder="请输入用户账号"
v-model="personalInformation.account" v-model="form.account"
/> />
</div> </div>
<div class="item"> <div class="item">
<span>手机号</span> <span>手机号</span>
<div class="btns flex-between"> <div class="btns flex-between">
<span>{{personalInformation.phone}}</span> <span>{{form.phone}}</span>
<el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button> <el-button v-if="form.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button> <el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
</div> </div>
</div> </div>
@ -273,8 +284,8 @@
<div class="item"> <div class="item">
<span>邮箱</span> <span>邮箱</span>
<div class="btns flex-between"> <div class="btns flex-between">
<span>{{personalInformation.email}}</span> <span>{{form.email}}</span>
<el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button> <el-button v-if="form.email" type="primary" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button> <el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
</div> </div>
</div> </div>
@ -290,7 +301,7 @@
</div> </div>
<el-dialog <el-dialog
:title="personalInformation.email ? '更换邮箱' : '绑定邮箱'" :title="form.email ? '更换邮箱' : '绑定邮箱'"
:visible.sync="emailVisible" :visible.sync="emailVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closeEmail" @close="closeEmail"
@ -313,7 +324,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="personalInformation.phone ? '更换手机号' : '绑定手机号'" :title="form.phone ? '更换手机号' : '绑定手机号'"
:visible.sync="phoneVisible" :visible.sync="phoneVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePhone" @close="closePhone"
@ -365,7 +376,7 @@ export default {
data() { data() {
return { return {
userId: this.$store.state.userLoginId, userId: this.$store.state.userLoginId,
personalInformation: { form: {
name:'', name:'',
workNumber:'', workNumber:'',
password:"", password:"",
@ -490,15 +501,15 @@ export default {
methods: { methods: {
getProvince(){ getProvince(){
this.$get(this.api.queryProvince).then(res => { this.$get(this.api.queryProvince).then(res => {
this.provinceList = res.message this.provinceList = res.list
this.$store.commit("provinceData", { provinceList : this.provinceList}); this.$store.commit("provinceData", { provinceList : this.provinceList});
}).catch(res => {}); }).catch(res => {});
}, },
// 获取城市 // 获取城市
getCity(id,type,index){ getCity(id,type,index){
if(type == 1){ if(type == 1){
if(this.personalInformation.provinceId){ if(this.form.provinceId){
this.personalInformation.cityId = 1 this.form.cityId = 1
this.getCityData(type,index) this.getCityData(type,index)
} }
}else{ }else{
@ -510,12 +521,12 @@ export default {
} }
}, },
getCityData(type,index){ getCityData(type,index){
let provinceId = type == 1 ? this.personalInformation.provinceId : this.archivesList[index].provinceId let provinceId = type == 1 ? this.form.provinceId : this.archivesList[index].provinceId
this.$get(this.api.queryCity,{provinceId}).then(res => { this.$get(this.api.queryCity,{provinceId}).then(res => {
if(type == 1){ if(type == 1){
this.cityList = res.message this.cityList = res.list
}else{ }else{
this.archivesList[index].cityList = res.message this.archivesList[index].cityList = res.list
} }
}).catch(res => {}); }).catch(res => {});
}, },
@ -532,10 +543,10 @@ export default {
}).catch(res => {}); }).catch(res => {});
}, },
async accountChange(){ async accountChange(){
if(this.originAccount != this.personalInformation.account){ if(this.originAccount != this.form.account){
let res = await this.$get(this.api.queryAccountIsExist, { let res = await this.$get(this.api.queryAccountIsExist, {
account: this.personalInformation.account, account: this.form.account,
schoolId: this.personalInformation.schoolId schoolId: this.form.schoolId
}); });
if(res.message.user.length){ if(res.message.user.length){
this.$message.warning('该账号已存在'); this.$message.warning('该账号已存在');
@ -553,12 +564,15 @@ export default {
}, },
getdata() { getdata() {
this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => { this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => {
this.personalInformation = res.data.userInfo[0] let userInfo = res.result.hrUserInfo
this.personalInformation.idNumber = this.personalInformation.IDNumber let schoolId = userInfo.schoolId
this.originAccount = this.personalInformation.account this.form = Object.assign(userInfo,res.result.userAccountList[0])
this.archivesList = res.data.userPersonalFile this.form.schoolId = schoolId
console.log(11,this.form)
this.originAccount = this.form.account
this.archivesList = res.result.personalFileList
this.$nextTick(() => { this.$nextTick(() => {
if(this.personalInformation.provinceId){ if(this.form.provinceId){
this.getCityData(1) this.getCityData(1)
} }
if(this.archivesList.length != 0){ if(this.archivesList.length != 0){
@ -600,24 +614,23 @@ export default {
this.concatArch(1) this.concatArch(1)
} }
}) })
}) }).catch(err => {})
.catch(err => {})
}, },
concatArch(isLoadData) { concatArch(isLoadData) {
this.archivesList = this.archivesList.concat({ this.archivesList = this.archivesList.concat({
isNew: true, isNew: true,
personalCareerId: '', //职业 personalCareerId: '',
schoolId: '', //院校 schoolId: '',
schoolName: '', //院校名称 schoolName: '',
subjectList: this.subjectList, //专业学科 subjectList: this.subjectList,
disciplineId: '', //专业学科 disciplineId: '',
disciplineName: '', //专业学科名称 disciplineName: '',
ProfessionalClassList: [], //专业类 ProfessionalClassList: [],
professionalClassId: '', //专业类 professionalClassId: '',
professionalClassName: '', //专业类名称 professionalClassName: '',
ProfessionalList: [], //专业 ProfessionalList: [],
professionalId: '', //专业 professionalId: '',
professionalName: '', //专业名称 professionalName: '',
userId: this.userId, userId: this.userId,
personalFileId: '' personalFileId: ''
}) })
@ -633,16 +646,16 @@ export default {
this.archivesList.forEach((n,k) => { this.archivesList.forEach((n,k) => {
if(!n.personalCareerId) isEmpty = true if(!n.personalCareerId) isEmpty = true
}) })
if(isEmpty) return this.$message.warning('请选择职业'); if(isEmpty) return this.$message.warning('请选择职业')
this.showArch = true this.showArch = true
this.concatArch() this.concatArch()
}, },
bindEmail() { bindEmail() {
this.email = this.personalInformation.email this.email = this.form.email
this.emailVisible = true this.emailVisible = true
}, },
bindPhone() { bindPhone() {
this.phone = this.personalInformation.phone this.phone = this.form.phone
this.phoneVisible = true this.phoneVisible = true
}, },
bindPassword() { bindPassword() {
@ -658,16 +671,12 @@ export default {
let data = this.passwordForm let data = this.passwordForm
data.userid = this.userId data.userid = this.userId
this.$post(this.api.examinePassword,data) this.$post(this.api.examinePassword,data).then(res => {
.then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('更换成功') this.$message.success('更换成功')
this.passwordVisible = false this.passwordVisible = false
} }
}) }).catch(err => {})
.catch(err => {
console.log(err);
});
}, },
closePassword() { closePassword() {
this.passwordForm = { this.passwordForm = {
@ -687,7 +696,7 @@ export default {
getSubject(){ getSubject(){
this.$get(this.api.queryCourseDiscipline).then(res => { this.$get(this.api.queryCourseDiscipline).then(res => {
this.subjectList = res.message this.subjectList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// 清除学科类别 // 清除学科类别
clearClass(){ clearClass(){
@ -698,9 +707,9 @@ export default {
getProfessionalClass(val){ getProfessionalClass(val){
this.clearClass() this.clearClass()
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.subjectList.find((item)=>{ obj = this.subjectList.find((item)=>{
return item.disciplineId === val; return item.disciplineId === val
}); });
this.archivesForm.disciplineName = obj.disciplineName this.archivesForm.disciplineName = obj.disciplineName
this.getProfessionalClassData(val) this.getProfessionalClassData(val)
@ -723,9 +732,9 @@ export default {
getItemProfessionalClass(item,index){ getItemProfessionalClass(item,index){
this.clearItemClass(index) this.clearItemClass(index)
if(item){ if(item){
let obj = {}; let obj = {}
obj = this.subjectList.find(r =>{ obj = this.subjectList.find(r =>{
return r.disciplineId === item; return r.disciplineId === item
}); });
this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => { this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => {
this.archivesList.map(e =>{ this.archivesList.map(e =>{
@ -734,13 +743,13 @@ export default {
e.disciplineName = obj.disciplineName e.disciplineName = obj.disciplineName
} }
}) })
}).catch(res => {}); }).catch(res => {})
} }
}, },
getProfessionalClassData(value){ getProfessionalClassData(value){
this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => { this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => {
this.ProfessionalClassList = res.message this.ProfessionalClassList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// 清除专业类 // 清除专业类
clearProfess(){ clearProfess(){
@ -750,10 +759,10 @@ export default {
getProfessional(val){ getProfessional(val){
this.clearProfess() this.clearProfess()
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.ProfessionalClassList.find((item)=>{ obj = this.ProfessionalClassList.find((item)=>{
return item.professionalClassId === val; return item.professionalClassId === val
}); })
this.archivesForm.professionalClassName = obj.professionalClassName this.archivesForm.professionalClassName = obj.professionalClassName
this.getProfessionalData(val) this.getProfessionalData(val)
} }
@ -774,29 +783,29 @@ export default {
this.$get(this.api.queryCourseProfessional,{ professionalClassId: item }).then(res => { this.$get(this.api.queryCourseProfessional,{ professionalClassId: item }).then(res => {
this.archivesList.map(e =>{ this.archivesList.map(e =>{
if(e.professionalClassId == item){ if(e.professionalClassId == item){
let obj = {}; let obj = {}
obj = e.ProfessionalClassList.find(r =>{ obj = e.ProfessionalClassList.find(r =>{
return r.professionalClassId === item; return r.professionalClassId === item
}); })
e.ProfessionalList = res.message e.ProfessionalList = res.message
e.professionalClassName = obj.professionalClassName e.professionalClassName = obj.professionalClassName
} }
}) })
}).catch(res => {}); }).catch(res => {})
} }
}, },
getProfessionalData(value){ getProfessionalData(value){
this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => { this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => {
this.ProfessionalList = res.message this.ProfessionalList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// 获取专业名称 // 获取专业名称
getStuGrade(val){ getStuGrade(val){
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.ProfessionalList.find(r =>{ obj = this.ProfessionalList.find(r =>{
return r.professionalId === val; return r.professionalId === val;
}); })
this.archivesForm.professionalName = obj.professionalName this.archivesForm.professionalName = obj.professionalName
} }
}, },
@ -804,10 +813,10 @@ export default {
if(item){ if(item){
this.archivesList.map(e =>{ this.archivesList.map(e =>{
if(e.professionalId == item){ if(e.professionalId == item){
let obj = {}; let obj = {}
obj = e.ProfessionalList.find(r =>{ obj = e.ProfessionalList.find(r =>{
return r.professionalId === item; return r.professionalId === item;
}); })
e.professionalName = obj.professionalName e.professionalName = obj.professionalName
} }
}) })
@ -821,26 +830,26 @@ export default {
}) })
if(isEmpty) return this.$message.warning('请选择职业') if(isEmpty) return this.$message.warning('请选择职业')
if(this.accountReapeat) return this.$message.warning('该账号已存在') if(this.accountReapeat) return this.$message.warning('该账号已存在')
if(this.personalInformation.idNumber && !/(^[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]$)/.test(this.personalInformation.idNumber)) return this.$message.warning('请输入正确的证件号码') if(this.form.idNumber && !/(^[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]$)/.test(this.form.idNumber)) return this.$message.warning('请输入正确的证件号码')
if(this.personalInformation.phone && !/^1[3456789]\d{9}$/.test(this.personalInformation.phone)) return this.$message.warning('请输入正确的手机号') if(this.form.phone && !/^1[3456789]\d{9}$/.test(this.form.phone)) return this.$message.warning('请输入正确的手机号')
if(this.personalInformation.email && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.personalInformation.email)) return this.$message.warning('请输入正确的邮箱') if(this.form.email && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.form.email)) return this.$message.warning('请输入正确的邮箱')
// this.personalInformation.userId = this.userId // this.form.userId = this.userId
let personalInformation = this.personalInformation let form = this.form
let userInfoEntity = { let userInfoEntity = {
idNumber: personalInformation.idNumber, idNumber: form.idNumber,
account: personalInformation.account, account: form.account,
cityId: personalInformation.cityId, cityId: form.cityId,
countries: personalInformation.countries, countries: form.countries,
dateBirth: personalInformation.dateBirth, dateBirth: form.dateBirth,
educationDegree: personalInformation.educationDegree, educationDegree: form.educationDegree,
email: personalInformation.email, email: form.email,
phone: personalInformation.phone, phone: form.phone,
provinceId: personalInformation.provinceId, provinceId: form.provinceId,
schoolId: personalInformation.schoolId, schoolId: form.schoolId,
sex: personalInformation.sex, sex: form.sex,
userId: personalInformation.userId, userId: form.userId,
userName: personalInformation.userName, userName: form.userName,
weChatID: personalInformation.weChatID, weChatID: form.weChatID,
} }
let personalFileEntities = [] let personalFileEntities = []
this.archivesList.forEach((n,k) => { this.archivesList.forEach((n,k) => {
@ -866,7 +875,7 @@ export default {
userInfoEntity, userInfoEntity,
personalFileEntities personalFileEntities
} }
this.$put(this.api.userinfoUpdate,data).then(res => { this.$post(this.api.updatePersonCenter,data).then(res => {
this.$message.success('提交成功！') this.$message.success('提交成功！')
}).catch(res => {}); }).catch(res => {});
}, },
@ -940,7 +949,7 @@ export default {
this.$put(this.api.bingEmail,data).then(res => { this.$put(this.api.bingEmail,data).then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('绑定成功') this.$message.success('绑定成功')
this.personalInformation.email = this.email this.form.email = this.email
this.emailVisible = false this.emailVisible = false
} }
}).catch(res => {}); }).catch(res => {});
@ -979,7 +988,7 @@ export default {
this.$put(this.api.bindPhone,data).then(res => { this.$put(this.api.bindPhone,data).then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('绑定成功') this.$message.success('绑定成功')
this.personalInformation.phone = this.phone this.form.phone = this.phone
this.phoneVisible = false this.phoneVisible = false
} }
}).catch(res => {}); }).catch(res => {});

2
src/views/user/AddUser.vue
Unescape View File

@ -645,7 +645,7 @@ export default {
}, },
getCityData(){ getCityData(){
this.$get(this.api.queryCity,{provinceId: this.form.provinceId}).then(res => { this.$get(this.api.queryCity,{provinceId: this.form.provinceId}).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// 获取列表学校名称 // 获取列表学校名称

7
src/views/user/User.vue
Unescape View File

@ -264,7 +264,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}) }).catch(res => {})
}, },
// 清除城市 // 清除城市
@ -322,11 +322,10 @@ export default {
resetPassword(row){ resetPassword(row){
this.$confirm(`重置后的密码为：${this.$config.initialPassword}，确定重置？`, '提示', { this.$confirm(`重置后的密码为：${this.$config.initialPassword}，确定重置？`, '提示', {
}).then(() => { }).then(() => {
let data = { this.$get(this.api.resetPwd,{
newPwd: this.$config.initialPassword, newPwd: this.$config.initialPassword,
userId: row.userId, userId: row.userId,
} }).then(res => {
this.$get(this.api.resetPwd,data).then(res => {
if(res.message == 'success'){ if(res.message == 'success'){
this.$message.success('重置成功') this.$message.success('重置成功')
}else{ }else{

Write Preview
Loading…
Cancel
Save