From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容

---
 ruoyi-ui/src/views/economy/index.vue |  782 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 667 insertions(+), 115 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index ba82feb..1a9030f 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -5,8 +5,11 @@
       <el-form-item label="鏃堕棿"  prop="createTime">
         <el-date-picker
           v-model="dateRange"
-          style="width: 240px;"
-          value-format="yyyy-MM-dd HH-MM"
+          style="width: 240px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -18,7 +21,10 @@
           v-model="queryParams.usePeople"
           placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -29,7 +35,10 @@
           v-model="queryParams.useFor"
           placeholder="璇疯緭鍏ョ敤閫�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -39,7 +48,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="userId != 2">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -91,19 +100,37 @@
         >
           <el-button size="mini"   type="primary"
                      plain
-                     icon="el-icon-plus" >瀵煎叆</el-button>
+                     icon="el-icon-top" >瀵煎叆</el-button>
 
         </el-upload>
       </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-click="handleCheck" :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="120"/>
+      <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
-      <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="100" align="center">
+      <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="150" align="center">
         <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
       <el-table-column label="鍙拌处" prop="type" sortable width="100" />
@@ -117,50 +144,66 @@
       <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" >
         <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-
+      <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+        <template slot-scope="scope">{{scope.row.ownData === 1 ? '鏄�': '鍚�'}}</template>
+      </el-table-column>
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable  width="110" >
         <template slot-scope="scope" >
-          <img
-            class="el-upload-list__item-thumbnail"
-            src="../../assets/images/deviceLis.png"
-            alt=""
-            style="width: 35px; height: 35px;"
-            fit="cover"
-            v-if="scope.row.url !== ','"
-          >
-          <img
-            class="el-upload-list__item-thumbnail"
-            src="../../assets/images/deviceA.png"
-            alt=""
-            style="width: 35px; height: 35px;"
-            fit="cover"
-            v-if="scope.row.url === ','"
-          >
+          <div >
+            <img
+              class="el-upload-list__item-thumbnail"
+              src="../../assets/images/deviceLis.png"
+              alt=""
+              style="width: 35px; height: 35px;"
+              fit="cover"
+              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+            >
+            <img
+              v-else
+              class="el-upload-list__item-thumbnail"
+              src="../../assets/images/deviceA.png"
+              alt=""
+              style="width: 35px; height: 35px;"
+              fit="cover"
+
+            ></div>
         </template>
       </el-table-column>
       <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
         <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" 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
             size="mini"
             type="text"
             icon="el-icon-edit"
+                :disabled="!scope.row.ownData"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['familymodel:economy:info']"
           >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
-          >鍒犻櫎</el-button>
+  <el-button
+    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:economy:info']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
 
           </el-dropdown>
+
+          <el-button
+             size="mini"
+              type="text"
+             icon="el-icon-d-arrow-right"
+              @click="handleShare(scope.row)">
+            <span style="font-size: 14px;">鍒嗕韩</span></el-button>
+
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -176,27 +219,27 @@
 
     <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
     <!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
-    <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>
         </el-form-item>
 
-        <el-form-item label="鏃堕棿" prop="happenTime">
-          <el-date-picker
-            v-model='formDat.happenTime'
-            type='date'
-            placeholder='閫夋嫨鏃ユ湡'
+        <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>
         </el-form-item>
         <el-form-item label="閲戦" prop="balance">
-          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+          <el-input v-model.number="formDat.balance" type="number" placeholder="璇疯緭鍏ラ噾棰�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="鐢ㄩ��" prop="useFor">
@@ -224,6 +267,9 @@
           multiple
           :http-request="requestUpload"
           :file-list="fileList"
+          :on-change="handleChange"
+          :auto-upload="false"
+          	ref="upload"
         >
           <i slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
@@ -255,6 +301,13 @@
 
           </div>
         </el-upload>
+		<el-button
+		         style="margin-left: 10px"
+		         size="small"
+		         type="success"
+
+		         @click="picUpload"
+		       >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -262,17 +315,61 @@
           class="upload-demo"
           multiple
 
