From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期四, 02 一月 2025 21:44:58 +0800 Subject: [PATCH] 修改bug --- ruoyi-ui/src/views/collection/index.vue | 995 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 774 insertions(+), 221 deletions(-) diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue index 70627ca..9a9dc82 100644 --- a/ruoyi-ui/src/views/collection/index.vue +++ b/ruoyi-ui/src/views/collection/index.vue @@ -1,65 +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="phone wx qq twitter isAlways remark" > - <el-input - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - placeholder="鍦ㄢ�滄敹钘忓拰鑽h獕鈥濅腑鎼滅储" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <!-- <el-input - v-model="searchVal" - placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储" - clearable - style="width: 240px" - @input="inputChange"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <div class="outer-table"> - 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax - <tablemax label="myLabel" :tableData="contactList"> - <template v-slot:table> - <el-table-column label="鎿嶄綔" width="180"> - <template slot-scope="scope"> - <el-button @click="handleCheck(scope.row)" type="text" size="small" - >璋冪敤</el-button - > - </template> - </el-table-column> - </template> - </tablemax> - </div>--> - - - <!-- v-model="queryParams.id" - - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - @keyup.enter.native="handleQuery" - --> - </el-form-item> - <el-form-item label="鏃堕棿" prop="happenTime"> <el-date-picker v-model="dateRange" - style="width: 197px; + style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; - opacity: 0.5; - border: 1px solid rgba(0,0,0,0.25);" + opacity: 0.5;" value-format="yyyy-MM-dd" type="daterange" range-separator="-" @@ -69,53 +18,102 @@ </el-form-item> <el-form-item label="绫诲埆" prop="type"> - <el-select - v-model="queryParams.type" - placeholder="鎵�鏈夌被鍒�" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery" - > - <el-option - v-for="item in typeOptions" - :key="item.value" - :label="item.label" - :value="item.value" - - /> + <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery" + > + <el-option v-for="item in typeOptions" + :key="item.value" :label="item.label" :value="item.value"/> </el-select> </el-form-item> - <el-cntainer> - <el-col :span="9" > - <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> - <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; - border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button> - </el-form-item> - </el-col> - </el-cntainer> + <el-form-item label="鍚嶇О" prop="name" > + <el-input + v-model="queryParams.name" + placeholder="璇疯緭鍏ュ悕绉�" + clearable + style="width: 233px; + 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="source" > + <el-input + v-model="queryParams.source" + placeholder="璇疯緭鍏ユ潵婧�" + clearable + style="width: 233px; + 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="owner" > <el-input v-model="queryParams.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable - style="width: 240px" + style="width: 233px; + 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="price" > + <el-input + v-model="queryParams.price" + placeholder="璇疯緭鍏ヤ环鍊�" + clearable + style="width: 233px; + 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="location"> <el-input v-model="queryParams.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable - style="width: 240px" + style="width: 233px; + 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="remark"> + <el-input + v-model="queryParams.remark" + 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-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> + <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button> + </el-form-item> + </el-form> <div> @@ -128,7 +126,7 @@ <!-- line-height: 21px;--> <!-- ">鏀惰棌鍜岃崳瑾�</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" @@ -171,7 +169,7 @@ v-hasPermi="['family:note:export']" >瀵煎叆妯℃澘涓嬭浇</el-button> </el-col> - <el-col :span="1.2"> + <el-col :span="1.5"> <el-upload action="" @@ -182,41 +180,63 @@ > <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="collectionList" :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="25" 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"> + <el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" > + <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="80px"/> + <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="120" 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">{{ getSrc(scope.row.type) }}</template> -<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>--> + <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center"> +<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>--> + <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" > <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鏉ユ簮" prop="source" sortable width="120" align="center" > + <el-table-column label="鏉ユ簮" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" > <template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center"> + <el-table-column label="鎸佹湁鑰�" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center"> <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="浠峰��" prop="price" sortable width="120" align="center"> + <el-table-column label="浠峰��" prop="price" sortable :show-overflow-tooltip="true" width="120" align="center"> <template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="160" align="center"> + <el-table-column label="瀛樻斁浣嶇疆" prop="location" :show-overflow-tooltip="true" sortable width="160" align="center"> <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center"> + <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" :show-overflow-tooltip="true" sortable width="150px" align="center"> + <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template> </el-table-column> <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center"> @@ -228,7 +248,7 @@ alt="" style="width: 35px; height: 35px;" fit="cover" - v-if="!(scope.row.url === ',' || scope.row.url === null)" + v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)" > <img v-else @@ -241,35 +261,40 @@ ></div> </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"> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:role:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> - <el-dropdown - size="mini" - @command="(command) => handleCommand(command, scope.row)" - v-hasPermi="['system:role:edit']"> + <div class="button-container"> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + :disabled="!scope.row.ownData" + @click="handleUpdate(scope.row)" + v-hasPermi="['system:role:edit']" + > + <span style="font-size: 14px;">淇敼</span> + </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']" + ><span style="font-size: 14px;">鍒犻櫎</span></el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right" - @click="handleCheck(scope.row)" - - >鏌ョ湅璇︽儏</el-button> - - </el-dropdown> + @click="handleCheck(scope.row)"> + <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button> + <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> @@ -290,13 +315,16 @@ <!-- <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' clearable placeholder='閫夋嫨鏃ユ湡'></el-input> + <el-date-picker v-model="formDat.happenTime" 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="type"> <el-select v-model="formDat.type" 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-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input> </el-form-item> <el-form-item label="鍚嶇О" prop="name"> <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" > @@ -311,7 +339,7 @@ </el-input> </el-form-item> <el-form-item label="浠锋牸" prop="price"> - <el-input v-model="formDat.price" placeholder="璇疯緭鍏ヤ环鏍�" clearable :style="{width: '100%'}" > + <el-input v-model="formDat.price" type="number" placeholder="璇疯緭鍏ヤ环鏍�" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="瀛樻斁浣嶇疆" prop="location"> @@ -323,24 +351,30 @@ <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> - <h4 class="form-header">鐢靛瓙鏂囦欢 </h4> + <h4 class="form-header">鐩稿叧鍥剧墖 </h4> <el-upload action="#" + accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif" list-type="picture-card" 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}"> - <img - class="el-upload-list__item-thumbnail" - :src="file.url" - alt="" - style="width: 126px; height: 126px" - fit="cover" - :preview-src-list="[file.url]" - > + <div slot="file" slot-scope="{ file }"> + <template v-if="fileList"> + <img + class="el-upload-list__item-thumbnail" + :src="file.url" + alt="" + style="width: 100%; height: 100%; object-fit: cover;" + fit="cover" + :preview-src-list="[file.url]" + > + </template> <span class="el-upload-list__item-actions"> <span class="el-upload-list__item-preview" @@ -361,24 +395,75 @@ </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="" :file-list="fileListOther" class="upload-demo" multiple - + ref="upload1" + list-type="picture-card" + :on-change="handleChange1" + :auto-upload="false" :on-remove="handleRemoveFile" - :http-request="requestUpload" + :http-request="requestUpload1" :show-file-list="true" > - <el-button type="primary">鐐瑰嚮涓婁紶</el-button> +<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> + <template #tip> <div class="el-upload__tip"> </div> </template> </el-upload> - + <el-button + style="margin-left: 10px" + size="small" + type="success" + @click="fileUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> </el-form> <h4 class="form-header"> </h4> @@ -393,26 +478,194 @@ </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="happenTime" sortable width="120" align="center"> + <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center"> + <!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>--> + <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" > + <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="鏉ユ簮" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" > + <template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template> + </el-table-column> + + <el-table-column label="鎸佹湁鑰�" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center"> + + <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="浠峰��" prop="price" sortable :show-overflow-tooltip="true" width="120" align="center"> + <template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="瀛樻斁浣嶇疆" prop="location" :show-overflow-tooltip="true" sortable width="160" align="center"> + <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center"> + <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" :show-overflow-tooltip="true" sortable width="150px" align="center"> + <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</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 {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index"; -import {enload} from "@/api/doctor"; +import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload, + share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData +} from "@/api/collection/index"; +import {listUserAll} from "@/api/root/index"; import {Message} from "element-ui"; - +import {showShareUser} from "@/api/bignote/index"; +import {getAllInfo} from "@/api/system/user" export default { - name: "index", + name: "ZfCollection", dicts: ['sys_normal_disable'], data() { return { + // 鍒嗕韩缁欒皝鐨刲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: [], + + + userId: undefined, // 閬僵灞� disabled: false, @@ -430,6 +683,7 @@ total: 0, // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹� collectionList: [], + typeList:[], // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -441,18 +695,21 @@ deptExpand: true, deptNodeAll: false, // 鏃ユ湡鑼冨洿 + valueFromParent: '鏀惰棌鍜岃崳瑾�', dateRange: [], // 鏁版嵁鑼冨洿閫夐」 - fot:[".jpg",".jif"], - fileList:[ - ], - fileListOther:[ - - ], + 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:[], + fileList1:[], + uploadFileList: [], + uploadFileList1: [], + fileListOther:[], dsb:true, btn:false, fit:['fill'], - + uploading: false, + uploading1: false, formDat: { //鏀惰棌涓庤崳瑾夎褰� id:undefined, @@ -464,7 +721,7 @@ price:undefined, location:undefined, remark:undefined, - url: undefined, + url: "", }, // 鑿滃崟鍒楄〃 @@ -476,9 +733,12 @@ pageNum: 1, pageSize: 10, type:undefined, + name:undefined, + source:undefined, owner:undefined, + price:undefined, location:undefined, - // happenTime:undefined, + remark:undefined, }, // searchVal:"", @@ -533,40 +793,215 @@ trigger: 'blur' }], }, - typeOptions: [ - { - value: '閭エ', - label: '閭エ' - }, { - value: '鏃ユ湰鍐涘垁', - label: '鏃ユ湰鍐涘垁' - }, { - value: '鑼呭彴閰�', - label: '鑼呭彴閰�' - }, { - value: '绾㈡湪', - label: '绾㈡湪' - }, { - value: '绾康鍝�', - label: '绾康鍝�' - }, { - value: '鐡峰櫒', - label: '鐡峰櫒' - }, { - value: '涔︾睄', - label: '涔︾睄' - } - ], + typeOptions: [], + newOption: undefined, + showInput: true }; }, created() { this.getList(); - this.getCateInfor() - // for (let i = 0; i < this.contactList.length; i++) { - // this.formDat[i] = this.contactList[i]; - // } + this.getTypeOptions(); + this.getInfo() + + this.getList1(); }, methods: { + // 鍒嗛〉 + 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' }) + this.getList1(); + //alert(234) + 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() { + let userId = this.$store.state.user.userId + + this.userOptions = [] + showShareUser(userId, 2018).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 + }) + }, // 鍙栨秷鎸夐挳 cancelData() { this.open = false; @@ -584,35 +1019,64 @@ return "statistics-warning-row"; } }, + //绫诲埆 + addNewOption() { + const newOption = this.newOption.trim(); + if (newOption && !this.typeOptions.includes(newOption)) { + this.typeOptions.push(newOption); + this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」 + } + }, /** 鏌ヨ璁板綍鍒楄〃 */ getList() { this.loading = true; // console.log(this.queryParams) this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] - + let _this = this // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listCollection(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.collectionList = response.data.data; + if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�") + { + _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�"); + _this.loading = false; + }else{ + _this.collectionList = response.data.data; + _this.total = response.data.total; + _this.loading = false; + } + } + ); + listType(this.queryParams).then(response => { + this.typeList = response.data; - this.total = response.data.total; + // console.log( this.typeList ) + // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions() + this.getTypeOptions(); this.loading = false; } ); }, - /** 鏌ヨ绫诲埆淇℃伅 */ - getCateInfor() - { - let _this = this - getCategory().then(response=>{ + getTypeOptions() { + const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== ''); + // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」 + const uniqueOptions = {}; + // 鏋勫缓涓嬫媺閫夐」鍒楄〃 + this.typeOptions = filteredOptions.reduce((options, option) => { + if (!uniqueOptions[option]) { + uniqueOptions[option] = true; + options.push({ + label: option, + value: option + }); + } + return options; + }, []); - response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ - _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) - }) - }) }, + //绫诲埆閫夋嫨 getSrc(type) { if (type === '閭エ') { @@ -637,14 +1101,23 @@ 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); + + } } }, // 鍙栨秷鎸夐挳 @@ -678,7 +1151,7 @@ deptCheckStrictly: true, remark: undefined }; - this.resetForm("form"); + this.resetForm("elForm"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -716,6 +1189,7 @@ /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ const id = row.id; + this.open2 = false; this.$router.push("/familymodel/collection/collectionInfo/" + id); }, @@ -740,19 +1214,25 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ 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) { addCollection(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + this.newOption = ''; + 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]); + } this.getList(); }); } @@ -761,32 +1241,97 @@ Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); - this.handleRemove(this.fileList[0]); - this.handleRemoveFile(this.fileListOther[0]); + + 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) - { - var file = params.file; - var formData = new FormData(); - formData.append('uploadFile', file); - let _this = this + handleChange(file, fileList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 - uploadPic(formData).then(response => { - let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) + // 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; - if(_this.fot.includes(pth) === true) - { - _this.fileList.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) - } + }) - else{ - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) + 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; @@ -830,13 +1375,16 @@ _this.getList(); Message({ message: "瀵煎叆鎴愬姛", type: 'warning' }) - }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })}); + }).catch(() => { + + Message({ message: "瀵煎叆澶辫触", type: 'error' }) + }) } } }; </script> -<style> +<style scoped> .app-container{ background-color: #FEF7FC; } @@ -850,5 +1398,10 @@ } - +.el-table__cell { + font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */ +} +.button-container { + display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */ +} </style> -- Gitblit v1.9.1