From 3a3913a98d2b2394990ec62387834360adeb8b58 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期三, 10 四月 2024 14:27:09 +0800
Subject: [PATCH] 解决了245、246、247bug
---
ruoyi-ui/src/views/marry/index.vue | 10 +++++-----
ruoyi-ui/src/views/pet/petInfo.vue | 6 +++++-
ruoyi-ui/src/views/pet/noteInfo.vue | 14 +++++++-------
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 228acc9..d70c533 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -26,7 +26,7 @@
</el-row>
<el-row :span="16">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday" label-width="75px">
-
+
<el-date-picker v-model="marryList.birthday"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
@@ -607,6 +607,8 @@
// open:true,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
bear:undefined,
+ handsj:undefined,
+ onebear:undefined,
mrs:undefined,
smrs:undefined,
openDataScope: false,
@@ -780,7 +782,7 @@
this.oldSpouseList = this.marryList.oldSpouseList;
console.log(111)
console.log("淇℃伅")
- console.log(this.marryList.marryStatus);
+ console.log(this.marryList);
//alert(this.marryList.bearStatus)
if(this.marryList.marryStatus===3){
this.showOldSpouse = true;
@@ -959,9 +961,7 @@
this.marryList.marryStatus = parseInt(this.mrs)
if(this.smrs!=undefined)
this.marryList.spouseMarryStatus = parseInt(this.smrs)
- // console.log(this.bear)
- // alert(this.bear)
- // if( parseInt(this.bear))
+
if(this.bear!=undefined)
this.marryList.bearStatus = parseInt(this.bear)
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 079165a..5741009 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -342,13 +342,13 @@
}
},
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
+ // 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 => {
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index cf3fac5..00d936b 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -96,7 +96,7 @@
<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-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>
@@ -581,6 +581,10 @@
this.loading = true;
getPetList(id).then((response) => {
this.petList = response.data;
+ if(this.petList.sex==1)
+ this.petList.sex = '闆勬��'
+ else
+ this.petList.sex = '闆屾��'
console.log(this.petList)
// alert(this.petList.headPicture)
this.loading = false;
--
Gitblit v1.9.1