From 79d870e1d8c88c01fa5075e3fb30ad9f0b6f37f7 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 25 四月 2024 15:15:17 +0800
Subject: [PATCH] 修改完254、258、259、260、261错误
---
ruoyi-ui/src/views/self/show.vue | 15 +++++++
ruoyi-ui/src/views/marry/index.vue | 20 +++++++--
ruoyi-ui/src/views/collection/collectionInfo.vue | 2
ruoyi-ui/src/views/travel/index.vue | 5 +-
ruoyi-ui/src/views/clean/cleanInfo.vue | 71 +++++++++++++++++++++++++++++++----
5 files changed, 97 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 25cb049..643c656 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -14,15 +14,19 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="绫诲瀷" prop="kind">
- <template v-if="dsb">
+ <!-- <template v-if="dsb">
<el-input v-model="formData.kind === 1 ? '鏀剁撼':'淇濇磥'" :disabled="true"></el-input>
</template>
<template v-else>
<el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}">
- <el-option label="鏀剁撼" value="1"></el-option>
- <el-option label="淇濇磥" value="0"></el-option>
+ <el-option label="淇濇磥" value='0'></el-option>
+ <el-option label="鏀剁撼" value='1'></el-option>
</el-select>
- </template>
+ </template> -->
+ <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼 " clearable :style="{width: '100%'}" :disabled="dsb" >
+ <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="type">
<el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -281,11 +285,11 @@
},
typeOptions: [{
- value: '0',
+ value: '淇濇磥',
label: '淇濇磥',
},
{
- value: '1',
+ value: '鏀剁撼',
label: '鏀剁撼',
}],
}
@@ -316,6 +320,10 @@
this.loading = true;
getCLeanInfo(id).then((response) => {
this.formData = response.data;
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -358,6 +366,10 @@
this.loading = true;
getCLeanInfo(id).then((response) => {
this.formData = response.data;
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -432,16 +444,27 @@
// this.formData.url = ul+","+uls
this.$refs['elForm'].validate(valid => {
-
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
if (valid) {
if (this.formData.id != undefined) {
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
this.btn=false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
}
}
@@ -515,8 +538,16 @@
this.formData.url = ul+","+uls;
// alert(this.formData.url)
if(res==true){
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
});
@@ -560,8 +591,16 @@
})
this.formData.url = ul+","+uls;
if(res==true){
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
});
}
@@ -617,6 +656,11 @@
console.log(this.uploadFileList1)
let _this = this
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -626,6 +670,10 @@
// this.open = false;
this.getData()
this.fileListOther1=[]
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
});
})
@@ -646,7 +694,10 @@
})
let _this = this
-
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -672,6 +723,10 @@
// alert(87)
updateClean(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
});
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 1cdf1e5..5d81e12 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -60,7 +60,7 @@
</el-col>
<el-col >
<el-form-item label="浠峰��" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.price" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="formData.price" type="number" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-col>
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index d70c533..a37d005 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -570,6 +570,7 @@
limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
//涓汉淇℃伅鏁版嵁
marryList:{
+ id:undefined,
name:undefined,
sex:undefined,
birthday:undefined,
@@ -602,6 +603,7 @@
activeNames:['1'],
// 寮瑰嚭灞傛爣棰�
title: "",
+ iddd:undefined,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// open:true,
@@ -672,13 +674,13 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- id: [{
- required: true,
+ idNo: [{
+ // required: true,
message: '璇疯緭鍏ヨ韩浠借瘉鍙风爜',
trigger: 'blur'
}],
name: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ュ鍚�',
trigger: 'blur'
}],
@@ -688,7 +690,7 @@
trigger: 'change'
}],
marryStatus: [{
- required: true,
+ // required: true,
message: '璇烽�夋嫨濠氬Щ鐘跺喌',
trigger: 'change'
}],
@@ -753,6 +755,7 @@
cancelData() {
this.open = false;
this.reset();
+
},
//涓嬫媺
handleChange(val) {
@@ -782,7 +785,9 @@
this.oldSpouseList = this.marryList.oldSpouseList;
console.log(111)
console.log("淇℃伅")
- console.log(this.marryList);
+ console.log(this.marryList,'1111111111111111111');
+ this.iddd = this.marryList.id
+ console.log(this.iddd,'2222222222222')
//alert(this.marryList.bearStatus)
if(this.marryList.marryStatus===3){
this.showOldSpouse = true;
@@ -969,7 +974,10 @@
this.marryList.handbookStatus =parseInt(this.handsj)
this.marryList.sex = this.sinds
this.marryList.spouseSex = this.inds
+ console.log(this.marryList,'marryListmarryListmarryListmarryList')
+ // this.marryList.id = this.iddd
this.$refs['elForm'].validate(valid => {
+ // alert(valid)
if (valid) {
if (this.marryList.id !== undefined) {
updateMarry(this.marryList).then(response => {
@@ -980,6 +988,7 @@
this.dsb = true
this.isShow_2=false
this.isShow = true
+ this.getList()
}).catch(error => {
console.error(error);
@@ -991,6 +1000,7 @@
}
}
})
+ this.getList()
// 鍒锋柊椤甸潰
// window.location.reload();
},
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 3dd4a39..5bddab2 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1106,6 +1106,21 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'blur'
+ }],
+ people: [{
+ required: true,
+ message: '璇疯緭鍏ヤ汉鐗�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+ trigger: 'blur'
+ }],
//鍩烘湰淇℃伅
nickName: [{
// required: true,
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index b6a91de..18e07c9 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -78,7 +78,7 @@
icon="el-icon-delete"
size="mini"
:disabled="multiple"
- @click="handleDelete1"
+ @click="handleDelete"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
@@ -88,6 +88,7 @@
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column type="expand" :cell-class-name="expandRowClassName">
<template slot-scope="props">
<div >
@@ -829,7 +830,7 @@
this.travelpriceList = response.data.data;
//alert(this.travelpriceList.url)
console.log("0000")
- console.log(this.travelpriceList)
+ console.log(this.travelpriceList,'1111111111111111111111111')
this.total = response.data.total;
this.loading = false;
--
Gitblit v1.9.1