diff --git a/src/views/admin/IcsCustomerStaffList.vue b/src/views/admin/IcsCustomerStaffList.vue
index beacb5d..648a5a6 100644
--- a/src/views/admin/IcsCustomerStaffList.vue
+++ b/src/views/admin/IcsCustomerStaffList.vue
@@ -36,20 +36,39 @@
:columns='columns'
:data='loadData'
>
+
- 维修员
+ 普通用户
-
+
派单员
-
- 网格长
+
+ 维修人
+
+
+ 管理员
+
+
+ 楼层管理员
+
+
+
+ 普通用户
+
+
+ 派单员
+
+
+ 维修人
+
+
-
-
+ 编辑
+
删除
@@ -97,10 +116,15 @@ export default {
dataIndex: 'mobile'
},
{
- title: '角色类型',
+ title: '报修角色类型',
dataIndex: 'dataType',
scopedSlots: { customRender: 'dataType' }
},
+ {
+ title: '会议角色类型',
+ dataIndex: 'roomRole',
+ scopedSlots: { customRender: 'roomRole' }
+ },
{
title: '创建时间',
dataIndex: 'createTime'
diff --git a/src/views/admin/modules/IcsCustomerStaffModal.vue b/src/views/admin/modules/IcsCustomerStaffModal.vue
index f2b6fc6..c6a152a 100644
--- a/src/views/admin/modules/IcsCustomerStaffModal.vue
+++ b/src/views/admin/modules/IcsCustomerStaffModal.vue
@@ -1,89 +1,89 @@
-
-
+
+
-
-
-
- {{ item.name }}
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
男
女
-
-
- ![]()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 普通用户
+ 派单员
+ 维修人
+ 管理员
+ 楼层管理员
+
-
-
- ![]()
-
-
+
+
+ 普通用户
+ 会议服务人员
+ 会议管理员
+
-
-
+
+
+ 音控组
+ 会务服务组
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -103,7 +103,7 @@ export default {
name: 'IcsCustomerStaffModal',
props: {},
components: {},
- data() {
+ data () {
return {
visible: false,
labelCol: {
@@ -129,13 +129,13 @@ export default {
avatarLoading: false
}
},
- beforeCreate() {
+ beforeCreate () {
},
- created() {
+ created () {
},
methods: {
// 照片
- photoBeforeUpload(file) {
+ photoBeforeUpload (file) {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'
if (!isJpgOrPng) {
this.$message.error('You can only upload JPG file!')
@@ -146,7 +146,7 @@ export default {
}
return isJpgOrPng && isLt2M
},
- photoHandleChange(info) {
+ photoHandleChange (info) {
if (info.file.status === 'uploading') {
this.photoLoading = true
return
@@ -169,7 +169,7 @@ export default {
}
},
// 头像
- avatarBeforeUpload(file) {
+ avatarBeforeUpload (file) {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'
if (!isJpgOrPng) {
this.$message.error('You can only upload JPG file!')
@@ -180,7 +180,7 @@ export default {
}
return isJpgOrPng && isLt2M
},
- avatarHandleChange(info) {
+ avatarHandleChange (info) {
if (info.file.status === 'uploading') {
this.avatarLoading = true
return
@@ -202,16 +202,17 @@ export default {
})
}
},
- getBase64(img, callback) {
+ getBase64 (img, callback) {
const reader = new FileReader()
reader.addEventListener('load', () => callback(reader.result))
reader.readAsDataURL(img)
},
- add() {
+ add () {
this.form.resetFields()
this.edit({ id: 0 })
},
- edit(record) {
+ edit (record) {
+ console.log(record)
// 查询企业
getCustomerList().then(res => {
console.log('getCustomerList', res)
@@ -220,7 +221,7 @@ export default {
this.mdl = Object.assign(record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.mdl, 'id', 'icsCustomerId', 'name', 'mobile', 'gender', 'photo', 'avatar', 'username', 'cardNo', 'address', 'email', 'degree', 'urgent'))
+ this.form.setFieldsValue(pick(this.mdl, 'id', 'icsCustomerId', 'name', 'mobile', 'gender', 'photo', 'avatar', 'dataType', 'roomRole', 'roomRoleType', 'username', 'cardNo', 'address', 'email', 'degree', 'urgent'))
})
//
if (this.mdl.photo) {
@@ -234,7 +235,7 @@ export default {
this.avatarImageUrl = ''
}
},
- handleSubmit(e) {
+ handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
if (!err) {
@@ -242,6 +243,7 @@ export default {
this.confirmLoading = true
console.log('Received values of form: ')
saveIcsCustomerStaff(values).then(res => {
+ console.log(111)
if (res.code === 0) {
this.$message.success('保存成功')
this.$emit('ok')