|
@@ -19,8 +19,9 @@
|
|
<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-input
|
|
<a-input
|
|
placeholder="请输入手机号码"
|
|
placeholder="请输入手机号码"
|
|
- v-decorator="['formData.phone', {
|
|
|
|
- initialValue: formData.phone,
|
|
|
|
|
|
+ :maxLength="11"
|
|
|
|
+ v-decorator="['formData.mobile', {
|
|
|
|
+ initialValue: formData.mobile,
|
|
rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]"
|
|
rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]"
|
|
/>
|
|
/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -44,21 +45,21 @@
|
|
</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-radio-group
|
|
|
|
- name="radioGroup"
|
|
|
|
|
|
+
|
|
|
|
+ <a-form-item label="所在网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
|
|
+ <a-select
|
|
|
|
+ placeholder="请选择"
|
|
|
|
+ allowClear
|
|
v-decorator="[
|
|
v-decorator="[
|
|
- 'formData.loginFlag',
|
|
|
|
|
|
+ 'formData.tenantId',
|
|
{
|
|
{
|
|
- initialValue: formData.loginFlag,
|
|
|
|
|
|
+ initialValue: formData.tenantId,
|
|
rules: [{ required: true, message: '请选择状态!' }] },
|
|
rules: [{ required: true, message: '请选择状态!' }] },
|
|
- ]"
|
|
|
|
- >
|
|
|
|
- <a-radio :value="1">是</a-radio>
|
|
|
|
- <a-radio :value="0">否</a-radio>
|
|
|
|
- </a-radio-group>
|
|
|
|
-
|
|
|
|
|
|
+ ]">
|
|
|
|
+ <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
|
+
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
<a-row :gutter="24">
|
|
<a-row :gutter="24">
|
|
@@ -66,9 +67,9 @@
|
|
<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
|
|
v-decorator="[
|
|
v-decorator="[
|
|
- 'formData.roleNames',
|
|
|
|
|
|
+ 'formData.roleIds',
|
|
{
|
|
{
|
|
- initialValue: formData.roleNames,
|
|
|
|
|
|
+ initialValue: formData.roleIds,
|
|
rules: [{ required: true, message: '请选择状态!' }] },
|
|
rules: [{ required: true, message: '请选择状态!' }] },
|
|
]"
|
|
]"
|
|
mode="multiple"
|
|
mode="multiple"
|
|
@@ -85,22 +86,6 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
- <a-row :gutter="24">
|
|
|
|
- <a-col :span="24">
|
|
|
|
- <a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
|
|
|
|
- <a-textarea
|
|
|
|
- v-decorator="[
|
|
|
|
- 'formData.remarks',
|
|
|
|
- {
|
|
|
|
- initialValue: formData.remarks,
|
|
|
|
- rules: [] },
|
|
|
|
- ]"
|
|
|
|
- style="min-height: 50px;"
|
|
|
|
- placeholder=""
|
|
|
|
- autosize />
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- </a-row>
|
|
|
|
<a-form-item :wrapper-col="{ span: 12, offset: 5 }">
|
|
<a-form-item :wrapper-col="{ span: 12, offset: 5 }">
|
|
<a-button type="primary" @click="handleSubmit()">
|
|
<a-button type="primary" @click="handleSubmit()">
|
|
保存
|
|
保存
|
|
@@ -116,7 +101,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import { getRoleList, saveUser } from '@/api/send-coupon-user'
|
|
|
|
|
|
+import { getRoleList, saveUser } from '@/api/send-coupon-user.js'
|
|
export default {
|
|
export default {
|
|
name: 'UserModal',
|
|
name: 'UserModal',
|
|
components: {
|
|
components: {
|
|
@@ -127,6 +112,12 @@ export default {
|
|
type: Boolean,
|
|
type: Boolean,
|
|
default: false
|
|
default: false
|
|
},
|
|
},
|
|
|
|
+ storeOptionData: {
|
|
|
|
+ type: Array,
|
|
|
|
+ default: function () {
|
|
|
|
+ return {}
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: {
|
|
data: {
|
|
type: Object,
|
|
type: Object,
|
|
default: function () {
|
|
default: function () {
|
|
@@ -142,12 +133,11 @@ export default {
|
|
form: this.$form.createForm(this, { name: 'miniForm' }),
|
|
form: this.$form.createForm(this, { name: 'miniForm' }),
|
|
roleList: [],
|
|
roleList: [],
|
|
formData: {
|
|
formData: {
|
|
- roleNames: undefined, // 角色
|
|
|
|
|
|
+ roleIds: undefined, // 角色
|
|
name: '',
|
|
name: '',
|
|
- loginFlag: '', // 活动状态
|
|
|
|
- phone: '',
|
|
|
|
|
|
+ mobile: '',
|
|
sex: '',
|
|
sex: '',
|
|
- remarks: ''
|
|
|
|
|
|
+ tenantId: ''
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -162,7 +152,8 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
this.form.validateFields((err, values) => {
|
|
this.form.validateFields((err, values) => {
|
|
if (!err) {
|
|
if (!err) {
|
|
- values.formData.roleNames = values.formData.roleNames.join(',')
|
|
|
|
|
|
+ console.log(values)
|
|
|
|
+ values.formData.roleIds = values.formData.roleIds.join(',')
|
|
saveUser(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
|
|
saveUser(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
|
|
if (res.status + '' === '200') {
|
|
if (res.status + '' === '200') {
|
|
this.$message.success(res.message ? res.message : '保存成功')
|
|
this.$message.success(res.message ? res.message : '保存成功')
|