From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票
---
src/views/userlist/agentcomponents/addagentdialog.vue | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/views/userlist/agentcomponents/addagentdialog.vue b/src/views/userlist/agentcomponents/addagentdialog.vue
index 172a861..63e11ae 100644
--- a/src/views/userlist/agentcomponents/addagentdialog.vue
+++ b/src/views/userlist/agentcomponents/addagentdialog.vue
@@ -14,7 +14,10 @@
placeholder="请选择上级代理"
v-decorator="['parentId', { rules: [{ required: true, message: '请选择上级代理' }] }]"
>
- <a-select-option value="0">总代理</a-select-option>
+
+ <a-select-option :value="item.id" v-for="(item, index) in parentIdList" :key="index">{{
+ item.agentName
+ }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="代理名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -50,7 +53,14 @@
<a-form-item label="代理编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入代理编码"
+<<<<<<< HEAD
v-decorator="['agentCode', { rules: [{ validator: checkSixDigitNumber, message: '请输入六位数字' }] }]"
+=======
+ v-decorator="[
+ 'agentCode',
+ { rules: [{ required: true, validator: checkSixDigitNumber, message: '请输入六位数字' }] },
+ ]"
+>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
/>
</a-form-item>
</a-form>
@@ -58,7 +68,7 @@
</div>
</template>
<script>
-import { agentadd } from '@/api/home'
+import { agentadd, getParensAgent } from '@/api/home'
export default {
components: {},
props: {
@@ -83,15 +93,37 @@
addUserform: this.$form.createForm(this),
addUserdialog: false,
addUserDialogloading: false,
+ parentIdList: [],
}
},
methods: {
+<<<<<<< HEAD
checkSixDigitNumber(rule, value, callback) {
const num = parseInt(value);
if (isNaN(num) || value.length !== 6) {
callback(new Error('请输入6位数字'));
} else {
callback();
+=======
+ initGetParensAgent() {
+ getParensAgent().then((res) => {
+ if (res.status == 0) {
+ this.parentIdList = [{
+ id: 0,
+ agentName: '总代理'
+ },...res.data]
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ checkSixDigitNumber(rule, value, callback) {
+ const num = parseInt(value)
+ if (isNaN(num) || value.length !== 6) {
+ callback(new Error('请输入6位数字'))
+ } else {
+ callback()
+>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
}
},
// 新增用户取消弹窗
@@ -107,6 +139,7 @@
if (!errors) {
this.addUserDialogloading = true
agentadd(values).then((res) => {
+ if(values.parentId == 0) values.parentId = null
if (res.status == 0) {
this.addUserdialog = false
this.$message.success(res.msg)
--
Gitblit v1.9.3