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 | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/views/userlist/agentcomponents/addagentdialog.vue b/src/views/userlist/agentcomponents/addagentdialog.vue
index 80350c7..63e11ae 100644
--- a/src/views/userlist/agentcomponents/addagentdialog.vue
+++ b/src/views/userlist/agentcomponents/addagentdialog.vue
@@ -53,10 +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>
@@ -93,6 +97,14 @@
}
},
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) {
@@ -111,6 +123,7 @@
callback(new Error('请输入6位数字'))
} else {
callback()
+>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
}
},
// 新增用户取消弹窗
--
Gitblit v1.9.3