|
@@ -62,9 +62,9 @@
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
allowClear
|
|
allowClear
|
|
v-decorator="[
|
|
v-decorator="[
|
|
- 'formData.officialPartnerNo',
|
|
|
|
|
|
+ 'formData.orgCode',
|
|
{
|
|
{
|
|
- initialValue: formData.officialPartnerNo,
|
|
|
|
|
|
+ initialValue: formData.orgCode,
|
|
rules: [{ required: true, message: '请选择!' }] },
|
|
rules: [{ required: true, message: '请选择!' }] },
|
|
]"
|
|
]"
|
|
:showSearch="true"
|
|
:showSearch="true"
|
|
@@ -73,7 +73,7 @@
|
|
@focus="handleFocus"
|
|
@focus="handleFocus"
|
|
@blur="handleBlur"
|
|
@blur="handleBlur"
|
|
@change="handleChange">
|
|
@change="handleChange">
|
|
- <a-select-option v-for="item in optionData" :key="item.officialPartnerNo" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
|
|
|
|
|
|
+ <a-select-option v-for="item in optionData" :key="item.orgCode" :value="item.orgCode">{{ item.name }}</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
@@ -99,7 +99,7 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<!-- 状态 -->
|
|
<!-- 状态 -->
|
|
- <a-col :span="12">
|
|
|
|
|
|
+ <!-- <a-col :span="12">
|
|
<a-form-item label="是否为超级管理员" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
<a-form-item label="是否为超级管理员" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
<a-radio-group
|
|
<a-radio-group
|
|
name="radioGroup"
|
|
name="radioGroup"
|
|
@@ -116,10 +116,10 @@
|
|
</a-radio-group>
|
|
</a-radio-group>
|
|
|
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
- </a-col>
|
|
|
|
|
|
+ </a-col> -->
|
|
</a-row>
|
|
</a-row>
|
|
|
|
|
|
- <a-row :gutter="24">
|
|
|
|
|
|
+ <!-- <a-row :gutter="24">
|
|
<a-col :span="24">
|
|
<a-col :span="24">
|
|
<a-form-item label="角色" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
|
|
<a-form-item label="角色" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
|
|
<a-select
|
|
<a-select
|
|
@@ -145,7 +145,7 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
- </a-row>
|
|
|
|
|
|
+ </a-row> -->
|
|
<a-row :gutter="24">
|
|
<a-row :gutter="24">
|
|
<a-col :span="24">
|
|
<a-col :span="24">
|
|
<a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
|
|
<a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
|
|
@@ -180,7 +180,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import { sellerList, getRoleList, saveUserPower } from '@/api/userManage.js'
|
|
|
|
|
|
+import { sellerList, saveUserPower, slelerDetails } from '@/api/userManage.js'
|
|
export default {
|
|
export default {
|
|
name: 'UserModal',
|
|
name: 'UserModal',
|
|
components: {
|
|
components: {
|
|
@@ -191,11 +191,9 @@ export default {
|
|
type: Boolean,
|
|
type: Boolean,
|
|
default: false
|
|
default: false
|
|
},
|
|
},
|
|
- data: {
|
|
|
|
- type: Object,
|
|
|
|
- default: function () {
|
|
|
|
- return {}
|
|
|
|
- }
|
|
|
|
|
|
+ itemId: {
|
|
|
|
+ type: String,
|
|
|
|
+ default: ''
|
|
}
|
|
}
|
|
},
|
|
},
|
|
data () {
|
|
data () {
|
|
@@ -204,16 +202,15 @@ export default {
|
|
isshow: this.visible,
|
|
isshow: this.visible,
|
|
formLayout: 'horizontal',
|
|
formLayout: 'horizontal',
|
|
form: this.$form.createForm(this, { name: 'miniForm' }),
|
|
form: this.$form.createForm(this, { name: 'miniForm' }),
|
|
- roleList: [],
|
|
|
|
optionData: [],
|
|
optionData: [],
|
|
formData: {
|
|
formData: {
|
|
- roleNames: undefined, // 角色
|
|
|
|
|
|
+ // roleNames: undefined, // 角色
|
|
name: '',
|
|
name: '',
|
|
loginFlag: '', // 活动状态
|
|
loginFlag: '', // 活动状态
|
|
phone: '',
|
|
phone: '',
|
|
sex: '',
|
|
sex: '',
|
|
remarks: '',
|
|
remarks: '',
|
|
- officialPartnerNo: undefined
|
|
|
|
|
|
+ orgCode: undefined
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -246,29 +243,63 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ getPageInfo () {
|
|
|
|
+ slelerDetails({
|
|
|
|
+ id: this.itemId
|
|
|
|
+ }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ console.log(res, '-------------返回数据')
|
|
|
|
+ this.form.setFieldsValue({ 'formData': res.data })
|
|
|
|
+ // this.formData.loginFlag = Number(this.formData.loginFlag)
|
|
|
|
+ // formData.loginFlag = formData.loginFlag + '' === '1'
|
|
|
|
+ // this.form.setFieldsValue({ 'formData.name': res.data.name })
|
|
|
|
+ // this.form.setFieldsValue({ 'formData.contactName': res.data.contactName })
|
|
|
|
+ // this.form.setFieldsValue({ 'formData.simpleName': res.data.simpleName })
|
|
|
|
+ // this.form.setFieldsValue({ 'formData.contactPhone': res.data.contactPhone })
|
|
|
|
+ // this.form.setFieldsValue({ 'formData.remarks': res.data.remarks })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 保存提交
|
|
// 保存提交
|
|
handleSubmit () {
|
|
handleSubmit () {
|
|
const _this = this
|
|
const _this = this
|
|
this.form.validateFields((err, values) => {
|
|
this.form.validateFields((err, values) => {
|
|
- console.log(values, 'values222')
|
|
|
|
- if (!err) {
|
|
|
|
- values.formData.roleNames = values.formData.roleNames.join(',')
|
|
|
|
- console.log(values.formData, ' formData.type222222222')
|
|
|
|
- console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
|
|
|
|
- saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
|
|
|
|
- console.log(res, 'res--save')
|
|
|
|
- if (res.status + '' === '200') {
|
|
|
|
- this.$message.success(res.message ? res.message : '保存成功')
|
|
|
|
- this.$emit('refresh')
|
|
|
|
- setTimeout(function () {
|
|
|
|
- _this.cancel()
|
|
|
|
- }, 300)
|
|
|
|
- } else {
|
|
|
|
- // this.$message.error(res.message)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ if (!err) {
|
|
|
|
+ const formData = Object.assign({}, this.formData, values.formData)
|
|
|
|
+ formData.id = _this.itemId
|
|
|
|
+ saveUserPower(formData).then(res => {
|
|
|
|
+ console.log(res, 'rrrrrrrrr')
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ _this.$message.success(res.message)
|
|
|
|
+ _this.$emit('refresh')
|
|
|
|
+ setTimeout(function () {
|
|
|
|
+ _this.isshow = false
|
|
|
|
+ }, 300)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
})
|
|
})
|
|
|
|
+ // const _this = this
|
|
|
|
+ // this.form.validateFields((err, values) => {
|
|
|
|
+ // console.log(values, 'values222')
|
|
|
|
+ // if (!err) {
|
|
|
|
+ // // values.formData.roleNames = values.formData.roleNames.join(',')
|
|
|
|
+ // console.log(values.formData, ' formData.type222222222')
|
|
|
|
+ // console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
|
|
|
|
+ // saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
|
|
|
|
+ // console.log(res, 'res--save')
|
|
|
|
+ // if (res.status + '' === '200') {
|
|
|
|
+ // this.$message.success(res.message ? res.message : '保存成功')
|
|
|
|
+ // this.$emit('refresh')
|
|
|
|
+ // setTimeout(function () {
|
|
|
|
+ // _this.cancel()
|
|
|
|
+ // }, 300)
|
|
|
|
+ // } else {
|
|
|
|
+ // // this.$message.error(res.message)
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
},
|
|
},
|
|
// 取消
|
|
// 取消
|
|
handleCancel () {
|
|
handleCancel () {
|
|
@@ -277,30 +308,30 @@ export default {
|
|
clear () {
|
|
clear () {
|
|
this.form.resetFields()
|
|
this.form.resetFields()
|
|
delete this.formData.id
|
|
delete this.formData.id
|
|
- this.formData.roleNames = []
|
|
|
|
|
|
+ // this.formData.roleNames = []
|
|
this.formData.name = ''
|
|
this.formData.name = ''
|
|
this.formData.loginFlag = ''
|
|
this.formData.loginFlag = ''
|
|
this.formData.phone = ''
|
|
this.formData.phone = ''
|
|
this.formData.sex = ''
|
|
this.formData.sex = ''
|
|
this.formData.remarks = ''
|
|
this.formData.remarks = ''
|
|
- this.formData.officialPartnerNo = undefined
|
|
|
|
- },
|
|
|
|
|
|
+ this.formData.orgCode = undefined
|
|
|
|
+ }
|
|
|
|
|
|
// 获取角色列表接口
|
|
// 获取角色列表接口
|
|
- getRoleList () {
|
|
|
|
- getRoleList().then(res => {
|
|
|
|
- console.log(res, 'res--role')
|
|
|
|
- if (res.status + '' === '200') {
|
|
|
|
- this.roleList = res.data
|
|
|
|
- } else {
|
|
|
|
- this.$message.warning(res.message)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ // getRoleList () {
|
|
|
|
+ // getRoleList().then(res => {
|
|
|
|
+ // console.log(res, 'res--role')
|
|
|
|
+ // if (res.status + '' === '200') {
|
|
|
|
+ // this.roleList = res.data
|
|
|
|
+ // } else {
|
|
|
|
+ // this.$message.warning(res.message)
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // }
|
|
|
|
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
- this.getRoleList()
|
|
|
|
|
|
+ // this.getRoleList()
|
|
this.getSellerList()
|
|
this.getSellerList()
|
|
},
|
|
},
|
|
beforeCreate () {
|
|
beforeCreate () {
|
|
@@ -310,44 +341,21 @@ export default {
|
|
visible (newValue, oldValue) {
|
|
visible (newValue, oldValue) {
|
|
this.isshow = newValue
|
|
this.isshow = newValue
|
|
},
|
|
},
|
|
- isshow (newValue, oldValue) {
|
|
|
|
- if (newValue) {
|
|
|
|
- if (this.data.id) { // 编辑
|
|
|
|
- this.titleText = '编辑用户'
|
|
|
|
- this.formData = Object.assign({}, this.data)
|
|
|
|
- delete this.formData.no
|
|
|
|
- let roleNames = this.formData.roleNames
|
|
|
|
- console.log(roleNames, 'roleNames')
|
|
|
|
- if (roleNames) {
|
|
|
|
- roleNames = roleNames.split(',')
|
|
|
|
- console.log(roleNames, 'roleNames22')
|
|
|
|
- const arr = []
|
|
|
|
- console.log(this.roleList, 'this.roleList')
|
|
|
|
-
|
|
|
|
- roleNames.map(item => {
|
|
|
|
- const row = this.roleList.find(a => {
|
|
|
|
- return a.name == item
|
|
|
|
- })
|
|
|
|
- if (row) {
|
|
|
|
- arr.push(row.id)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- console.log(arr, 'arrs')
|
|
|
|
- this.formData.roleNames = arr
|
|
|
|
- } else {
|
|
|
|
- this.formData.roleNames = []
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- this.formData.loginFlag = Number(this.formData.loginFlag)
|
|
|
|
- // this.formData.sex = Number(this.formData.sex)
|
|
|
|
- console.log(this.formData, 'this.formData')
|
|
|
|
- } else {
|
|
|
|
- this.titleText = '新增用户'
|
|
|
|
- }
|
|
|
|
|
|
+ isshow (val) {
|
|
|
|
+ if (!val) {
|
|
|
|
+ this.$emit('close')
|
|
} else {
|
|
} else {
|
|
- this.cancel()
|
|
|
|
|
|
+ this.form.resetFields()
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ itemId (newValue, oldValue) {
|
|
|
|
+ console.log(newValue, '----------id')
|
|
|
|
+ if (newValue && this.isshow) {
|
|
|
|
+ this.titleText = '编辑'
|
|
|
|
+ this.getPageInfo(newValue)
|
|
|
|
+ } else {
|
|
|
|
+ this.titleText = '新增用户'
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|