From a27ffbdd8353c381312839a0c00ae7444c7a381c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 30 五月 2024 15:40:49 +0800
Subject: [PATCH] 修改完bug
---
ruoyi-ui/src/views/pet/index.vue | 640 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 400 insertions(+), 240 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 6719690..b904392 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -1,12 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="绫诲瀷" prop="type">
+ <el-form-item label="鎬у埆" prop="sex">
<el-select
- v-model="queryParams.type"
- placeholder="鎵�鏈夌被鍨�"
+ v-model="queryParams.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
>
<el-option
v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
v-model="queryParams.name"
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,28 +35,15 @@
v-model="queryParams.idNum"
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>
- <el-form-item label="鎸佹湁浜�" prop="holder">
- <el-input
- v-model="queryParams.holder"
- placeholder="璇疯緭鍏ユ寔鏈変汉"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <!-- <el-form-item label="鍏蜂綋浣嶇疆" prop="address">
- <el-input
- v-model="queryParams.address"
- placeholder="璇疯緭鍏ュ叿浣撲綅缃�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item> -->
+
+
</el-form-item>
<!-- <el-form-item label="鍙戠敓鏃堕棿">
<el-date-picker
@@ -71,7 +64,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"
@@ -94,75 +87,42 @@
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExportTemplate"
- v-hasPermi="['family:note:export']"
- >瀵煎叆妯℃澘涓嬭浇</el-button>
- </el-col>
- <el-col :span="1.2">
- <el-upload
- action=""
- class="upload-demo"
- :show-file-list="false"
- :http-request="handleEnport"
- >
- <el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
-
- </el-upload>
- </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="petList" :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 v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column label="绉嶇被" prop="animal" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="绫诲瀷" prop="type" sortable :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="鍝佺" prop="type" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="鍚嶅瓧" prop="name" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="鎬у埆" prop="sex" sortable width="120" >
- <template slot-scope="scope">
- {{ getSrc1(scope.row.sex) }}
- </template>
- </el-table-column>
- <el-table-column label="棰滆壊" prop="color" sortable width="100" />
-
- <!-- <el-table-column label="涓讳汉濮撳悕" prop="holder" sortable width="100" /> -->
- <el-table-column label="灞呬綇鍦板潃" prop="address" sortable width="100" />
- <el-table-column label="璇佷欢鍙风爜" prop="idNum" sortable width="100" />
- <!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
- <el-table-column label="鍑虹敓鏃ユ湡" align="center" sortable prop="birth" width="180">
-
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.birth) }}</span>
+ {{ getSrc1(scope.row.sex) }}
</template>
</el-table-column>
+ <el-table-column label="棰滆壊" prop="color" sortable width="100" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="璇佷欢鍙风爜" prop="idNum" sortable width="100" />
+
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" sortable prop="birth" width="180">
+ <template slot-scope="scope">{{scope.row.birth? scope.row.birth: '鈥斺�斺�斺��'}}</template>
+
+ </el-table-column>
+ <el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
+ <el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" />
+ <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
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:property:info']"
>淇敼</el-button>
@@ -170,13 +130,14 @@
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:property:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-
</el-dropdown>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -192,45 +153,93 @@
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">榄呭疇淇℃伅</h2>
+
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="绫诲埆" prop="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-form-item label="璇佷欢鍙风爜" prop="idNum">
+ <el-input v-model="formDat.idNum" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="闃蹭吉璇�" prop="securityCode">
+ <el-input v-model="formDat.securityCode" placeholder="璇疯緭鍏ラ槻浼瘉" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="绉嶇被" prop="animal">
+ <el-input v-model="formDat.animal" placeholder="璇疯緭鍏ョ绫�" clearable :style="{width: '100%'}" ></el-input>
+ </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="name">
+ <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕瀛�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birth">
+ <el-date-picker v-model="formDat.birth" 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="sex">
+ <el-select v-model="formDat.sex" 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="title">
- <el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" ></el-input>
+ <el-form-item label="棰滆壊" prop="color">
+ <el-input v-model="formDat.color" placeholder="璇疯緭鍏ラ鑹�" clearable :style="{width: '100%'}" ></el-input>
</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="holder">
- <el-input v-model="formDat.holder" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <el-form-item label="鍏蜂綋浣嶇疆" prop="address">
- <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <!-- <el-form-item label="瀹跺涵鍙�" prop="familyId">
- <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item> -->
-
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+ <el-form-item label="鎬ц川" prop="properties">
+ <el-input v-model="formDat.properties" placeholder="璇疯緭鍏ユ�ц川" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-form-item label="楗涔犳儻(鍠�)" prop="eatHabit">
+ <el-input v-model="formDat.eatHabit" placeholder="璇疯緭鍏ラギ椋熶範鎯�(鍠�)" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="楗涔犳儻(鎭�)" prop="disEatHabit">
+ <el-input v-model="formDat.disEatHabit" placeholder="璇疯緭鍏ラギ椋熶範鎯�(鎭�)" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐢熸椿涔犳儻(鍠�)" prop="lifeHabit">
+ <el-input v-model="formDat.lifeHabit" placeholder="璇疯緭鍏ョ敓娲讳範鎯�(鍠�)" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐢熸椿涔犳儻(鎭�)" prop="disLifeHabit">
+ <el-input v-model="formDat.disLifeHabit" placeholder="璇疯緭鍏ョ敓娲讳範鎯�(鎭�)" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="榄呭疇灞呬綇鍦板潃" prop="address">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ眳浣忓湴鍧�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鍚噦鏂硅█" prop="dialect">
+ <el-input v-model="formDat.dialect" placeholder="璇疯緭鍏ュ惉鎳傛柟瑷�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">榄呭疇涓讳汉淇℃伅</h2>
+ <el-form-item label="涓讳汉鍚嶅瓧" prop="masterName">
+ <el-input v-model="formDat.masterName" placeholder="璇疯緭鍏ヤ富浜哄悕瀛�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿鐮�" prop="masterIdNum">
+ <el-input v-model="formDat.masterIdNum" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鎵嬫満鍙风爜" prop="phone">
+ <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ヤ富浜烘墜鏈哄彿鐮�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="涓讳汉鍦板潃" prop="masterAddress">
+ <el-input v-model="formDat.masterAddress" placeholder="璇疯緭鍏ヤ富浜哄湴鍧�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <h4 class="form-header">榄呭疇澶村儚 </h4>
<el-upload
action="#"
list-type="picture-card"
- multiple
+ :limit="1"
:http-request="requestUpload"
- :file-list="fileList"
+ :file-list="fileList1"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
@@ -262,25 +271,44 @@
</div>
</el-upload>
- <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <h4 class="form-header">榄呭疇鍏ㄨ韩鐓� </h4>
<el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
- multiple
-
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
+ action="#"
+ list-type="picture-card"
+ :limit="1"
+ :http-request="requestUpload2"
+ :file-list="fileList2"
>
- <el-button type="primary">Click to upload</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-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]"
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+ </div>
+ </el-upload>
</el-form>
+
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
@@ -294,22 +322,27 @@
</el-dialog>
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </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";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
-import {listPet,enload, getPetInfo, delPet,addPet, uploadPic} from "@/api/pet/index";
+import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1} from "@/api/pet/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -325,8 +358,6 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 璧勪骇琛ㄦ牸鏁版嵁
- petList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -337,27 +368,64 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+
+ dialogImageUrl: '',
+ dialogVisible: false,
// 鏃ユ湡鑼冨洿
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'],
- ],
+ fileList1:[ ],
+ fileList2:[ ],
+ fileListOther:[ ],
+ uploadFileList1: [],
dsb:true,
btn:false,
formDat: {
- type: undefined,
- name: undefined,
- sex: undefined,
- color: undefined,
- address: undefined,
+ animal:undefined,
remark: undefined,
url: undefined,
+ type: undefined,
+ idNum: undefined,
+ name: undefined,
+ birth: undefined,
+ sex: undefined,
+ color: undefined,
+ properties: undefined,
+ securityCode: undefined,
+ dialect: undefined,
+ address:undefined,
+ eatHabit:undefined,
+ disEatHabit: undefined,
+ LifeHabit: undefined,
+ disLifeHabit: undefined,
+ headPicture:undefined,
+ fullPicture:undefined,
},
+ petList: {
+ type: undefined,
+ idNum: undefined,
+ name: undefined,
+ birth: undefined,
+ sex: undefined,
+ color: undefined,
+ properties: undefined,
+ securityCode: undefined,
+ dialect: undefined,
+ address:undefined,
+ eatHabit:undefined,
+ disEatHabit: undefined,
+ LifeHabit: undefined,
+ disLifeHabit: undefined,
+ url: undefined,
+ headPicture:undefined,
+ fullPicture:undefined,
+ },
+
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -382,51 +450,117 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- type: [{
+ animal: [{
required: true,
- message: '璇烽�夋嫨绫诲埆',
+ message: '璇疯緭鍏ョ绫�',
+ trigger: 'blur'
+ }],
+ idNum: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+ trigger: 'blur'
+ }],
+ securityCode: [{
+ // required: true,
+ message: '璇疯緭鍏ラ槻浼爜',
+ trigger: 'blur'
+ }],
+ name: [{
+ required: true,
+ message: '璇疯緭鍏ュ悕瀛�',
+ trigger: 'blur'
+ }],
+ birth: [{
+ required: true,
+ message: '璇疯緭鍏ュ嚭鐢熸棩鏈�',
trigger: 'change'
}],
- title: [{
+ color: [{
required: true,
- message: '璇疯緭鍏ユ爣棰�',
+ message: '璇疯緭鍏ラ鑹�',
trigger: 'blur'
}],
- location: [{
- required: true,
- message: '璇疯緭鍏ュ瓨鍌ㄥ湴鍧�',
+ properties: [{
+ // required: true,
+ message: '璇疯緭鍏ユ�ц川',
trigger: 'blur'
}],
- holder: [{
+ sex: [{
required: true,
- message: '璇疯緭鍏ユ寔鏈変汉',
- trigger: 'blur'
- }],
- address: [{
- required: true,
- message: '璇疯緭鍏ュ叿浣撲綅缃�',
- trigger: 'blur'
- }],
- // familyId: [{
- // required: true,
- // message: '璇疯緭鍏amilyId',
- // trigger: 'blur'
- // }],
- createTime: [{
- required: true,
- message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+ message: '璇烽�夋嫨鎬у埆',
trigger: 'change'
}],
+
+ LifeHabit: [{
+ // required: true,
+ message: '璇疯緭鍏ョ敓娲讳範鎯�(鍠�)',
+ trigger: 'blur'
+ }],
+
+ disLifeHabit: [{
+ // required: true,
+ message: '璇疯緭鍏ョ敓娲讳範鎯�(鎭�)',
+ trigger: 'blur'
+ }],
+
+ eatHabit: [{
+ required: true,
+ message: '璇疯緭鍏ラギ椋熶範鎯�(鍠�)',
+ trigger: 'blur'
+ }],
+
+ disEatHabit: [{
+ required: true,
+ message: '璇疯緭鍏ラギ椋熶範鎯�(鎭�)',
+ trigger: 'blur'
+ }],
+ masterName: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜哄鍚�',
+ trigger: 'blur'
+ }],
+ masterIdNum: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜鸿韩浠借瘉鍙风爜',
+ trigger: 'blur'
+ }],
+ phone: [{
+ required: true,
+ message: '璇疯緭鍏ユ墜鏈哄彿',
+ trigger: 'blur'
+ }],
+ masterAddress: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜哄湴鍧�',
+ trigger: 'blur'
+ }],
+
+
+
},
- typeOptions: [],
+ typeOptions: [ {
+ value: '0',
+ label: '闆屾��',
+ },
+ {
+ value: '1',
+ label: '闆勬��',
+ }],
};
},
created() {
this.getList();
- // this.getCateInfor()
-
+ this.getInfo()
},
methods: {
+ 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;
@@ -434,13 +568,13 @@
},
//瀹犵墿鎬у埆鐨勯�夋嫨
- getSrc1(sex) {
- if (sex === 0) {
- return '闆屾��'
- }else {
- return '闆勬��'
- }
- },
+ getSrc1(sex) {
+ if (sex === 0) {
+ return '闆屾��'
+ }else {
+ return '闆勬��'
+ }
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
@@ -456,38 +590,51 @@
this.loading = true;
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listPet(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
this.petList = response.data.data;
this.total = response.data.total;
this.loading = false;
}
);
- },
- /** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
+ listPetnote(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ console.log(response.data)
+ this.PetNoteList = response.data.data;
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
},
handleRemove(file) {
- for(let i = 0; i < this.fileListOther.length; i++)
+ for(let i = 0; i < this.fileList1.length; i++)
{
- if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
+ if(this.fileList1[i].url==file.url)
+ this.$delete(this.fileList1,i);
}
},
- getRowId(row)
- {
- return row.id
+ handleRemoveFile(file) {
+ // for(let i = 0; i < this.fileList2.length; i++)
+ // {
+ // if(this.fileList2[i].url==file.url)
+ // this.$delete(this.fileList2,i);
+ // }
+ for(let i = 0; i < this.fileList2.length; i++)
+ {
+ if(this.fileList2[i].url==file.url)
+ {
+ this.$delete(this.fileList2,i);
+ this.$delete(this.uploadFileList1,i);
+ }
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -520,7 +667,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -545,13 +692,14 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞璧勪骇璇︾粏淇℃伅";
+ this.title = "娣诲姞榄呭疇璇︾粏淇℃伅";
},
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
this.$router.push("/familymodel/pet/petInfo/" + id);
},
+
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
const id = row.id;
@@ -565,103 +713,99 @@
});
},
-
+ //鏀惧ぇ
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
+
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
+ let ul = this.fileList1.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
- let uls = this.fileListOther.map(function (elem){
+ let uls = this.fileList2.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) {
+ this.formDat.headPicture = ul,
+ this.formDat.fullPicture = uls,
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
- addProperty(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- });
+ addPet(this.formDat).then(response => {
+ // alert(this.formDat.diseatHabit)
+ // alert(this.formDat.eatHabit)
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList1.length; i++)
+ {
+ this.handleRemove(this.fileList1[0]);
+ }
+ for(let i = 0; i < this.fileList2.length; i++){
+ this.handleRemoveFile(this.fileList2[0]);
+ }
+ this.getList();
+ });
+ }
+ });
+
},
requestUpload(params)
{
var file = params.file;
var formData = new FormData();
+
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ _this.fileList1.push({name:response.data.fileName, url:response.data.url})
+ // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+ console("ok")
+ })
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ },
+ requestUpload2(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
- }
+ formData.append('uploadFile', file);
+ let _this = this
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
+ uploadPic1(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.fileList1.push({name:response.data.fileName, url:response.data.url})
+ _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+ console("ok")
})
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delProperty(Ids);
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
+ return delPet(Ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- const Ids = this.ids;
-
- if(Ids.length==0)
- {
- this.download('/family/property/export', {
+ this.download('family/pet/export', {
...this.queryParams
}, `pet_${new Date().getTime()}.xlsx`)
- }else{
- this.download('/family/property/export1/'+Ids, {
-
- }, `pet_${new Date().getTime()}.xlsx`)
- }
},
- handleExportTemplate()
- {
- this.download('/family/property/model', {
- ...this.queryParams
- }, `pet_${new Date().getTime()}.xlsx`)
- },
- /** 瀵煎叆鎿嶄綔*/
- 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>
@@ -674,4 +818,20 @@
background: #FFEFF2;
}
+.upload-demo .el-upload-list__item-thumbnail img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+.upload-demo .el-icon-plus {
+ font-size: 28px;
+ color: #999;
+ border: 1px dashed #999;
+}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1