-          :on-remove="handleRemove"
-          :http-request="requestUpload"
+          :on-remove="handleRemoveFile"
           :show-file-list="true"
-        >
-          <el-button type="primary">涓婁紶</el-button>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
-        </el-upload>
 
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
+		    :http-request="requestUpload1"
+        >
+
+        <i slot="default" class="el-icon-plus"></i>
+                <div slot="file" slot-scope="{file}">
+                  <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+                  <video
+                    v-if="file.url.includes('.mp4')"
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url"
+                    style="width: 147px; height: 147px"
+                    fit="cover"
+                  ></video>
+                  <img v-else
+                       class="el-upload-list__item-thumbnail"
+                       src="../../assets/images/deviceLis.png"
+                       alt=""
+                       style="width: 100%; height: 100%"
+                       fit="cover"></img>
+
+                  <span class="el-upload-list__item-actions">
+                       <span class="el-upload-list__item-name">{{ file.name }}</span>
+                            <span
+                              class="el-upload-list__item-preview"
+                              @click="handleFileCardPreview(file)"
+                            >
+                              <i class="el-icon-zoom-in"></i>
+                            </span>A
+
+                            <span
+
+                              class="el-upload-list__item-delete"
+                              @click="handleRemoveFile(file)"
+                            >
+                              <i class="el-icon-delete"></i>
+                            </span>
+                      </span>
+
+                </div>
+
+
+        </el-upload>
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -287,23 +384,181 @@
 
     </el-dialog>
 
