From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 02 二月 2024 15:20:26 +0800
Subject: [PATCH] 提交了修改
---
ruoyi-ui/src/views/pet/petInfo.vue | 367 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 255 insertions(+), 112 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 8d1b52c..e0d5a8c 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>
@@ -131,16 +139,37 @@
<el-col :span="6" :data="petList">
<div class="block" :model="petList" >
<el-col v-model="petList.headPicture" prop="headPicture">
- <el-avatar shape="square" :size=200 >
+ <!-- <el-avatar shape="square" :size=200 >
<el-image
- :src="'http://47.93.189.255:8080/'+ petList.headPicture"
+ :src="'https://www.bendudu.com:8080/'+ petList.headPicture"
:fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
></el-image>
- </el-avatar>
+ </el-avatar> -->
+ <el-upload ref="upload1"
+ action=""
+ :file-list="fileListOther"
+ list-type="picture-card"
+ accept="image/*"
+ :multiple="false"
+ :http-request="requestUpload1"
+ :on-success="handleSucess"
+ :limit="1">
+
+ <el-avatar shape="square" style="width: 200px;;height: 200px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ petList.headPicture"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar>
+ </el-upload>
</el-col>
</div>
- <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button>
+
+<!-- <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button> -->
</el-col>
+
</div>
</el-container>
@@ -151,18 +180,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 +207,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>
@@ -204,25 +233,43 @@
<el-col :span="6" :data="petList">
<div class="block" :model="petList" >
<el-col v-model="petList.fullPicture" prop="fullPicture">
- <el-avatar shape="square" style="width: 1000px;;height: 500px;" >
- <el-image
- :src="'http://47.93.189.255:8080/'+ petList.fullPicture"
- :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
- ></el-image>
- <el-upload class="upload-demo" action="/uploadImage" :on-success="handleUploadSuccess">
- <el-button slot="trigger">鐐瑰嚮涓婁紶鏂板浘鐗�</el-button>
+
+ <el-upload ref="upload"
+ action=""
+ :file-list="fileList"
+ list-type="picture-card"
+ accept="image/*"
+ :multiple="false"
+ :http-request="requestUpload"
+ :on-success="handleSucess"
+ :limit="1">
+
+ <el-avatar shape="square" style="width: 1000px;;height: 500px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ petList.fullPicture"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar>
</el-upload>
- </el-avatar>
+
+
+
</el-col>
</div>
- <el-button>淇敼</el-button>
+
</el-col>
+
</div>
+ <div class="form-header mt">
-
-
+</div>
+ <div>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button>
+ </div>
<el-dialog :visible.sync="dialogVisible">
<img w-full :src="dialogImageUrl" alt="Preview Image" />
@@ -353,7 +400,10 @@
return {
cdi:"榄呭疇璇︾粏淇℃伅",
udi:"榄呭疇淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -387,46 +437,116 @@
},
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,
+ btn: 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: [],
@@ -443,13 +563,16 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
- document.title = "淇敼榄呭疇璇︾粏淇℃伅";
+ this.isShow = true
+
+ // document.title = "淇敼榄呭疇璇︾粏淇℃伅";
this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
+ // document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.btn = false;
+ this.isShow = false;
}
let _this = this
@@ -459,6 +582,7 @@
getPetList(id).then((response) => {
this.petList = response.data;
console.log(this.petList)
+ // alert(this.petList.headPicture)
this.loading = false;
});
// getPetowner(id).then((response) => {
@@ -476,34 +600,17 @@
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)
this.queryParams.pid = this.pid;
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listPetnote(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
this.PetNoteList = response.data.data;
+
this.total = response.data.total;
this.loading = false;
}
);
},
- 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)
- _this.fileList1.push({name:response.data.fileName, url:response.data.url})
- console("ok")
- })
-
- },
requestUpload2(params)
{
var file = params.file;
@@ -521,14 +628,14 @@
},
submitForm() {
- let ul = this.fileList1.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileList2.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.petList.headPicture = ul,
- this.petList.fullPicture = uls,
+ // let ul = this.fileList1.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = this.fileList2.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.petList.headPicture = ul,
+ // this.petList.fullPicture = uls,
this.$refs['elForm'].validate(valid => {
@@ -631,6 +738,11 @@
this.dsb = false
this.btn = true
},
+ handleSucess()
+ {
+ // alert(15)
+ this.$refs.upload.clearFiles();
+ },
requestUpload(params)
{
var file = params.file;
@@ -638,28 +750,59 @@
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)
+ this.$refs.upload.clearFiles();
+ // this.uploading1 = true;
+ //alert(100)
+ uploadPic(formData).then(response => {
+ // alert(18)
+ // 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})
+ // console("ok")
+ // alert(90)
+ // alert(response.data.url)
+ _this.petList.fullPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ updatePet(_this.petList).then(response => {
+ _this.$modal.msgSuccess("鍥惧儚淇敼鎴愬姛");
+ // this.open = false;
+ _this.btn=false
+ });
+ // alert(100)
+ })
+ //alert(90)
+ },
+requestUpload1(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
- 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})
-
- }
- })
-
- }
+ this.$refs.upload1.clearFiles();
+ // this.uploading1 = true;
+ //alert(100)
+ uploadPic(formData).then(response => {
+ // alert(18)
+ // 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})
+ // console("ok")
+ // alert(90)
+ // alert(response.data.url)
+ _this.petList.headPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ updatePet(_this.petList).then(response => {
+ _this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ _this.btn=false
+ });
+ // alert(100)
+ })
+ //alert(90)
+ },
}
}
</script>
-<style scoped lang="scss">
+<style scoped>
.mt
{
position: relative;
@@ -668,7 +811,7 @@
display: block;
}
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
display: none;
}
.form{
--
Gitblit v1.9.1