From d0460adaf25a64e37a40422e4931e3b1e5afa521 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 19:14:40 +0800
Subject: [PATCH] 魅宠
---
ruoyi-ui/src/views/pet/petInfo.vue | 201 ++++++++++++++++++++++++++++++++------------------
ruoyi-ui/src/views/pet/index.vue | 38 ++++-----
2 files changed, 145 insertions(+), 94 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 5366a81..11df3f8 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -96,8 +96,9 @@
<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="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">
@@ -159,6 +160,9 @@
<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>
@@ -166,11 +170,9 @@
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕瀛�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="birth">
- <el-input
- v-model='formDat.birth'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-input>
+ <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%'}" >
@@ -348,8 +350,6 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
-
- petList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -370,11 +370,7 @@
dsb:true,
btn:false,
formDat: {
- type: undefined,
- name: undefined,
- sex: undefined,
- color: undefined,
- address: undefined,
+ animal:undefined,
remark: undefined,
url: undefined,
type: undefined,
@@ -439,9 +435,9 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- type: [{
+ animal: [{
required: true,
- message: '璇疯緭鍏ュ搧绉�',
+ message: '璇疯緭鍏ョ绫�',
trigger: 'blue'
}],
idNum: [{
@@ -598,17 +594,17 @@
},
handleRemove(file) {
- for(let i = 0; i < this.fileList.length; i++)
+ for(let i = 0; i < this.fileList1.length; i++)
{
- if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
+ if(this.fileList1[i].url==file.url)
+ this.$delete(this.fileList1,i);
}
},
handleRemoveFile(file) {
- for(let i = 0; i < this.fileListOther.length; i++)
+ for(let i = 0; i < this.fileList2.length; i++)
{
- if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
+ if(this.fileList2[i].url==file.url)
+ this.$delete(this.fileList2,i);
}
},
// 鍙栨秷鎸夐挳
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 8d1b52c..4b1ca0a 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -25,7 +25,7 @@
<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" >
+ v-loading="loading" :data="petList" 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" >
@@ -39,25 +39,26 @@
</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 label="鍑虹敓鏃ユ湡" prop="birth" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-date-picker v-model="petList.birth" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</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-form-item label="棰滆壊" prop="color" label-width="50px" 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-form-item label="楗涔犳儻(鍠�)" prop="eatHabit" label-width="110px" 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-form-item label="鐢熸椿涔犳儻(鍠�)" prop="lifeHabit" label-width="110px" 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>
@@ -78,26 +79,33 @@
<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-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-form-item label="鍚嶅瓧" prop="name" label-width="50px" 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 label="鎬у埆" prop="sex" label-width="50px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <template v-if="dsb">
+ <el-input v-model="petList.sex === 1 ? '闆勬��':'闆屾��'" :disabled="true"></el-input>
+ </template>
+ <template v-else>
+ <el-select v-model="petList.sex" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}">
+ <el-option label="闆屾��" value="0"></el-option>
+ <el-option label="闆勬��" value="1"></el-option>
+ </el-select>
+ </template>
</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-form-item label="绉嶇被" prop="animal" label-width="50px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.animal" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -151,18 +159,18 @@
<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" >
+ v-loading="loading" :data="petList" label-width="120px" >
<el-row :span="5">
<el-form-item label="楗插吇浜哄鍚�" prop="masterName" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
- <el-input v-model="petList.masterName" placeholder="" clearable :style="{width: '100%'}" readonly unselectable="on" >
+ <el-input v-model="petList.masterName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb" >
</el-input>
</el-form-item>
</el-row>
<el-row :span="5">
- <el-form-item label="浣忔墍璇︾粏鍦板潃" prop="masterAddress" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
- <el-input v-model="petList.masterAddress" placeholder="" clearable :style="{width: '100%'}" readonly unselectable="on">
+ <el-form-item label="浣忔墍璇︾粏鍦板潃" prop="masterAddress" label-width="110px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
+ <el-input v-model="petList.masterAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -178,13 +186,13 @@
<el-row :span="5">
<el-form-item label="韬唤璇佸彿" prop="masterIdNum" label-width="80px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
- <el-input v-model="petList.masterIdNum" placeholder="" clearable :style="{width: '100%'}" readonly unselectable="on">
+ <el-input v-model="petList.masterIdNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="5">
<el-form-item label="绉诲姩鐢佃瘽" prop="phone" label-width="100px" style="background: #FAD1E0;border-radius: 6px 6px 0px 6px;opacity: 1;">
- <el-input v-model="petList.phone" placeholder="" clearable :style="{width: '100%'}" readonly unselectable="on">
+ <el-input v-model="petList.phone" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -387,46 +395,115 @@
},
petList: {
type: undefined,
- kind: undefined,
- suitable: undefined,
- method: undefined,
- location:undefined,
- place:undefined,
- remark: 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,
},
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
+ // 琛ㄥ崟鏍￠獙
rules: {
+ animal: [{
+ required: true,
+ message: '璇疯緭鍏ョ绫�',
+ trigger: 'blue'
+ }],
+ idNum: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+ trigger: 'blue'
+ }],
+ securityCode: [{
+ // required: true,
+ message: '璇疯緭鍏ラ槻浼爜',
+ trigger: 'blue'
+ }],
+ name: [{
+ required: true,
+ message: '璇疯緭鍏ュ悕瀛�',
+ trigger: 'blue'
+ }],
+ birth: [{
+ required: true,
+ message: '璇疯緭鍏ュ嚭鐢熸棩鏈�',
+ trigger: 'change'
+ }],
+ color: [{
+ required: true,
+ message: '璇疯緭鍏ラ鑹�',
+ trigger: 'blue'
+ }],
+ properties: [{
+ // required: true,
+ message: '璇疯緭鍏ユ�ц川',
+ trigger: 'blue'
+ }],
+ sex: [{
+ required: true,
+ 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'
+ }],
- 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: [],
@@ -631,29 +708,7 @@
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})
-
- }
- })
-
- }
}
}
--
Gitblit v1.9.1