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/economy/index.vue |   81 ++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e363e03..e6ca814 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -104,54 +104,29 @@
 
         </el-upload>
       </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-top"
-          size="mini"
-          :disabled="multiple"
-          @click="handleShare"
-
-        >鍒嗕韩</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-top"
-          size="mini"
-          @click="handleWho"
-        >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-top"
-          size="mini"
-          @click="whoShare"
-        >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-top"
-          size="mini"
-          @click="showData"
-        >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+     <el-dropdown placement="鍒嗕韩鐩稿叧">
+         <el-button size="mini"   type="primary"
+                    plain
+                    icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+          <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>
+     
+             
+     
+            <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+         
     </el-row>
     <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
     <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
-    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" border :data="economyList"  @selection-change="handleSelectionChange"  :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="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
@@ -244,7 +219,7 @@
 
     <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
     <!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <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="type">
           <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
@@ -252,11 +227,13 @@
 
         <el-form-item label="鍙戠敓鏃堕棿" prop="creatTime">
           <el-date-picker v-model="formDat.createTime" 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>
         <el-form-item label="鏀跺叆/鏀嚭" prop="price">
-          <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}"  >
+          <el-select ref="multiSelect" v-model="formDat.price" 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>
@@ -608,10 +585,11 @@
       deptNodeAll: false,
       // 鏃ユ湡鑼冨洿
       dateRange: [],
+	  valueFromParent: '瀹跺涵鏀舵敮鍙拌处',
       // 鏁版嵁鑼冨洿閫夐」
   // 鏁版嵁鑼冨洿閫夐」
   fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
-    '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+    '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
 
       fileList:[
       ],
@@ -722,6 +700,13 @@
 
   },
   methods: {
+	  handleDialogClick()
+	  {
+	  	// 鍏抽棴鏃ユ湡閫夋嫨鍣�
+		               this.$refs.multiSelect.blur()
+
+	  	      this.$refs.datePicker.handleClose();
+	  },
     // 鍒嗛〉
     fenYe(){
       // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'

--
Gitblit v1.9.1