From 90b6b8c9e342d07e8a7121d732900287d997a8b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/selfeconomy/index.vue | 793 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 670 insertions(+), 123 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 0f62a88..66cd28a 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -1,33 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="type incomeName timeLimit happenTime " >
- <el-input
- v-model:type="queryParams.type"
- v-model:incomeName="queryParams.incomeName"
- v-model:timeLimit="queryParams.timeLimit"
- v-model:happenTime="queryParams.happenTime"
-
- placeholder="鍦ㄢ�滆储浜р�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
-
-
-
- </el-form-item>
-
+ <el-row>
<el-form-item label="鏃ユ湡" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
- height: 30px;
- background: #FFFFFF;
- border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -41,35 +22,45 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ヨ储浜х被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
- <el-form-item label="鑾峰緱鏂瑰紡" prop="incomeName" >
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName" >
<el-input
v-model="queryParams.incomeName"
- placeholder="璇疯緭鍏ヨ幏寰楁柟寮�"
+ placeholder="璇疯緭鍏ヨ储浜у悕绉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
- <el-form-item label="鏈熼檺" prop="timeLimit">
- <el-input
- v-model="queryParams.timeLimit"
- placeholder="璇疯緭鍏ユ湡闄�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
- <el-cntainer>
- <el-col :span="9" >
+
+ <el-form-item label="鏈熼檺" prop="timeLimit">
+ <el-input
+ v-model="queryParams.timeLimit"
+ placeholder="璇疯緭鍏ユ湡闄�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+
+ <el-col >
<el-form-item>
<el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
@@ -77,11 +68,13 @@
border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
</el-form-item>
</el-col>
- </el-cntainer>
+ </el-row>
+
</el-form>
+
<div>
- <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"
@@ -124,7 +117,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -135,14 +128,34 @@
>
<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>
</div>
- <el-table v-loading="loading" :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>
@@ -150,7 +163,7 @@
<el-table-column label="璐骇绫诲埆" prop="type" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鑾峰緱鏂瑰紡" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <el-table-column label="璐骇鍚嶇О" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浠峰�硷紙閲戦锛�" prop="price" sortable width="140" align="center" >
@@ -159,7 +172,7 @@
<el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -195,11 +208,12 @@
></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" class-name="small-padding fixed-width" >
+ <el-table-column fixed="right" 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
size="mini"
type="text"
@@ -227,6 +241,13 @@
>鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 1em;">鍒嗕韩</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -241,20 +262,24 @@
/>
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+ <el-dialog :title="title" :visible.sync="open" width="840px" append-to-body @click.native="handleDialogClick">
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="120px">
<!-- <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-input v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-input>
+ <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>
<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="incomeName">
- <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ヨ幏寰楁柟寮�" clearable :style="{width: '100%'}" >
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName">
+ <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ヨ储浜у悕绉�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="閲戦" prop="price">
@@ -269,16 +294,18 @@
<el-input v-model="formDat.propertyRight" placeholder="璇疯緭鍏ヤ骇鏉�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
- <el-input v-model="formDat.isChange" placeholder="璇疯緭鍏ュ彉鏇�/娉ㄩ攢" clearable :style="{width: '100%'}" >
- </el-input>
+ <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange">
+ <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>
</el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input v-model="formDat.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" >
</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>
@@ -293,11 +320,13 @@
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
- :file-list="fileList"
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
- <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -308,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>
@@ -327,6 +355,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=""
@@ -335,18 +370,68 @@
multiple
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
- :show-file-list="true"
+
+
+
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
+ :http-request="requestUpload1"
+ :show-file-list="true"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
+
+ <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>
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
</el-upload>
</el-form>
- <h4 class="form-header"> </h4>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ </el-form>
+ <h4 class="form-header"> </h4>
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
@@ -359,25 +444,195 @@
</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="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" >
+ <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="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>
+ <el-table-column label="璐骇绫诲埆" prop="type" sortable width="120" align="center">
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="璐骇鍚嶇О" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浠峰�硷紙閲戦锛�" prop="price" sortable width="140" align="center" >
+ <template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
+ <template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
+ <template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
+ <template slot-scope="scope">{{scope.row.propertyRight? scope.row.propertyRight: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="110" align="center">
+ <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁娉ㄩ攢" prop="status" sortable width="100" align="center">
+ <template slot-scope="scope">{{scope.row.status===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="澶囨敞" prop="remark" sortable width="90" 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">
+ <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"
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
- import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
- import {Message} from "element-ui";
+ 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'
export default {
- name: "index",
+ name: "ZProperty",
dicts: ['sys_normal_disable'],
data() {
return {
+ selfeconomyList:[],
+ total1: 0,
+ // 鍒嗕韩缁欒皝鐨刲ist
+ 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: [],
+
+ selfeconomyList: [],
+
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -393,10 +648,12 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
wishList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
+ valueFromParent: "璐骇",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
@@ -408,12 +665,16 @@
// 鏃ユ湡鑼冨洿
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','.m4a','.M4A'],
+
fileList:[
],
- fileListOther:[
-
- ],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -431,7 +692,7 @@
propertyRight:undefined,
location:undefined,
remark:undefined,
- url: undefined,
+ url: "",
},
// 鑿滃崟鍒楄〃
@@ -476,7 +737,7 @@
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
@@ -486,7 +747,7 @@
}],
incomeName: [{
required: true,
- message: '璇疯緭鍏ヨ幏寰楁柟寮�',
+ message: '璇疯緭鍏ヨ储浜у悕绉�',
trigger: 'blur'
}],
timeLimit: [{
@@ -519,16 +780,225 @@
value: '0',
label: '鍚�',
}],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ },
+ {
+ value: '璐拱',
+ label: '璐拱',
+ },
+ ],
};
},
created() {
+ this.getList1();
this.getList();
- this.getCateInfor()
+
+ //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)'
+ 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
+ },
+ getList1() {
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2026).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
+ 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
+ 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(status) {
// if (status === 1) {
@@ -543,7 +1013,15 @@
this.open = false;
this.reset();
},
- getRowId(row)
+ getRowId1(row)
+ {
+ return row.id
+ },
+ getRowId2(row)
+ {
+ return row.id
+ },
+ getRowId3(row)
{
return row.id
},
@@ -578,14 +1056,20 @@
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);
+ }
}
},
// 鍙栨秷鎸夐挳
@@ -619,7 +1103,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -650,15 +1134,15 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
+ // this.reset();
this.open = true;
this.title = "鏂板涓汉璐骇璇︾粏淇℃伅";
},
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
-
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -681,19 +1165,19 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
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
+ // 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) {
addSelfEconomy(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
+ // this.open = false;
this.getList();
});
}
@@ -710,30 +1194,88 @@
this.handleRemoveFile(this.fileListOther[0]);
}
},
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- this.uploading = true;
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading = false;
- this.$modal.msgSuccess("涓婁紶鎴愬姛");
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ 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;
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ 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)
+ {
+ // this.uploadFileList1.push(params.file);
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
@@ -783,7 +1325,7 @@
}
};
</script>
- <style>
+ <style scoped="">
.app-container{
background-color: #FEF7FC;
}
@@ -797,5 +1339,10 @@
}
-
+ .el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
+ .button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+ }
</style>
--
Gitblit v1.9.1