From beca7c027b3126ecc534a654cf89be13ade8d854 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期三, 03 五月 2023 17:49:12 +0800
Subject: [PATCH] 魅宠
---
ruoyi-ui/src/api/pet/index.js | 121 +++++
ruoyi-ui/src/views/pet/petnote.vue | 0
ruoyi-ui/src/views/pet/petInfo.vue | 505 ++++++++++++++++++++++
ruoyi-ui/src/views/pet/index.vue | 661 ++++++++++++++++++++++++++++++
ruoyi-ui/src/router/index.js | 17
5 files changed, 1,304 insertions(+), 0 deletions(-)
diff --git a/ruoyi-ui/src/api/pet/index.js b/ruoyi-ui/src/api/pet/index.js
new file mode 100644
index 0000000..098d00e
--- /dev/null
+++ b/ruoyi-ui/src/api/pet/index.js
@@ -0,0 +1,121 @@
+import request from '@/utils/request'
+
+//榄呭疇鍩烘湰淇℃伅
+
+// 鏌ヨ鎵�鏈夐瓍瀹犺褰�
+export function listPet(query) {
+ return request({
+ url: '/zfPet/all',
+ method: 'get',
+ params: query
+ })
+ }
+
+ //澧炲姞榄呭疇璁板綍
+ export function addPet(data)
+ {
+ return request({
+ url: '/zfPet',
+ method: 'post',
+ data: data
+ })
+ }
+// 鏍规嵁id鏌ヨ鎵�鏈夐瓍瀹犱俊鎭�
+export function getPetList(id) {
+ return request({
+ url: '/zfPet/' + id,
+ method: 'get',
+
+ })
+}
+ // 鍒犻櫎榄呭疇璁板綍
+ export function delPet(Ids) {
+ return request({
+ url: '/zfPet/' + Ids,
+ method: 'delete'
+ })
+ }
+ //淇敼榄呭疇璁板綍
+ export function updatePet(data) {
+ return request({
+ url: '/zfPet',
+ method: 'put',
+ data: data
+ })
+ }
+
+ //榄呭疇涓讳汉淇℃伅
+
+ //鏍规嵁瀹犵墿id鏌ヨ涓讳汉淇℃伅
+ export function getPetowner(id,pid) {
+ return request({
+ url: '/zfMaster/' + id + '/pid='+pid,
+ method: 'get',
+ })
+ }
+ //淇敼榄呭疇涓讳汉淇℃伅
+ export function updatePetowner(data) {
+ return request({
+ url: '/zfMaster',
+ method: 'put',
+ data: data
+ })
+ }
+ //鏂板榄呭疇涓讳汉淇℃伅
+ export function addPetowner(data)
+ {
+ return request({
+ url: '/zfMaster',
+ method: 'post',
+ data: data
+ })
+ }
+ //鍒犻櫎榄呭疇涓讳汉淇℃伅
+ export function delPetowner(Ids) {
+ return request({
+ url: '/zfMaster/' + Ids,
+ method: 'delete'
+ })
+ }
+//榄呭疇澶囧繕褰�
+ // 鏌ヨ鎵�鏈夐瓍瀹犲蹇樺綍璁板綍
+export function listPetnote(query) {
+ return request({
+ url: '/family/zfPetNote/all',
+ method: 'get',
+ params: query
+ })
+}
+
+//澧炲姞榄呭疇澶囧繕褰曡褰�
+export function addPetnote(data)
+{
+ return request({
+ url: '/family/zfPetNote',
+ method: 'post',
+ data: data
+ })
+}
+// 鏍规嵁id鏌ヨ鎵�鏈夐瓍瀹犲蹇樺綍淇℃伅
+export function getPetnoteList(id) {
+return request({
+ url: '/family/zfPetNote/' + id,
+ method: 'get',
+
+})
+}
+// 鍒犻櫎榄呭疇澶囧繕褰曡褰�
+export function delPetnote(Ids) {
+ return request({
+ url: '/zfPet/' + Ids,
+ method: 'delete'
+ })
+}
+//淇敼榄呭疇澶囧繕褰曡褰�
+export function updatenotePet(data) {
+ return request({
+ url: '/zfPet',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 9501abc..a2d11cb 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -230,6 +230,23 @@
}
]
},
+ //榄呭疇澶囧繕褰�
+ {
+ path: '/familymodel/pet',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['familymodel:pet:list'],
+
+ children: [
+ {
+ path: 'petnote/:pid(\\d+)',
+ component: () => import('@/views/pet/petnote'),
+ name: 'petnote',
+ meta: { title: '澶囧繕褰�',activeMenu: '/familymodel/zfPetNote'}
+ }
+ ]
+ },
//瀹跺涵灏忓尰鐢�
{
path: '/familymodel/Doctor',
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
new file mode 100644
index 0000000..0fcdd19
--- /dev/null
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -0,0 +1,661 @@
+<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-select
+ v-model="queryParams.type"
+ placeholder="鎵�鏈夌被鍨�"
+ clearable
+ style="width: 240px"
+ >
+ <el-option
+ v-for="dict in typeOptions"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ <el-form-item label="鍚嶅瓧" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ悕瀛�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璇佷欢鍙风爜" prop="idNum">
+ <el-input
+ v-model="queryParams.idNum"
+ placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+ clearable
+ style="width: 240px"
+ @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
+ v-model="dateRange"
+ style="width: 240px"
+ value-format="yyyy-MM-dd HH-MM-SS"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item> -->
+ <el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ border-radius:6px 6px 6px 6px;opacity:1;">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:role:add']"
+ >鏂板</el-button>
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ 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="handleExport"
+ 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" @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="绫诲瀷" 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>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <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="['familymodel:property:info']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+ <el-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>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ style="background: #FEF7FC;"
+ />
+
+ <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
+ <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-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-form-item>
+ <el-form-item label="鏍囬" prop="title">
+ <el-input v-model="formDat.title" 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>
+
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ >
+ <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="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+
+ </div>
+ </el-upload>
+ <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"
+ >
+ <el-button type="primary">Click to upload</el-button>
+ <template #tip>
+ <div class="el-upload__tip">
+ </div>
+ </template>
+ </el-upload>
+
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+ </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";
+
+
+
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
+import {listPet,enload, getPetInfo, delPet,addPet, uploadPic} from "@/api/pet/index";
+export default {
+ name: "Role",
+ dicts: ['sys_normal_disable'],
+ data() {
+ return {
+ // 閬僵灞�
+ disabled: false,
+
+ loading: true,
+ formData:[],
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 璧勪骇琛ㄦ牸鏁版嵁
+ petList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+ openDataScope: false,
+ menuExpand: false,
+ menuNodeAll: false,
+ deptExpand: true,
+ deptNodeAll: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:[".jpg",".jif"],
+ fileList:[
+ ],
+ fileListOther:[
+
+ ],
+ dsb:true,
+ btn:false,
+ formDat: {
+ type: undefined,
+ name: undefined,
+ sex: undefined,
+ color: undefined,
+ address: undefined,
+ remark: undefined,
+ url: undefined,
+
+ },
+ // 鑿滃崟鍒楄〃
+ menuOptions: [],
+ // 閮ㄩ棬鍒楄〃
+ deptOptions: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ type:undefined,
+ title:undefined,
+ location:undefined,
+ holder:undefined,
+ address:undefined,
+ happenStartTime:undefined,
+ happenEndTime:undefined
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ type: [{
+ required: true,
+ message: '璇烽�夋嫨绫诲埆',
+ trigger: 'change'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ユ爣棰�',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ュ瓨鍌ㄥ湴鍧�',
+ trigger: 'blur'
+ }],
+ holder: [{
+ required: true,
+ message: '璇疯緭鍏ユ寔鏈変汉',
+ trigger: 'blur'
+ }],
+ address: [{
+ required: true,
+ message: '璇疯緭鍏ュ叿浣撲綅缃�',
+ trigger: 'blur'
+ }],
+ // familyId: [{
+ // required: true,
+ // message: '璇疯緭鍏amilyId',
+ // trigger: 'blur'
+ // }],
+ createTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+ trigger: 'change'
+ }],
+ },
+ typeOptions: [],
+ };
+ },
+ created() {
+ this.getList();
+ this.getCateInfor()
+
+ },
+ methods: {
+ // 鍙栨秷鎸夐挳
+ cancelData() {
+ this.open = false;
+ this.reset();
+ },
+
+//瀹犵墿鎬у埆鐨勯�夋嫨
+ getSrc1(sex) {
+ if (sex === 0) {
+ return '闆屾��'
+ }else {
+ return '闆勬��'
+ }
+ },
+
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+
+ /** 鏌ヨ瑙掕壊鍒楄〃 */
+ getList() {
+ 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=>{
+
+ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ })
+ })
+ },
+
+ handleRemove(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+ cancelDataScope() {
+ this.openDataScope = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ console.log(this.ids)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞璧勪骇璇︾粏淇℃伅";
+ },
+ /** 鏌ョ湅璇︾粏淇℃伅 */
+ handleCheck(row){
+ const id = row.id;
+ this.$router.push("/familymodel/pet/petInfo/" + id);
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/familymodel/pet/petInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+
+
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+ 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) {
+
+ addProperty(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+ if(_this.fot.includes(pth) === true)
+ {
+ _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+ }
+
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delProperty(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('family/property/export', {
+ ...this.queryParams
+ }, `property_${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>
+<style>
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+</style>
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
new file mode 100644
index 0000000..db77c9b
--- /dev/null
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -0,0 +1,505 @@
+<template>
+ <div class="app-container">
+ <div class="form-header mt">
+ <h4 class="dt h4">鍩烘湰淇℃伅 </h4>
+ <el-button type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
+ <el-button type="primary" @click="Petnote(id)" :disabled="btn">榄呭疇澶囧繕褰�</el-button>
+ </div>
+ <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-container >
+ <div >
+ <el-container >
+ <el-col >
+ <el-form ref="elForm" :model="petList" :rules="rules" size="medium" label-position="left"
+ v-loading="loading" :data="petList" @selection-change="handleSelectionChange" label-width="120px" >
+ <el-row :span="5">
+ <el-form-item label="璇佷欢鍙风爜" prop="idNum" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb" >
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="闃蹭吉璇�" prop="securityCode" label-width="55px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.securityCode" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birth" label-width="70px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.birth" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="棰滆壊" prop="color" label-width="40px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.color" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="楗涔犳儻(鍠�)" prop="eatHabit" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.eatHabit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鐢熸椿涔犳儻(鍠�)" prop="lifeHabit" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.lifeHabit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="灞呬綇鍦板潃" prop="address" label-width="70px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.address" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+
+ <div style="padding-left:150px">
+ <el-container>
+ <el-col v-loading="loading" :data="petList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="petList" :rules="rules" size="medium" label-position="left" >
+ <el-row :span="5">
+ <el-form-item label="绉嶇被" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.type" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鍚嶅瓧" prop="name" label-width="40px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.name" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鎬у埆" prop="sex" label-width="40px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.sex === 1 ? '闆勬��':'闆屾��' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鎬ц川" prop="properties" label-width="40px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.properties" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="楗涔犳儻(鎭�)" prop="disEatHabit" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.disEatHabit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鐢熸椿涔犳儻(鎭�)" prop="disLifeHabit" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.disLifeHabit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鍚噦鏂硅█" prop="dialect" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.dialect" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+
+ <div style="padding-left:250px;padding-top:30px">
+ <el-col :span="6" :data="petList">
+ <div class="block" :model="petList" >
+ <el-col v-model="petList.url" prop="url">
+ <el-avatar shape="square" :size=200 >
+ <el-image
+ :src="'http://47.93.189.255:8080/'+ petList.url"
+ :fit="fit" style="width: 212px;height: 168px;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+ </el-avatar>
+ </el-col>
+ </div>
+
+ </el-col>
+ </div>
+ </el-container>
+
+ <!-- 榄呭疇涓讳汉 -->
+ <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-container >
+ <div >
+ <el-container >
+ <el-col >
+ <el-form ref="elForm" :model="petownerList" :rules="rules" size="medium" label-position="left"
+ v-loading="loading" :data="petownerList" @selection-change="handleSelectionChange" label-width="120px" >
+ <el-row :span="5">
+ <el-form-item label="楗插吇浜哄鍚�" prop="name" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.name" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb" >
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鍥哄畾鐢佃瘽" prop="fixedNo" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.fixedNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="绉诲姩鐢佃瘽" prop="birth" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.birth" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="浣忔墍鎬ц川" prop="property" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.property" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-form-item label="浣忔墍璇︾粏鍦板潃" prop="address" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.address" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+
+ <div style="padding-left:150px">
+ <el-container>
+ <el-col v-loading="loading" :data="petownerList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="petownerList" :rules="rules" size="medium" label-position="left" >
+ <el-row :span="5">
+ <el-form-item label="璇佷欢绫诲瀷" prop="certificateType" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.certificateType" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="璇佷欢鍙风爜" prop="certificateNo" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.certificateNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鎷ユ湁鐘彧鏁伴噺" prop="many" label-width="140px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.many " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鐢靛瓙閭欢" prop="email" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petownerList.email" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+
+
+ </el-container>
+
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ </el-dialog>
+ </div>
+</template>
+<script>
+import {getPetList, getPetownerList, uploadPic, download} from "@/api/pet/index";
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+
+export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi:"榄呭疇璇︾粏淇℃伅",
+ udi:"榄呭疇淇℃伅淇敼",
+ fot:[".jpg",".jif"],
+ fileList:[
+ ],
+ fileListOther:[
+
+ ],
+ dsb:true,
+ btn:false,
+ petList: {
+ type: undefined,
+ kind: undefined,
+ suitable: undefined,
+ method: undefined,
+ location:undefined,
+ place:undefined,
+ remark: undefined,
+ url: undefined,
+ },
+ petownerList: {
+ email: undefined,
+ name: undefined,
+ certificateType: undefined,
+ certificateNo: undefined,
+ fixedNo:undefined,
+ many:undefined,
+ address: undefined,
+ property: undefined,
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ idNum: [{
+ required: true,
+ message: '璇疯緭鍏dNum',
+ trigger: 'blur'
+ }],
+ kind: [{
+ required: true,
+ message: '璇烽�夋嫨淇濇磥/鏀剁撼',
+ trigger: 'change'
+ }],
+ type: [{
+ required: true,
+ message: '璇疯緭鍏ョ被鍒�',
+ trigger: 'blur'
+ }],
+ method: [{
+ required: true,
+ message: '璇疯緭鍏ヤ繚娲佹柟娉�',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ユ潗鏂欏瓨鏀惧湴',
+ trigger: 'blur'
+ }],
+ place: [{
+ required: true,
+ message: '璇疯緭鍏ユ斁缃湴鐐�',
+ trigger: 'blur'
+ }],
+ suitable: [{
+ required: true,
+ message: '璇疯緭鍏ラ�傜敤浜�',
+ trigger: 'blur'
+ }],
+
+ },
+ typeOptions: [],
+ }
+ },
+ computed: {},
+ watch: {},
+ created() {
+ const id = this.$route.params && this.$route.params.id;
+ let jd;
+ if(this.$route.query.detail!=undefined)
+ {
+ jd = this.$route.query.detail
+ this.btn= jd
+ this.dsb = !jd
+ document.title = "淇敼榄呭疇璇︾粏淇℃伅";
+ this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ }
+ else{
+ document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
+ this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ }
+
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getPetList(id).then((response) => {
+ this.petList = response.data;
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+ if (_this.fot.includes(pth) === true)
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ else {
+ // alert(paths[i])
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ }
+ }
+
+
+ this.loading = false;
+
+ });
+ this.getCateInfor()
+
+ };
+ if (id,pid) {
+ this.loading = true;
+ getPetownerList(id,pid).then((response) => {
+ this.petownerList = response.data;
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+ if (_this.fot.includes(pth) === true)
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ else {
+ // alert(paths[i])
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ }
+ }
+ this.loading = false;
+
+
+ });
+ this.getCateInfor()
+
+ };
+ this.getList();
+ },
+ mounted() {},
+ methods: {
+ submitForm() {
+ 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.formData.url = ul+","+uls
+
+ this.$refs['elForm'].validate(valid => {
+
+
+ if (valid) {
+ if (this.formData.id != undefined) {
+ updateEconomy(this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
+ },
+ resetForm() {
+ this.$refs['elForm'].resetFields()
+ },
+ handlePreview(file)
+ {
+ let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'economy_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+
+
+ /** 澶囧繕褰� */
+ Petnote(pid){
+ this.$router.push("/familymodel/pet/petnote/" + pid);
+ },
+ handlePictureCardPreview(file) {
+ this.dialogFileUrl = file.url;
+ const Base64 = require('js-base64').Base64
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ },
+//鍒犻櫎鍥剧墖
+ handleRemoveFile(file,) {
+
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
+ handleDownload(url) {
+ var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'property_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleEdit()
+ {
+ this.dsb = false
+ this.btn = true
+ },
+ requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+ if(_this.fot.includes(pth) === true)
+ {
+ _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+ }
+
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ }
+
+ }
+}
+
+</script>
+<style scoped lang="scss">
+.mt
+{
+ position: relative;
+}
+.dt{
+ display: block;
+
+}
+.pt{
+ right: 50px;
+ top:-3px;
+ display: block;
+ position: absolute;
+}
+</style>
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ruoyi-ui/src/views/pet/petnote.vue
--
Gitblit v1.9.1