+    <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+            <template slot-scope="scope" >
+              <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+              <span v-else>鈥斺��</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+        </el-table>
+
+                <div slot="footer" class="dialog-footer">
+                  <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+                </div>
+
+    </el-dialog>
+
+    <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+    <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+      <div>
+      <el-select v-if="ifNum == 1"
+                v-model="user" id="userSelect"
+                placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+                 style="width: 240px;
+                 height: 35px;
+                 border-radius: 16px 16px 16px 16px;
+                 margin-bottom: 5px;
+                 opacity: 0.5;" filterable allow-create
+                 @change="selectValue">
+        <el-option v-for="item in userOptions"
+          :key="item.value" :label="item.label" :value="item.value"/>
+      </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-column type="selection" :reserve-selection="true" width="55"  align="center" /> -->
+            <!-- <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
+            <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="150" align="center">
+              <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="鍙拌处" prop="type" sortable width="100" />
+            <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
+
+            </el-table-column>
+            <el-table-column label="閲戦" prop="balance" sortable width="100" />
+            <el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
+
+            <el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
+            <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" >
+              <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+              <template slot-scope="scope">{{scope.row.ownData === 1 ? '鏄�': '鍚�'}}</template>
+            </el-table-column>
+              <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+                   <template slot-scope="scope" >
+                     <div>
+                       <img
+                         class="el-upload-list__item-thumbnail"
+                         src="../../assets/images/deviceLis.png"
+                         alt=""
+                         style="width: 35px; height: 35px;"
+                         fit="cover"
+                         v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+                       >
+                       <img
+                         v-else
+                         class="el-upload-list__item-thumbnail"
+                         src="../../assets/images/deviceA.png"
+                         alt=""
+                         style="width: 35px; height: 35px;"
+                         fit="cover"
+
+                       ></div>
+                   </template>
+                </el-table-column>
+
+            <el-table-column label="鎿嶄綔" align="center" width="250" 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
+                  v-if="ifNum == 2"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-d-arrow-right"
+                  @click="handleDown(scope.row)">
+                  <span style="font-size: 14px;">涓嬭浇</span></el-button>
+                  <el-button
+                    v-if="ifNum == 1"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-d-arrow-right"
+                    @click="handleBack(scope.row)">
+                    <span style="font-size: 14px;">鏀跺洖</span></el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-d-arrow-right"
+                  @click="handleCheck(scope.row)">
+                  <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total1>0"
+            :total="total1"
+            :page.sync="queryParams2.pageNo"
+            :limit.sync="queryParams2.pageSize"
+            @pagination='fenYe'
+            style="background: #FEF7FC;"
+          />
+
+    </el-dialog>
+
   </div>
 </template>
 
 <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 {getAllInfo} from "@/api/system/user"
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {listEconomy,enload,getEconomyInfo,delEconomy, addEconomy, uploadPic} from "@/api/economy/index";
-
+import {listEconomy,enload,delEconomy, addEconomy, uploadPic,
+        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/economy/index";
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import {listUserAll} from "@/api/root/index";
+import {showShareUser} from "@/api/bignote/index";
 export default {
-  name: "Role",
+  name: "ZfEconomy",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      // 鍒嗕韩缁欒皝鐨刲ist
+	  total1:0,
+      listRoot: [],
+      open1:false,
+      open2:false,
+      id1: undefined,
+      shareList1: [],
+      // shareList2: [],
+      userOptions:[],
+      user:undefined,
+      userList:[],
+      ifNum:undefined,
+      selectWho:undefined,
+      title1: "",
+      title2: "",
+      loading1: false,
+      loading2: false,
+      // 鏌ヨ鍙傛暟1
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryParams2: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      ids1: [],
+      single1: true,
+      multiple1: true,
+      dateRange1: [],
+
+
+      userId: undefined,
       // 閬僵灞�
       disabled: false,
       loading: true,
@@ -332,15 +587,21 @@
       deptNodeAll: false,
       // 鏃ユ湡鑼冨洿
       dateRange: [],
+	  valueFromParent: '瀹跺涵鏀舵敮鍙拌处',
       // 鏁版嵁鑼冨洿閫夐」
-      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','.m4a','.M4A'],
+
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+	  fileList1:[],
+ 	  uploadFileList: [],
+ 	  uploadFileList1: [],
+	  fileListOther:[],
       dsb:true,
       btn:false,
+      uploading: false,
       formDat: {
         type: undefined,
         createTime: undefined,
@@ -348,7 +609,7 @@
         usePeople: undefined,
         kind:undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -361,7 +622,8 @@
         type:undefined,
         useFor:undefined,
         usePeople:undefined,
-        createTime:undefined,
+
+        createTime:undefined
 
       },
       // 琛ㄥ崟鍙傛暟
@@ -432,11 +694,215 @@
     };
   },
   created() {
+        this.getList1();
     this.getList();
     this.getCateInfor()
+    this.getInfo()
+
 
   },
   methods: {
+	  handleDialogClick()
+	  {
+	  	// 鍏抽棴鏃ユ湡閫夋嫨鍣�
+		               this.$refs.multiSelect.blur()
+
+	  	      this.$refs.datePicker.handleClose();
+	  },
+    // 鍒嗛〉
+    fenYe(){
+      // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+      if(this.ifNum === 1){
+        this.selectValue(this.selectWho)
+      }else if(this.ifNum === 2){
+        this.whoShare()
+      }else{
+        this.showData()
+      }
+    },
+    // 鍏抽棴寮圭獥鍚�
+    handleClose(){
+      this.user = ''
+      this.queryParams2.pageNo = 1
+            this.total1 = 0
+    },
+    handleClose2(){
+      this.$refs.table1.clearSelection()
+    },
+
+    // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+    handleDown(row){
+      const a = {"downloadContent" : row.id}
+      downShareData(a).then(() => {
+        Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+      })
+    },
+
+    // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+    handleBack(row){
+      // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+      deleteShareData(list).then(()=>{
+        Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+        const list2 = {"shareIds": [this.selectWho]}
+        shareToWho(list2,this.queryParams2).then(response => {
+          this.shareList1 = response.data.data
+          this.total1 = response.data.total;
+        })
+      })
+    },
+    // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+    showData(){
+      this.shareList1 = []
+      this.ifNum = 3
+      this.open2 = true
+      this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+      showShareData(this.queryParams2).then(response => {
+        this.shareList1 = response.data.data
+        this.total1 = response.data.total;
+        // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+      })
+    },
+    // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+    whoShare(){
+      this.shareList1 = []
+      this.ifNum = 2
+      this.open2 = true
+      this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+      // const list = {"shareId": this.userList}
+      // const list = {"shareId": 111}
+      getWhoShare(this.queryParams2).then(response => {
+        const data = response.data.data
+        this.total1 = response.data.total
+        console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+        for(let i in data){
+          console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+          this.shareList1.push(data[i])
+        }
+      })
+    },
+
+    // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+    selectValue(value){
+      this.selectWho = value
+      this.shareList1 = []
+      const list = {"shareIds": [this.selectWho]}
+      shareToWho(list,this.queryParams2).then(response => {
+        // this.loading2 = true;
+        response.data.data.forEach(res=>{
+          if(res){
+            this.shareList1.push(res)
+          }
+        })
+        // this.shareList1 = response.data.data
+        this.total1 = response.data.total;
+        // this.loading2 = false;
+        console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+      })
+    },
+    handleWho(){
+      this.ifNum = 1
+      this.open2 = true
+      this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+      this.shareList1 = []
+    },
+
+    /** 鍒嗕韩鎿嶄綔 */
+    handleShare(row) {
+      if(row.id){
+        this.id1 = [row.id]
+      }
+      this.open1 = true;
+      this.title1 = "鍒嗕韩";
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange1(selection) {
+      this.ids1 = selection.map(item => item.userId)
+      this.single1 = selection.length!=1
+      this.multiple1 = !selection.length
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange2(selection) {
+      // this.ids1 = selection.map(item => item.userId)
+      // // console.log(selection)
+      // console.log(this.ids1,'ids1ids1ids1ids1')
+      // this.single1 = selection.length!=1
+      // this.multiple1 = !selection.length
+    },
+    getRowId1(row)
+    {
+      return row.id
+    },
+    getRowId2(row)
+    {
+      return row.id
+    },
+    getList1() {
+          this.loading1 = true;
+       let userId = this.$store.state.user.userId
+	   
+	   this.userOptions = []
+        showShareUser(userId, 2023).then(response=>{
+        			  console.log("===========ddddddddddddd")
+        			  console.log(response.data)
+        			  console.log("--------------------")
+        			  response.data.forEach(element =>{
+        				   this.userOptions.push({label: element.oldName,value: element.userId})
+        			  })
+       })
+	   
+	   let clanId = this.$store.state.user.clanId
+	   
+	    getAllInfo(clanId).then(response => {
+	        this.listRoot = response.data;
+	        const kon = {}
+	   			         console.log(response.data,'userListuserListuserList99999999999999')
+	        this.listRoot.forEach(element => {
+	          kon[element['nickName']] = element['userId']
+	        })
+	        // for(let i in kon){
+	        //   this.userOptions.push({label: i,value: kon[i]})
+	        // }
+	        // for(let i in this.userOptions){
+	        //   this.userList.push(this.userOptions[i].value)
+	        // }
+	        // console.log(this.userList,'userListuserListuserList99999999999999')
+	        this.loading1 = false;
+	      }
+	    );
+        },
+    // 纭鍒嗕韩
+    subShare(row) {
+      const shareList = {}
+      shareList.shareContents = this.id1 || this.ids;
+      shareList.shareIds = this.ids1
+	  if(shareList.shareIds.length==0)
+	  {
+	  		  this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+	  		  return;
+	  }
+      console.log(shareList,'sharelistsharelist')
+      this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+        return share(shareList);
+      }).then(() => {
+
+        this.getList();
+		this.getList1();
+        this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+        this.id1 = undefined
+        this.open1 = false;
+      }).catch(() => {});
+    },
+    // ------------------------------------------------------------------
+
+    getInfo(){
+          console.log('-----------------')
+          getInfo().then(response=>{
+            console.log(response.user.roles[0].roleId,'roleID')
+            this.userId = response.user.roles[0].roleId
+          })
+        },
 
     //鍩洪噾/鍙拌处鐨勯�夋嫨
     getSrc1(type) {
@@ -483,7 +949,7 @@
 
       listEconomy(this.queryParams).then(response => {
           //  alert(123)
-          //   console.log(response.data)
+        //    console.log(response.data.data)
           this.economyList = response.data.data;
 
           this.total = response.data.total;
@@ -492,21 +958,36 @@
       );
     },
     handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+        {
+          this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
+      }
+    },
+    handleRemoveFile(file) {
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+        {
+
           this.$delete(this.fileListOther,i);
+          this.$delete(this.uploadFileList1,i);
+
+          }
       }
     },
     getCateInfor()
     {
       let _this = this
-      getCategory().then(response=>{
+      // getCategory().then(response=>{
 
-        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-        })
-      })
+      //   response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+      //     _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+      //   })
+      // })
     },
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -539,7 +1020,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
@@ -570,7 +1051,9 @@
 
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
+     // alert(123)
       const id = row.id;
