From b15d6923c609e80712a553388da48e6373aa086c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 二月 2024 18:57:16 +0800
Subject: [PATCH] 修改了代码

---
 ruoyi-ui/src/views/pet/index.vue |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 5366a81..4f97874 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -95,9 +95,10 @@
     <el-table v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
       <el-table-column type="selection" width="55"  align="center" />
 
-      <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+      <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+      <el-table-column label="绉嶇被" prop="animal" sortable :show-overflow-tooltip="true" width="150" />
 
-      <el-table-column label="绫诲瀷" prop="type" sortable :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="鍝佺" prop="type" sortable :show-overflow-tooltip="true" width="150" />
       <el-table-column label="鍚嶅瓧" prop="name" sortable :show-overflow-tooltip="true" width="150" />
       <el-table-column label="鎬у埆" prop="sex" sortable width="120" >
         <template slot-scope="scope">
@@ -114,12 +115,14 @@
       </el-table-column>
       <el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
       <el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" />
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <div class="button-container">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+                :disabled="!scope.row.ownData"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['familymodel:property:info']"
           >淇敼</el-button>
@@ -127,13 +130,14 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+                :disabled="!scope.row.ownData"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
           </el-dropdown>
-
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -159,6 +163,9 @@
         <el-form-item label="闃蹭吉璇�" prop="securityCode">
           <el-input v-model="formDat.securityCode" placeholder="璇疯緭鍏ラ槻浼瘉" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
+        <el-form-item label="绉嶇被" prop="animal">
+          <el-input v-model="formDat.animal" placeholder="璇疯緭鍏ョ绫�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
         <el-form-item label="鍝佺" prop="type">
           <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ搧绉�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
@@ -166,11 +173,9 @@
           <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕瀛�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
         <el-form-item label="鍑虹敓鏃ユ湡" prop="birth">
-          <el-input
-            v-model='formDat.birth'
-            type='date'
-            placeholder='閫夋嫨鏃ユ湡'
-          ></el-input>
+          <el-date-picker v-model="formDat.birth" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="鎬у埆" prop="sex">
           <el-select v-model="formDat.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}"  >
@@ -348,8 +353,6 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
-
-      petList: [],
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -363,18 +366,17 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
-      fot:[".jpg",".jif"],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+      
       fileList1:[ ],
       fileList2:[ ],
       fileListOther:[ ],
       dsb:true,
       btn:false,
       formDat: {
-        type: undefined,
-        name: undefined,
-        sex: undefined,
-        color: undefined,
-        address: undefined,
+        animal:undefined,
         remark: undefined,
         url: undefined,
         type: undefined,
@@ -439,9 +441,9 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
-        type: [{
+        animal: [{
           required: true,
-          message: '璇疯緭鍏ュ搧绉�',
+          message: '璇疯緭鍏ョ绫�',
           trigger: 'blue'
         }],
         idNum: [{
@@ -598,17 +600,17 @@
     },
 
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
+      for(let i = 0; i < this.fileList1.length; i++)
       {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
+        if(this.fileList1[i].url==file.url)
+          this.$delete(this.fileList1,i);
       }
     },
     handleRemoveFile(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
+      for(let i = 0; i < this.fileList2.length; i++)
       {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
+        if(this.fileList2[i].url==file.url)
+          this.$delete(this.fileList2,i);
       }
     },
     // 鍙栨秷鎸夐挳
@@ -795,4 +797,10 @@
   color: #999;
   border: 1px dashed #999;
 }
+.el-table__cell {
+  font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+  display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
 </style>

--
Gitblit v1.9.1