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

dev
yujialong 3 years ago
parent aa626b7be9
commit 8707612e20
  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

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

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

@ -140,14 +140,18 @@
<span>数据平台权限</span>
</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>
<el-table-column prop="courseName" 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>
<el-table-column prop="usePeriod" label="剩余期限" align="center"></el-table-column>
<el-table-column prop="usePeriod" label="账号数" align="center"></el-table-column>
<el-table-column prop="productName" 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">
<template slot-scope="scope">
{{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">
<template slot-scope="scope">
<el-button @click="configure(scope.row)">配置</el-button>
@ -156,11 +160,10 @@
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.isDeliverGoods"
v-model="scope.row.is_enable"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
:active-text="scope.row.is_enable ? '启用' : '禁用'"
disabled>
</el-switch>
</template>
@ -342,6 +345,7 @@ export default {
schoolList: [],
contractInformations: [],
coursePermissionss: [],
dataPermissionss: [],
ipVisible: false,
IPData: [{
id: 1,
@ -392,6 +396,7 @@ export default {
}
this.contractInformations = res.result.contractInformations
this.coursePermissionss = res.result.coursePermissionss
this.dataPermissionss = res.result.dataPermissionss
this.getCityData()
this.changIndustryData()
this.getSchoolData()
@ -407,7 +412,7 @@ export default {
provinceId: this.form.provinceId
}
this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message
this.cityList = res.list
}).catch(res => {});
},
//
@ -453,7 +458,7 @@ export default {
//
getIndustryClass(){
this.$get(this.api.queryCustomerIndustryClass).then(res => {
this.IndustryClassList = res.message
this.IndustryClassList = res.list
}).catch(res => {});
},
//
@ -470,7 +475,7 @@ export default {
industryClassId: this.form.industryClassId
}
this.$get(this.api.queryCustomerIndustry,data).then(res => {
this.industryList = res.message
this.industryList = res.list
}).catch(res => {});
},
saveAdd(formName){

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

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

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

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

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

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

Loading…
Cancel
Save