From 601c3e854e74a15932fb502145f48cc0a773a611 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 07 四月 2023 16:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/note/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index e51907f..c8a0e53 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -20,7 +20,7 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ユ爣棰�"
clearable
- style="width: 240px"title
+ style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -114,11 +114,14 @@
<el-table-column label="鎸佹湁浜�" prop="holder" sortable width="100" />
<el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="100" />
<el-table-column label="澶囨敞淇℃伅" prop="remark" sortable width="100" />
+ <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" sortable prop="createTime" width="180">
+
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
+
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -176,6 +179,11 @@
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+ <el-form-item label="瀹跺涵鍙�" prop="familyId">
+ <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
@@ -312,6 +320,7 @@
address: undefined,
remark: undefined,
url: undefined,
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -326,7 +335,8 @@
location:undefined,
holder:undefined,
address:undefined,
- createTime:undefined
+ createTime:undefined,
+
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -361,9 +371,9 @@
message: '璇疯緭鍏ュ叿浣撲綅缃�',
trigger: 'blur'
}],
- remark: [{
+ familyId: [{
required: true,
- message: '璇疯緭鍏ュ娉�',
+ message: '璇疯緭鍏amilyId',
trigger: 'blur'
}],
createTime: [{
@@ -477,7 +487,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family/note1/propertyInfo/" + id);
+ this.$router.push("/family/property/note1/propertyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -485,7 +495,7 @@
let jd = true
this.$router.push({
- path:"/family/note1/propertyInfo/" + id,
+ path:"/family/property/note1/propertyInfo/" + id,
query:{
detail:jd
}
--
Gitblit v1.9.1