From b767cea8ee6bf2e782c7727ad9ccfd1d69b4f8cb Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 08 七月 2025 13:55:58 +0800
Subject: [PATCH] qx

---
 src/views/system/tijian/index.vue |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index fc87b65..b290a15 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -146,6 +146,7 @@
                   },
                   trigger: 'blur',
                 },
+<<<<<<< HEAD
               ]">
                 <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
                   璇佷欢鍙风爜
@@ -153,6 +154,17 @@
                 <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
                   @input="handleIdCardInput" />
                 <!-- <i style="
+=======
+                trigger: 'blur',
+              },
+            ]">
+              <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
+                璇佷欢鍙风爜
+              </span>
+              <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                @input="handleIdCardInput" maxlength="18"/>
+              <!-- <i style="
+>>>>>>> 0c23ed71897641b9ee66d81082cbc999e0c5f0ae
                     font-size: 1rem;
                     position: absolute;
                     right: -20px;

--
Gitblit v1.8.0