From 62612eeae7ed67dc538c2563467d0eacf609ad8a Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 09 Oct 2024 18:25:49 +0800
Subject: [PATCH] 1

---
 src/views/userlist/agentcomponents/addagentdialog.vue |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/views/userlist/agentcomponents/addagentdialog.vue b/src/views/userlist/agentcomponents/addagentdialog.vue
index 63e11ae..01fb7ff 100644
--- a/src/views/userlist/agentcomponents/addagentdialog.vue
+++ b/src/views/userlist/agentcomponents/addagentdialog.vue
@@ -14,7 +14,7 @@
             placeholder="请选择上级代理"
             v-decorator="['parentId', { rules: [{ required: true, message: '请选择上级代理' }] }]"
           >
-           
+
             <a-select-option :value="item.id" v-for="(item, index) in parentIdList" :key="index">{{
               item.agentName
             }}</a-select-option>
@@ -53,14 +53,8 @@
         <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>
@@ -97,14 +91,7 @@
     }
   },
   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) {
@@ -123,7 +110,6 @@
         callback(new Error('请输入6位数字'))
       } else {
         callback()
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
       }
     },
     // 新增用户取消弹窗

--
Gitblit v1.9.3