+	  this.open2 = false; 
       this.$router.push("/familymodel/economy/economyInfo/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
@@ -594,13 +1077,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formDat.url = ul+","+uls
+
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -611,29 +1088,99 @@
           });
         }
       });
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+      Object.keys(this.formDat).forEach(key => {
+        this.formDat[key] = '';
+      });
+      for(let i = 0; i <= this.fileList.length; i++)
+      {
+        this.handleRemove(this.fileList[0]);
+      }
+      for(let i = 0; i < this.fileListOther.length; i++){
+        this.handleRemoveFile(this.fileListOther[0]);
+      }
     },
-    requestUpload(params)
+	handleChange(file, fileList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	//alert(file)
+	    this.uploadFileList.push(file.raw);
+	     this.fileList.push({name:file.name,url:file.url})
+	//alert(fileList1.length)
+	},
+	handleChange1(file, fileOtherList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	this.uploadFileList1.push(file.raw);
+	 this.fileListOther.push({name:file.name,url:file.url})
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  //console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	},
+	fileUpload(){
+	//	var file = params.file;
+
+		var formData = new FormData();
+		this.$refs.upload1.submit();
+		// formData.append('uploadFile', file);
+		if(this.uploadFileList1.length==0){
+			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+			  return
+		}
+		this.uploadFileList1.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+
+		let _this = this
+
+		this.uploading = true;
+		uploadPic(formData).then(response => {
+		_this.uploadFileList1 = []
+		_this.formDat.url = _this.formDat.url+","+response.fileNames
+		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+		  })
+
+	},
+	picUpload()
+	{
+		var formData = new FormData();
+		//alert(976)
+		//this.$refs.upload.submit();
+		//alert(8)
+		//alert(this.uploadFileList.length)
+	if(this.uploadFileList.length==0){
+		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+		  return}
+	//console.log(this.uploadFileList)
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+		//alert(90)
+		let _this = this
+		//alert(9)
+	    uploadPic(formData).then(response => {
+		//	alert("dds")
+	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+		  _this.uploadFileList = []
+		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+	  });
+	},
+    requestUpload(params) {
+//alert(98)
+ //    this.uploadFileList.push(params.file);
+    },
+    requestUpload1(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-
+		//     this.uploadFileList1.push(params.file);
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
@@ -647,28 +1194,27 @@
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      this.download('/zfEconomy/export', {
+      this.download('/zfEconomy/model', {
         ...this.queryParams
       }, `zfEconomy_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 瀵煎叆鎿嶄綔*/
+    handleEnport(params){
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('excelImport', file);
+      let _this = this
+
+      enload(formData).then(response => {
+        _this.getList();
+        Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+      }).catch(err)
+      {
+        Message({ message: "瀵煎叆澶辫触", type: 'error' })
+      }
+    },
   },
-  /** 瀵煎叆鎿嶄綔*/
-  handleEnport(params){
-    var file = params.file;
-    var formData = new FormData();
-    formData.append('excelImport', file);
-    let _this = this
-    alert(file)
-    enload(formData).then(response => {
-      _this.getList();
-      Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
 
-    }).catch(err)
-    {
-      Message({ message: "瀵煎叆澶辫触", type: 'error' })
-    }
-
-  }
 
 };
 </script>
@@ -682,4 +1228,10 @@
   background: #FFEFF2;
 
 }
+.el-table__cell {
+  font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+  display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
 </style>

--
Gitblit v1.9.1