是
@@ -81,6 +91,8 @@ import {is8Number, isMobile} from '@/utils/validate'
import myRequest from "@/views/modules/h5/myRequest";
export default {
+
+
data() {
var validateuserId = (rule, value, callback) => {
if (!is8Number(value)) {
@@ -97,7 +109,6 @@ export default {
}
}
-
return {
visible: false,
roleList: [],
@@ -112,11 +123,14 @@ export default {
identityId: '',
jobTitle: '',
office: '',
+ age: '',
+ sex: '',
workName: '',
workPhone: '',
pyCard: '',
carNumber: '',
carStatus: 0,
+ mealCard: '',
dormitory: '',
dormitoryStatus: 0,
bankAddress: '',
@@ -124,11 +138,10 @@ export default {
},
identityes: ['管理员', '研究生', '本校老师', '外校老师'],
columns: [
- {text: '教师1', value: '教师1'},
- {text: '教师2', value: '教师2'},
- {text: '教师2', value: '教师2'},
- {text: '教师3', value: '教师3'},
- {text: '教师4', value: '教师4'},
+ {text: '正高级教师', value: '正高级教师'},
+ {text: '高级教师', value: '高级教师'},
+ {text: '一级教师', value: '一级教师'},
+ {text: '二级教师', value: '二级教师'},
],
groupIdes: [],
dataRule: {
@@ -178,7 +191,7 @@ export default {
console.log(data)
if (data && data.code === 200) {
this.dataForm.userName = data.user.userName
- this.dataForm.groupId = data.user.groupId
+ this.dataForm.groupId = data.user.groupId==0?'':data.user.groupId
this.dataForm.userId = data.user.userId
this.dataForm.phone = data.user.phone
this.dataForm.jobTitle = data.user.jobTitle
@@ -194,6 +207,9 @@ export default {
this.dataForm.bankName = data.user.bankName
this.dataForm.identityId = data.user.identityId
this.dataForm.status = data.user.status
+ this.dataForm.age = data.user.age
+ this.dataForm.mealCard = data.user.mealCard
+ this.dataForm.sex = data.user.sex
}
})
}
@@ -224,7 +240,10 @@ export default {
'bankAddress': this.dataForm.bankAddress,
'bankName': this.dataForm.bankName,
'identityId': this.dataForm.identityId,
- 'status': this.dataForm.status
+ 'status': this.dataForm.status,
+ 'mealCard': this.dataForm.mealCard,
+ 'age': this.dataForm.age,
+ 'sex': this.dataForm.sex
})
}).then(({data}) => {
console.log(data)
diff --git a/src/views/modules/h5/waiTeacher.vue b/src/views/modules/h5/waiTeacher.vue
index 0e62dbd..2ea383d 100644
--- a/src/views/modules/h5/waiTeacher.vue
+++ b/src/views/modules/h5/waiTeacher.vue
@@ -2,7 +2,7 @@
-
+
查询
@@ -12,14 +12,17 @@
随机分配宿舍
+
+ 导出
+
-
-
-
+
+
-
+
@@ -41,12 +44,15 @@
{{ props.row.bankName }}
-
- {{ props.row.dormitory }}
-
+
+
+
{{ props.row.carNumber }}
+
+ {{ props.row.mealCard }}
+
@@ -55,23 +61,24 @@
-
-
-
-
+
{{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
-
+
+
+
-
+
-
+
-
+
-
+
+
+
@@ -82,6 +89,7 @@
-
+
- 是
- 否
+
+
+
+
+
+
-
-
- 是
- 否
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
修改
@@ -116,11 +140,6 @@
-
-
-
-
-
import AddOrUpdate from './wai-add-or-update'
-import {isAuth} from "@/utils";
import myRequest from "@/views/modules/h5/myRequest";
export default {
data() {
return {
+ options: [],
+ value: null,
dataForm: {
userName: ''
},
@@ -151,6 +171,61 @@ export default {
dataListSelections: [],
addOrUpdateVisible: false,
groupIdes: [],
+ json_fields: {
+ "序号": "index",
+ "姓名": "userName",
+ "身份码": "userId",
+ "用户专业码": "userMajorId",
+ "手机号": "phone",
+ "分组": {
+ field: "groupId",
+ callback: (value) => {
+ if (value=='0'){
+ return ""
+ }
+ return this.groupIdMap[value] || value; // 返回对应的文本
+ }
+ },
+ "学科": {
+ field: "majorId",
+ callback: (value) => {
+ // 定义major_id到对应文本的映射
+ const majorMap = {
+ 1: "语文",
+ 4: "地理",
+ 7: "历史",
+ 8: "政治",
+ };
+ return majorMap[value] || value; // 返回对应的文本
+ }
+ },
+ "职称": "jobTitle",
+ "职务": "office",
+ "年龄": "age",
+ "性别": "sex",
+ "单位": "workName",
+ "单位电话": "workPhone",
+ "身份证号": "identityId",
+ "银行卡号": "pyCard",
+ "开户所在地": "bankAddress",
+ "开户行": "bankName",
+ "车牌号": "carNumber",
+ "饭卡号": "mealCard",
+ "是否住宿": {
+ field: "dormitoryStatus",
+ callback: (value) => {
+ // 定义dormitoryStatus到对应文本的映射
+ const majorMap = {
+ 1: "是",
+ 0: "否",
+ };
+ return majorMap[value] || value; // 返回对应的文本
+ }
+ },
+ "宿舍号": "dormitory",
+ },
+ groupIdMap:{},
+ groupIdesShow: [],
}
},
components: {
@@ -160,27 +235,95 @@ export default {
this.getDataList()
this.groupIdes=[]
// 获取分组
- myRequest.getGroupList(this)
+ // 获取分组
+ let groupList = myRequest.getGroupList(this);
+ setTimeout(() => {
+ groupList.forEach(item => {
+ this.groupIdMap[item.id] = item.text;
+ })
+
+ },500)
},
computed: {},
methods: {
+ /**
+ * 自定义排序
+ */
+ sortChange(colum){
+ if (colum.order === 'ascending'){
+ this.getDataList(colum.prop,colum.order)
+ }else {
+ this.getDataList(colum.prop,colum.order)
+ }
+
+ },
+ changeDor(val,dor){
+ this.value=val
+ console.log(this.value)
+ console.log(dor)
+ this.$http({
+ url: this.$http.adornUrl('/wai/saved'),
+ method: 'get',
+ params: {
+ dorName:val,
+ userId:dor
+ }
+ }).then(({data}) => {
+ this.getDataList()
+ })
+
+
+ },
+ // 获取宿舍信息
+ async getDorList(sex){
+ await this.$http({
+ url: this.$http.adornUrl('/dor/listm?sex='+sex),
+ method: 'get',
+ }).then(({data}) => {
+ console.log(this.options)
+ this.options=data.dorinfo
+ console.log(this.options)
+ })
+ },
+ // Excel导出
+ async getExportExcel(){
+ let excelData=[]
+ await this.$http({
+ url: this.$http.adornUrl('/wai/export'),
+ method: 'get',
+ }).then(({data}) => {
+ excelData = data.map((item, index) => {
+ return { ...item, index: index + 1 }; // 添加序号字段
+ });
+ // if (data && data.code === 200) {
+ // console.log(data.list)
+ // }
+ })
+ return excelData
+ },
// isAuth,
// 分组过滤
filterTag(value, row) {
return row.groupId === value;
},
getgroups(id) {
- try {
- let groupIdes = this.groupIdes
- return groupIdes[id - 1].text
- } catch (e) {
- // console.log(e)
- return "未分组"
- }
-
+ let groupName=''
+ // console.log(this.groupIdesShow[id])
+ this.groupIdesShow.forEach(item => {
+ if (item.id === id){
+ groupName= item.name
+ }
+ })
+ return groupName
+ // try {
+ //
+ // } catch (e) {
+ // console.log(e)
+ // return "未分组"
+ // }
},
// 获取数据列表
- getDataList() {
+ getDataList(prop='',sort='') {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/wai/list'),
@@ -188,7 +331,9 @@ export default {
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
- 'userId': this.dataForm.userName
+ 'userName': this.dataForm.userName,
+ 'prop': prop,
+ 'sort': sort
})
}).then(({data}) => {
if (data && data.code === 200) {
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 7db0c06..620c556 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -1,7 +1,7 @@
-
+
@@ -10,8 +10,8 @@
-
-
+
+
@@ -55,13 +55,13 @@ export default {
callback()
}
}
- var validateEmail = (rule, value, callback) => {
- if (!isEmail(value)) {
- callback(new Error('邮箱格式错误'))
- } else {
- callback()
- }
- }
+ // var validateEmail = (rule, value, callback) => {
+ // if (!isEmail(value)) {
+ // callback(new Error('邮箱格式错误'))
+ // } else {
+ // callback()
+ // }
+ // }
var validateMobile = (rule, value, callback) => {
if (!isMobile(value)) {
callback(new Error('手机号格式错误'))
@@ -93,10 +93,10 @@ export default {
comfirmPassword: [
{ validator: validateComfirmPassword, trigger: 'blur' }
],
- email: [
- { required: true, message: '邮箱不能为空', trigger: 'blur' },
- { validator: validateEmail, trigger: 'blur' }
- ],
+ // email: [
+ // { required: true, message: '邮箱不能为空', trigger: 'blur' },
+ // { validator: validateEmail, trigger: 'blur' }
+ // ],
mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ validator: validateMobile, trigger: 'blur' }
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 6454a76..97111c5 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -15,9 +15,9 @@
-
+
-
+
diff --git a/vue.config.js b/vue.config.js
index 4dc007b..9837033 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,10 @@ module.exports = {
devServer: {
// 后端请求转发，此配置仅开发环境有效，生产环境请参考生产环境部署文档配置nginx转发
proxy: {
- '/wx': {
- target: 'http://localhost:8080/'
+ // '/wx': {
+ '/': {
+ target: 'http://localhost:80/'
+ // target: 'http://localhost:8080/'
// target: 'http://154.8.196.128:8080/'
}
},