From f72cc2c5bc9ea4df7819cf53e3b872024e0583a1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 31 八月 2024 10:54:27 +0800
Subject: [PATCH] 修改家庭医生上传

---
 ruoyi-ui/src/views/selfeconomy/index.vue |   84 ++++++++++++++++++++++++-----------------
 1 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index f33fb95..5ac7589 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -139,23 +139,23 @@
              <template #dropdown>
                <el-dropdown-menu>
                  <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
-             
+
         		          <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
         		      <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
                  <el-dropdown-item    icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
                </el-dropdown-menu>
              </template>
-           </el-dropdown>
-        
-                
-        
+        </el-dropdown>
+
+
+
                <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-            
+
         </el-row>
       </div>
 
-      <el-table v-loading="loading" border :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
-        <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
+      <el-table v-loading="loading" border :data="selfeconomyList" :row-key="getRowId1" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+        <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
         <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
         <el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center">
           <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
@@ -208,10 +208,10 @@
               ></div>
           </template>
         </el-table-column>
-        <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+        <el-table-column label="澶囨敞" prop="remark" sortable align="center">
           <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
-        <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+        <el-table-column label="鎿嶄綔" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
           <template slot-scope="scope" v-if="scope.row.roleId !== 1">
             <div class="button-container">
             <el-button
@@ -262,13 +262,15 @@
       />
 
       <!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
-      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body    @click.native="handleDialogClick">
         <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
           <!--        <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
           <!--          <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
           <!--        </el-form-item>-->
           <el-form-item label="鏃堕棿" prop="happenTime">
             <el-date-picker v-model="formDat.happenTime" 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>
@@ -293,7 +295,7 @@
             </el-input>
           </el-form-item>
           <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
-            <el-select v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}"  >
+            <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}"  >
               <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
               ></el-option>
             </el-select>
@@ -303,7 +305,7 @@
             </el-input>
           </el-form-item>
           <el-form-item label="鏄惁娉ㄩ攢" prop="status">
-            <el-select v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}"  >
+            <el-select ref="multiSelect1" v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}"  >
               <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
               ></el-option>
             </el-select>
@@ -335,10 +337,9 @@
                 :preview-src-list="[file.url]"
               >
               <span class="el-upload-list__item-actions">
-          <span
-            class="el-upload-list__item-preview"
-            @click="handlePictureCardPreview(file)"
-          >
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)">
             <i class="el-icon-zoom-in"></i>
           </span>
 
@@ -446,7 +447,7 @@
       <!-- 鍒嗕韩瀵硅瘽妗�1 -->
       <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
 
-      <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
             <el-table-column type="selection" width="55"  align="center" />
             <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
             <el-table-column label="韬唤" prop="identity" sortable width="130" >
@@ -481,7 +482,7 @@
         </el-select>
               </div>
 
-        <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+        <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
                 <el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center">
                   <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
                 </el-table-column>
@@ -580,15 +581,15 @@
   <script>
   import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
   import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-import {getInfo} from "@/api/login";
+  import {getInfo} from "@/api/login";
 
 
   //瀵煎叆鎺ュ彛鍑芥暟
   import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
           share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
   } from "@/api/selfeconomy/index";
-import {listUserAll} from "@/api/root/index";
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+  import {listUserAll} from "@/api/root/index";
+  import { Notification, MessageBox, Message, Loading } from 'element-ui'
 
 
   export default {
@@ -596,6 +597,8 @@
     dicts: ['sys_normal_disable'],
     data() {
       return {
+		  selfeconomyList:[],
+		  total1: 0,
         // 鍒嗕韩缁欒皝鐨刲ist
         listRoot: [],
         open1:false,
@@ -626,6 +629,7 @@
         multiple1: true,
         dateRange1: [],
 
+        selfeconomyList: [],
 
         userId: undefined,
         // 閬僵灞�
@@ -643,6 +647,7 @@
         showSearch: true,
         // 鎬绘潯鏁�
         total: 0,
+        total1: 0,
         // 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
         wishList: [],
         // 寮瑰嚭灞傛爣棰�
@@ -790,15 +795,24 @@
       };
     },
     created() {
-      this.getList1()
+      this.getList1();
       this.getList();
-      this.getCateInfor()
-      this.getInfo()
+
+      //this.getCateInfor();
+      this.getInfo();
+
       // for (let i = 0; i < this.contactList.length; i++) {
       //   this.formDat[i] = this.contactList[i];
       // }
     },
     methods: {
+		handleDialogClick()
+		{
+			// 鍏抽棴鏃ユ湡閫夋嫨鍣�
+			this.$refs.multiSelect.blur()
+			this.$refs.multiSelect1.blur()
+			      this.$refs.datePicker.handleClose();
+		},
       // 鍒嗛〉
       fenYe(){
         // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -920,14 +934,6 @@
         // this.single1 = selection.length!=1
         // this.multiple1 = !selection.length
       },
-      getRowId1(row)
-      {
-        return row.id
-      },
-      getRowId2(row)
-      {
-        return row.id
-      },
       getList1() {
             this.loading1 = true;
             this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
@@ -988,7 +994,15 @@
         this.open = false;
         this.reset();
       },
-      getRowId(row)
+      getRowId1(row)
+      {
+        return row.id
+      },
+      getRowId2(row)
+      {
+        return row.id
+      },
+      getRowId3(row)
       {
         return row.id
       },
@@ -1101,7 +1115,7 @@
 
       /** 鏂板鎸夐挳鎿嶄綔 */
       handleAdd() {
-        this.reset();
+    //    this.reset();
         this.open = true;
         this.title = "鏂板涓汉璐骇璇︾粏淇℃伅";
       },

--
Gitblit v1.9.1