cnlive_project / cnlive-community-web-vue · Commits

Commit 5511ac9bbf5dd7d6ef7c4f14b93f0219a79a3304

Authored by 张红振
1 parent 108d96ac

fix bug

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
src/views/community/housekeeper/houseDetail.vue
  View file @5511ac9
@@ -85,7 +85,7 @@ const rules = reactive({ @@ -85,7 +85,7 @@ const rules = reactive({
85 required: true, 85 required: true,
86 message: "请输入建筑面积", 86 message: "请输入建筑面积",
87 trigger: "blur", 87 trigger: "blur",
88 - whitespace: true, 88 + // whitespace: true,
89 }, 89 },
90 { 90 {
91 type: "number", 91 type: "number",
@@ -107,7 +107,7 @@ const rules = reactive({ @@ -107,7 +107,7 @@ const rules = reactive({
107 required: true, 107 required: true,
108 message: "请输入使用面积", 108 message: "请输入使用面积",
109 trigger: "blur", 109 trigger: "blur",
110 - whitespace: true, 110 + // whitespace: true,
111 }, 111 },
112 { 112 {
113 type: "number", 113 type: "number",
@@ -217,7 +217,7 @@ defineExpose({ @@ -217,7 +217,7 @@ defineExpose({
217 <el-form-item label="建筑面积:" prop="grossArea"> 217 <el-form-item label="建筑面积:" prop="grossArea">
218 <el-input 218 <el-input
219 v-model="props.formObj.grossArea" 219 v-model="props.formObj.grossArea"
220 - placeholder="请输入使用面积" 220 + placeholder="请输入建筑面积"
221 ></el-input> 221 ></el-input>
222 </el-form-item> 222 </el-form-item>
223 223
src/views/community/housekeeper/index.vue
  View file @5511ac9
@@ -59,7 +59,7 @@ const search = (): void =&gt; { @@ -59,7 +59,7 @@ const search = (): void =&gt; {
59 const edit = (row: Object) => { 59 const edit = (row: Object) => {
60 data.title = "编辑楼宇"; 60 data.title = "编辑楼宇";
61 data.formObj = JSON.parse(JSON.stringify(row)); 61 data.formObj = JSON.parse(JSON.stringify(row));
62 - console.log(data.formObj); 62 + console.log( typeof data.formObj.grossArea);
63 data.formObj.neighborhoodId = JSON.parse(JSON.stringify(row)).neighborhoodId; 63 data.formObj.neighborhoodId = JSON.parse(JSON.stringify(row)).neighborhoodId;
64 data.dialogVisible = true; 64 data.dialogVisible = true;
65 }; 65 };
src/views/ownerManagement/owner/index.vue
  View file @5511ac9
@@ -243,7 +243,8 @@ watchEffect(() =&gt; { @@ -243,7 +243,8 @@ watchEffect(() =&gt; {
243 <span>{{ parseTime(new Date(scope.row.bindDate).getTime()) }}</span> 243 <span>{{ parseTime(new Date(scope.row.bindDate).getTime()) }}</span>
244 </template> 244 </template>
245 </el-table-column> 245 </el-table-column>
246 - <el-table-column label="类型" prop="isOwner"></el-table-column> 246 + <el-table-column label="居住状态" prop="isLiving"></el-table-column>
  247 + <el-table-column label="居民类型" prop="isOwner"></el-table-column>
247 <el-table-column label="操作"> 248 <el-table-column label="操作">
248 <template #default="scope"> 249 <template #default="scope">
249 <el-button type="text" size="mini" @click="checkDetail(scope.row.id,true)"> 250 <el-button type="text" size="mini" @click="checkDetail(scope.row.id,true)">
@@ -256,7 +257,7 @@ watchEffect(() =&gt; { @@ -256,7 +257,7 @@ watchEffect(() =&gt; {
256 编辑</el-button 257 编辑</el-button
257 > 258 >
258 <el-button type="text" size="mini" @click="changeInfo(scope.row.id,0)" 259 <el-button type="text" size="mini" @click="changeInfo(scope.row.id,0)"
259 - >删除</el-button 260 + >删除居民</el-button
260 > 261 >
261 </template> 262 </template>
262 </el-table-column> 263 </el-table-column>