From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/pet/index.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 9329289..2dcfda0 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -174,9 +174,8 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">榄呭疇淇℃伅</h2>
-
+    <el-dialog :title="title"  @click.native="handleDialogClick"  :visible.sync="open" width="800px" append-to-body>
+   
       <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
         <el-form-item label="璇佷欢鍙风爜" prop="idNum">
@@ -196,6 +195,8 @@
         </el-form-item>
         <el-form-item label="鍑虹敓鏃ユ湡" prop="birth">
           <el-date-picker v-model="formDat.birth" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+		  @click.native.stop
+		  				      ref="datePicker"
                           :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
@@ -735,6 +736,11 @@
     this.getInfo()
   },
   methods: {
+	  handleDialogClick()
+	  {
+	  	// 鍏抽棴鏃ユ湡閫夋嫨鍣�
+	  	      this.$refs.datePicker.handleClose();
+	  },
     // 鍒嗛〉
     fenYe(){
       // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'

--
Gitblit v1.9.1