From 8707612e200108cfeb43d99814257daf1f265030 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 8 Jul 2021 15:34:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E3=80=81=E7=9C=81?=
=?UTF-8?q?=E4=BB=BD=E5=9F=8E=E5=B8=82=E7=AD=89=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
=?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/index.js | 4 +
src/utils/api.js | 8 +-
src/views/customer/AddCustomer.vue | 29 ++--
src/views/customer/Dashboard.vue | 4 +-
src/views/oder/AddOrder.vue | 2 +-
src/views/oder/Order.vue | 2 +-
src/views/setting/Person.vue | 211 +++++++++++++++--------------
src/views/user/AddUser.vue | 2 +-
src/views/user/User.vue | 7 +-
9 files changed, 143 insertions(+), 126 deletions(-)
diff --git a/src/store/index.js b/src/store/index.js
index 327cada..6a2df30 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -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
},
diff --git a/src/utils/api.js b/src/utils/api.js
index 4ae60d5..f3bac3b 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -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`, //查询专业类
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index b60a2c5..95f671d 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -140,14 +140,18 @@
数据平台权限
-
+
-
-
-
-
-
+
+
+
+
+ {{scope.row.startTime}}~{{scope.row.endTime}}
+
+
+
+
配置
@@ -156,11 +160,10 @@
@@ -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){
diff --git a/src/views/customer/Dashboard.vue b/src/views/customer/Dashboard.vue
index 985df65..fec3aa9 100644
--- a/src/views/customer/Dashboard.vue
+++ b/src/views/customer/Dashboard.vue
@@ -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(){
diff --git a/src/views/oder/AddOrder.vue b/src/views/oder/AddOrder.vue
index 8e90161..997309c 100644
--- a/src/views/oder/AddOrder.vue
+++ b/src/views/oder/AddOrder.vue
@@ -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 => {});
},
// 清除城市
diff --git a/src/views/oder/Order.vue b/src/views/oder/Order.vue
index e24ab70..a3553a1 100644
--- a/src/views/oder/Order.vue
+++ b/src/views/oder/Order.vue
@@ -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(){
diff --git a/src/views/setting/Person.vue b/src/views/setting/Person.vue
index 1035602..5b77381 100644
--- a/src/views/setting/Person.vue
+++ b/src/views/setting/Person.vue
@@ -8,7 +8,7 @@
:action="this.api.updateUserAvatars"
:data="{userId:this.userId}"
name="file"
- :limit="3"
+ :limit="1"
:on-success="getRes"
>
点击更改头像
@@ -28,12 +28,12 @@
姓名
-
+
@@ -156,7 +167,7 @@
国家
手机号
- {{personalInformation.phone}}
- 更换
+ {{form.phone}}
+ 更换
绑定
@@ -273,8 +284,8 @@
邮箱
- {{personalInformation.email}}
- 更换
+ {{form.email}}
+ 更换
绑定
@@ -290,7 +301,7 @@
{
- 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 => {});
diff --git a/src/views/user/AddUser.vue b/src/views/user/AddUser.vue
index c6cb161..fa74782 100644
--- a/src/views/user/AddUser.vue
+++ b/src/views/user/AddUser.vue
@@ -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 => {});
},
// 获取列表学校名称
diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index b5ab9a5..f75ddb6 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -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{
From a482c64b2a3f6fc35a9413c0fe1a6491bac5a953 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 8 Jul 2021 17:02:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 124 ++++++++++++++---------------
package.json | 4 +-
src/utils/api.js | 10 +--
src/views/customer/AddCustomer.vue | 38 +++++----
src/views/customer/customer.vue | 4 +-
src/views/setting/Person.vue | 91 +++++++++++----------
6 files changed, 136 insertions(+), 135 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7df5552..9bf8dbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1019,9 +1019,9 @@
}
},
"@types/json-schema": {
- "version": "7.0.7",
- "resolved": "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.7.tgz",
- "integrity": "sha1-mKmTUWyFnrDVxMjwmDF6nqaNua0="
+ "version": "7.0.8",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
+ "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="
},
"@types/minimatch": {
"version": "3.0.3",
@@ -1834,7 +1834,7 @@
},
"async-foreach": {
"version": "0.1.3",
- "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
},
"async-limiter": {
@@ -2003,7 +2003,7 @@
},
"babel-plugin-syntax-dynamic-import": {
"version": "6.18.0",
- "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
},
"babel-polyfill": {
@@ -2137,7 +2137,7 @@
},
"block-stream": {
"version": "0.0.9",
- "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"requires": {
"inherits": "~2.0.0"
@@ -2931,7 +2931,7 @@
},
"console-control-strings": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
},
"consolidate": {
@@ -3806,7 +3806,7 @@
},
"delegates": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
"depd": {
@@ -5475,7 +5475,7 @@
},
"gauge": {
"version": "2.7.4",
- "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "^1.0.3",
@@ -5490,12 +5490,12 @@
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
@@ -5503,7 +5503,7 @@
},
"string-width": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
@@ -5513,7 +5513,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
@@ -6491,7 +6491,7 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
},
"has-value": {
@@ -8377,7 +8377,7 @@
"dependencies": {
"semver": {
"version": "5.3.0",
- "resolved": "https://registry.nlark.com/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1618847119601&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
}
}
@@ -8475,17 +8475,17 @@
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"ansi-styles": {
"version": "2.2.1",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995367379&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@@ -8497,7 +8497,7 @@
},
"cross-spawn": {
"version": "3.0.1",
- "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"requires": {
"lru-cache": "^4.0.1",
@@ -8515,7 +8515,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
@@ -8523,19 +8523,19 @@
},
"supports-color": {
"version": "2.0.0",
- "resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1622293670728&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
},
"yallist": {
"version": "2.1.2",
- "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
}
}
},
"nopt": {
"version": "3.0.6",
- "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649905420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": {
"abbrev": "1"
@@ -8884,7 +8884,7 @@
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
@@ -9144,8 +9144,8 @@
},
"pdfjs-dist": {
"version": "2.6.347",
- "resolved": "https://registry.nlark.com/pdfjs-dist/download/pdfjs-dist-2.6.347.tgz",
- "integrity": "sha1-8lftZug76QDND9KFJKIYf7niXNU="
+ "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.6.347.tgz",
+ "integrity": "sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ=="
},
"performance-now": {
"version": "2.1.0",
@@ -10228,8 +10228,8 @@
},
"raw-loader": {
"version": "4.0.2",
- "resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-4.0.2.tgz",
- "integrity": "sha1-GqxrfRrRUB5m79rBUixz5ZpYTrY=",
+ "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+ "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
"requires": {
"loader-utils": "^2.0.0",
"schema-utils": "^3.0.0"
@@ -10237,8 +10237,8 @@
"dependencies": {
"ajv": {
"version": "6.12.6",
- "resolved": "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz",
- "integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -10248,31 +10248,31 @@
},
"ajv-keywords": {
"version": "3.5.2",
- "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882441894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
- "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0="
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
},
"emojis-list": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
- "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
},
"fast-deep-equal": {
"version": "3.1.3",
- "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"json5": {
"version": "2.2.0",
- "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
- "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+ "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
- "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -10281,15 +10281,15 @@
},
"minimist": {
"version": "1.2.5",
- "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1589682820731&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
- "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
"schema-utils": {
- "version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-3.0.0.tgz",
- "integrity": "sha1-Z1AvaqK2ai1AMrQnmilEl4oJE+8=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
+ "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
"requires": {
- "@types/json-schema": "^7.0.6",
+ "@types/json-schema": "^7.0.7",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
@@ -10938,7 +10938,7 @@
},
"scss-tokenizer": {
"version": "0.2.3",
- "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"requires": {
"js-base64": "^2.1.8",
@@ -10947,7 +10947,7 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
- "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
"amdefine": ">=0.0.4"
@@ -12629,8 +12629,8 @@
},
"vue-pdf": {
"version": "4.3.0",
- "resolved": "https://registry.nlark.com/vue-pdf/download/vue-pdf-4.3.0.tgz",
- "integrity": "sha1-1feQ7nln57eqkIm5exGrFo4Z29A=",
+ "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz",
+ "integrity": "sha512-zd3lJj6CbtrawgaaDDciTDjkJMUKiLWtbEmBg5CvFn9Noe9oAO/GNy/fc5c59qGuFCJ14ibIV1baw4S07e5bSQ==",
"requires": {
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"loader-utils": "^1.4.0",
@@ -12642,21 +12642,21 @@
"dependencies": {
"emojis-list": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
- "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
},
"json5": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
- "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.0",
- "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz",
- "integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+ "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -12676,8 +12676,8 @@
},
"vue-resize-sensor": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/vue-resize-sensor/download/vue-resize-sensor-2.0.0.tgz",
- "integrity": "sha1-Olh/1oAuFohwnPLFqtrnoAdZUr8="
+ "resolved": "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
+ "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
},
"vue-router": {
"version": "3.1.3",
@@ -13160,8 +13160,8 @@
},
"worker-loader": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/worker-loader/download/worker-loader-2.0.0.tgz",
- "integrity": "sha1-Rf2j73asqBV3GokQc5nuQRm0MKw=",
+ "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz",
+ "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
"requires": {
"loader-utils": "^1.0.0",
"schema-utils": "^0.4.0"
@@ -13169,8 +13169,8 @@
"dependencies": {
"schema-utils": {
"version": "0.4.7",
- "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz",
- "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+ "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
diff --git a/package.json b/package.json
index e8258c7..7e6e5fc 100644
--- a/package.json
+++ b/package.json
@@ -17,12 +17,12 @@
"px2rem-loader": "^0.1.9",
"vue": "^2.6.10",
"vue-cropperjs": "^3.0.0",
+ "vue-pdf": "^4.3.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.0.3",
"vue-schart": "^2.0.0",
"vuedraggable": "^2.17.0",
- "vuex": "^3.1.2",
- "vue-pdf": "^4.2.0"
+ "vuex": "^3.1.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.9.0",
diff --git a/src/utils/api.js b/src/utils/api.js
index f3bac3b..f643723 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,8 +1,8 @@
let host = 'http://39.108.250.202'
-let host1 = 'http://192.168.31.151:9000'
-let host2 = 'http://192.168.31.125:9000'
-let host3 = 'http://192.168.31.140:9000'
+let host1 = 'http://192.168.31.151:9000'//榕
+let host2 = 'http://192.168.31.125:9000'//林
+let host3 = 'http://192.168.31.140:9000'//7
export default {
logins: `${host}/liuwanr/userInfo/adminLogins`, //登录
@@ -27,7 +27,7 @@ export default {
updateUserRoleId: `${host}/liuwanr/userInfo/updateUserRoleId`, //更新用户角色id接口
// 客户管理
- deleteCustomer: `${host3}/nakadai/customer/delCustomer`,
+ delCustomers: `${host3}/nakadai/customer/delCustomers`,
updateCustomer: `${host3}/nakadai/customer/updateCustomer`,
addCustomer: `${host3}/nakadai/customer/addCustomer`,
queryCustomer: `${host3}/nakadai/customer/queryCustomer`,
@@ -37,8 +37,8 @@ export default {
updateEnabled: `${host3}/nakadai/customer/updateEnabled`,
queryCustomerIndustryClass: `${host3}/nakadai/hrIndustryClass/queryIndustryClass`,
queryCustomerIndustry: `${host3}/nakadai/hrIndustry/queryIndustry`,
- queryPhone: `${host}/liuwanr/user/queryPhone`,
querySchoolData: `${host3}/nakadai/school/querySchool`,
+ queryPhone: `${host}/liuwanr/user/queryPhone`,
queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`,
// 用户管理
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index 95f671d..ecab81f 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -83,7 +83,7 @@
-
+
@@ -107,11 +107,14 @@
-
+
-
+
+
+ {{scope.row.startTime}}~{{scope.row.endTime}}
+
-
+
@@ -120,14 +123,7 @@
-
-
+
@@ -159,13 +155,7 @@
-
-
+
@@ -298,7 +288,7 @@ export default {
{ required: true, message: '请输入账号', trigger: 'blur' }
],
phone: [
- { required: true, message: '请输入手机号', trigger: 'blur' },
+ // { required: true, message: '请输入手机号', trigger: 'blur' },
{
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号',
@@ -478,6 +468,14 @@ export default {
this.industryList = res.list
}).catch(res => {});
},
+ switchOff(val,row,index) {
+ this.$get(this.api.updateEnabled,{
+ id: row.id,
+ isEnable: val
+ }).then(res => {
+ this.$message.success(val ? '启用成功' : '禁用成功')
+ }).catch(res => {})
+ },
saveAdd(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 5f9ba42..e0f57f3 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -192,7 +192,7 @@ export default {
this.$confirm('确定要删除吗?', '提示', {
type: 'warning'
}).then(() => {
- this.$post(this.api.deleteCustomer,row.customerId).then(res => {
+ this.$post(this.api.delCustomers,[row.customerId]).then(res => {
this.$message.success('删除成功')
this.getData()
}).catch(res => {})
@@ -210,7 +210,7 @@ export default {
this.$confirm('确定要删除吗?', '提示', {
type: 'warning'
}).then(() => {
- this.$post(this.api.deleteCustomer,data).then(res => {
+ this.$post(this.api.delCustomers,delList).then(res => {
this.multipleSelection = [];
this.$message.success('删除成功')
this.getData()
diff --git a/src/views/setting/Person.vue b/src/views/setting/Person.vue
index 5b77381..270c5d2 100644
--- a/src/views/setting/Person.vue
+++ b/src/views/setting/Person.vue
@@ -140,6 +140,30 @@
+
+
+
手机号
+
+ {{form.phone}}
+ 更换
+ 绑定
+
+
+
+
邮箱
+
+ {{form.email}}
+ 更换
+ 绑定
+
+
+
+
个人档案
@@ -271,24 +295,6 @@
v-model="form.account"
/>
-
-
手机号
-
- {{form.phone}}
- 更换
- 绑定
-
-
-
-
-
-
邮箱
-
- {{form.email}}
- 更换
- 绑定
-
-
密码
@@ -493,7 +499,7 @@ export default {
};
},
mounted() {
- this.getdata();
+ this.getdata()
this.getProvince()
this.getSchoolData()
this.getSubject()
@@ -568,6 +574,7 @@ export default {
let schoolId = userInfo.schoolId
this.form = Object.assign(userInfo,res.result.userAccountList[0])
this.form.schoolId = schoolId
+ this.form.accountId = userInfo.id
console.log(11,this.form)
this.originAccount = this.form.account
this.archivesList = res.result.personalFileList
@@ -831,31 +838,11 @@ export default {
if(isEmpty) return this.$message.warning('请选择职业')
if(this.accountReapeat) 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.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: 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 = []
+ let personalFileList = []
this.archivesList.forEach((n,k) => {
- personalFileEntities.push({
- cityId: n.cityId,
- cityName: n.cityName,
+ personalFileList.push({
disciplineId: n.disciplineId,
disciplineName: n.disciplineName,
personalCareerId: n.personalCareerId,
@@ -872,12 +859,28 @@ export default {
})
})
let data = {
- userInfoEntity,
- personalFileEntities
+ userId: this.userId,
+ userAccountList: [{
+ id: form.accountId,
+ account: form.account,
+ userId: form.userId,
+ }],
+ hrUserInfo: {
+ cityId: form.cityId,
+ countries: form.countries,
+ dateBirth: form.dateBirth,
+ educationDegree: form.educationDegree,
+ idNumber: form.idNumber,
+ schoolId: form.schoolId,
+ sex: form.sex,
+ userId: this.userId,
+ userName: form.userName,
+ },
+ personalFileList,
}
this.$post(this.api.updatePersonCenter,data).then(res => {
this.$message.success('提交成功!')
- }).catch(res => {});
+ }).catch(res => {})
},
emailCountdown(){
let count = 60