From 934b3374ee33ea37656fda229e25dc1d6ed61d7d Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 07 四月 2023 18:42:19 +0800
Subject: [PATCH] show.vue 把全部的formdata替换为了individualList bignote/index.js 里面把getFamilyeventInfo里面的/family/zfEvent/{id}修改为了/family/zfEvent/
---
ruoyi-ui/src/views/note/propertylnfo.vue | 2
ruoyi-ui/src/views/self/index.vue | 27 ++++++++-----
ruoyi-ui/src/views/self/show.vue | 39 ++++++++++---------
ruoyi-ui/src/api/bignote/index.js | 2
ruoyi-ui/src/views/bignote/index.vue | 14 ++++---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 3 +
ruoyi-ui/src/router/index.js | 2
ruoyi-ui/src/views/note/index.vue | 5 +-
8 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/ruoyi-ui/src/api/bignote/index.js b/ruoyi-ui/src/api/bignote/index.js
index 5bad6ab..7d9cdca 100644
--- a/ruoyi-ui/src/api/bignote/index.js
+++ b/ruoyi-ui/src/api/bignote/index.js
@@ -14,7 +14,7 @@
// 鏍规嵁id鏌ヨ鎵�鏈夊搴祫浜ц缁嗕俊鎭�
export function getFamilyeventInfo(id) {
return request({
- url: '/family/zfEvent/{id}' + id,
+ url: '/family/zfEvent/' + id,
method: 'get',
})
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index dcfd368..73e7673 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -121,7 +121,7 @@
children: [
{
path: 'propertyInfo/:id(\\d+)',
- component: () => import('@/views/note/propertyInfo'),
+ component: () => import('@/views/note/propertylnfo'),
name: 'propertyInfo',
meta: { title: '鏌ヨ璇︽儏'}
}
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 5688836..08fc0d5 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -212,9 +212,12 @@
}
let _this = this
+
if (id) {
+
this.loading = true;
getFamilyeventInfo(id).then((response) => {
+
this.formData = response.data;
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 27b8e72..7e5fbc1 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -407,11 +407,11 @@
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listFamilyevent(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
+
+ // console.log(response.data.data)
this.familyList = response.data.data;
this.total = response.data.total;
@@ -456,6 +456,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -483,7 +484,8 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family/zfEvent/bignote/familyeventInfo/" + id);
+
+ this.$router.push("/family1/bignote/familyeventInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -491,7 +493,7 @@
let jd = true
this.$router.push({
- path:"/family/zfEvent/bignote/familyeventInfo/" + id,
+ path:"/family1/bignote/familyeventInfo/" + id,
query:{
detail:jd
}
@@ -519,7 +521,7 @@
addFamilyevent(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList1();
+ this.getList();
});
}
});
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index c8a0e53..e6ea2a7 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -487,7 +487,8 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family/property/note1/propertyInfo/" + id);
+
+ this.$router.push("/family/note1/propertyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -495,7 +496,7 @@
let jd = true
this.$router.push({
- path:"/family/property/note1/propertyInfo/" + id,
+ path:"/family/note1/propertyInfo/" + id,
query:{
detail:jd
}
diff --git a/ruoyi-ui/src/views/note/propertylnfo.vue b/ruoyi-ui/src/views/note/propertylnfo.vue
index 55d5b69..973f6e4 100644
--- a/ruoyi-ui/src/views/note/propertylnfo.vue
+++ b/ruoyi-ui/src/views/note/propertylnfo.vue
@@ -348,7 +348,7 @@
}
</script>
-<style>
+<style scoped lang="scss">
.mt
{
position: relative;
diff --git a/ruoyi-ui/src/views/self/index.vue b/ruoyi-ui/src/views/self/index.vue
index 18ace9a..dd89284 100644
--- a/ruoyi-ui/src/views/self/index.vue
+++ b/ruoyi-ui/src/views/self/index.vue
@@ -9,7 +9,7 @@
<h1 style="font-size:21px">涓汉绠�鍘�</h1>
<el-divider />
<h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
-
+<!--
<el-container>
<div style="padding-left:30px">
<el-container>
@@ -157,7 +157,7 @@
</el-col>
</el-container>
</div>
- </el-container>
+ </el-container> -->
<div style="padding-top:30px">
@@ -176,6 +176,13 @@
</el-table-column>
</el-table>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
</div>
<div style="padding-top:30px">
@@ -187,12 +194,13 @@
<!-- :data =""鍐呯殑涓滆タ涓嶇煡閬撹涓嶈鏀�-->
<el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="16" align="center" />
- <el-table-column label="涓庢湰浜哄叧绯�" sortable width="270" align="center" />
+ <el-table-column label="涓庢湰浜哄叧绯�" prop="" width="270" align="center" />
<el-table-column label="濮撳悕" sortable width="270" align="center" />
<el-table-column label="鍗曚綅鍙婅亴鍔�" sortable width="270" align="center" />
<el-table-column label="鏀挎不闈㈣矊" sortable width="270" align="center">
</el-table-column>
</el-table>
+
</div>
<el-container>
@@ -232,19 +240,15 @@
</el-table>
</div>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+
</div>
</template>
<script>
-import {getIndividualInfo, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
+import {getIndividualInfo, getIndividualRelation,
+delIndividual, updateIndividual, addIndividual,listExperience,
+updateExperience,
addExperience,delExperience} from "@/api/self/index";
export default {
@@ -477,6 +481,7 @@
listExperience(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
+ alert(123)
this.experiencelList = response.data.data;
this.total = response.data.total;
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 41ac96b..fa655ef 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -35,19 +35,19 @@
v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
<el-row :span="6">
<el-form-item label="濮撳悕" prop="nickName">
- <el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="6">
<el-form-item label="鏇剧敤鍚�" prop="oldName">
- <el-input v-model="formData.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="8">
<el-form-item label="韬唤璇佸彿" prop="idNum">
- <el-input v-model="formData.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -84,22 +84,22 @@
<div style="padding-left:70px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="70px" label-position="left">
<el-row :span="6">
<el-form-item label="鎬у埆" prop="sex">
- <el-input v-model="formData.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="6">
<el-form-item label="姘戞棌" prop="nation">
- <el-input v-model="formData.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="8">
<el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
- <el-input v-model="formData.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -111,16 +111,16 @@
<div style="padding-left:70px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left":disabled="dsb">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="70px" label-position="left":disabled="dsb">
<el-row :span="6">
<el-form-item label="鍥界睄" prop="nationality">
- <el-input v-model="formData.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="6">
<el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus">
- <el-input v-model="formData.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -188,22 +188,22 @@
<div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="110px" label-position="left">
<el-row :span="15">
<el-form-item label="鎴风睄鍦板潃" prop="locationAddress">
- <el-input v-model="formData.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="15">
<el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress">
- <el-input v-model="formData.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="15">
<el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="unit position ">
- <el-input v-model:unit="formData.unit" v-model:position="formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model:unit="individualList.unit" v-model:position="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
<template slot-scope="scope">
{{scope.row.unit}}/{{scope.row.position}}
</template>
@@ -218,16 +218,16 @@
<div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="110px" label-position="left">
<el-row :span="12">
<el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice">
- <el-input v-model="formData.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
<el-row :span="12">
<el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice">
- <el-input v-model="formData. alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -645,8 +645,10 @@
getIndividualList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
+ //alert(123)
this.individualList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
+ // console.log(this.individualList)
this.loading = false;
}
);
@@ -820,4 +822,3 @@
}
};
</script>
-
--
Gitblit v1.9.1