|
@@ -20,6 +20,7 @@ |
|
@@ -20,6 +20,7 @@ |
|
20
|
style="width: 100%;margin-bottom: 20px;"
|
20
|
style="width: 100%;margin-bottom: 20px;"
|
|
21
|
row-key="id"
|
21
|
row-key="id"
|
|
22
|
border
|
22
|
border
|
|
|
|
23
|
+ v-loading = "listLoading"
|
|
23
|
:row-class-name="tableRowClassName"
|
24
|
:row-class-name="tableRowClassName"
|
|
24
|
default-expand-all
|
25
|
default-expand-all
|
|
25
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
26
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
|
@@ -36,7 +37,7 @@ |
|
@@ -36,7 +37,7 @@ |
|
36
|
:formatter="formatType"
|
37
|
:formatter="formatType"
|
|
37
|
width="100">
|
38
|
width="100">
|
|
38
|
</el-table-column>
|
39
|
</el-table-column>
|
|
39
|
- <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width">
|
40
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
40
|
<template slot-scope="scope">
|
41
|
<template slot-scope="scope">
|
|
41
|
<!--<el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>-->
|
42
|
<!--<el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>-->
|
|
42
|
<el-button v-if="scope.row.type=='3'" disabled type="primary" size="small" @click="handleAdd(scope.row)">新增</el-button>
|
43
|
<el-button v-if="scope.row.type=='3'" disabled type="primary" size="small" @click="handleAdd(scope.row)">新增</el-button>
|
|
@@ -255,7 +256,7 @@ |
|
@@ -255,7 +256,7 @@ |
|
255
|
<!--location新增界面-->
|
256
|
<!--location新增界面-->
|
|
256
|
<el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
|
257
|
<el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
|
|
257
|
<el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
|
258
|
<el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
|
|
258
|
- <el-form-item label="公寓名称" prop="adrName">
|
259
|
+ <el-form-item label="名称" prop="adrName">
|
|
259
|
<el-input v-model="addLocationForm.adrName" auto-complete="off" placeholder="请输入名称"></el-input>
|
260
|
<el-input v-model="addLocationForm.adrName" auto-complete="off" placeholder="请输入名称"></el-input>
|
|
260
|
</el-form-item>
|
261
|
</el-form-item>
|
|
261
|
</el-form>
|
262
|
</el-form>
|
|
@@ -271,7 +272,7 @@ |
|
@@ -271,7 +272,7 @@ |
|
271
|
|
272
|
|
|
272
|
<el-input type="hidden" v-model="editLocationForm.id"></el-input>
|
273
|
<el-input type="hidden" v-model="editLocationForm.id"></el-input>
|
|
273
|
|
274
|
|
|
274
|
- <el-form-item label="公寓名称" prop="adrName">
|
275
|
+ <el-form-item label="名称" prop="adrName">
|
|
275
|
<el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
|
276
|
<el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
|
|
276
|
</el-form-item>
|
277
|
</el-form-item>
|
|
277
|
|
278
|
|
|
@@ -555,13 +556,13 @@ |
|
@@ -555,13 +556,13 @@ |
|
555
|
},
|
556
|
},
|
|
556
|
//获取列表
|
557
|
//获取列表
|
|
557
|
getList() {
|
558
|
getList() {
|
|
|
|
559
|
+
|
|
558
|
let para = {
|
560
|
let para = {
|
|
559
|
pageNum: this.pageNum,
|
561
|
pageNum: this.pageNum,
|
|
560
|
pageSize: this.pageSize,
|
562
|
pageSize: this.pageSize,
|
|
561
|
processName: this.filters.processName
|
563
|
processName: this.filters.processName
|
|
562
|
};
|
564
|
};
|
|
563
|
- this.listLoading = true;
|
|
|
|
564
|
- //NProgress.start();
|
565
|
+ this.listLoading= true;
|
|
565
|
getList(para).then((res) => {
|
566
|
getList(para).then((res) => {
|
|
566
|
let resData = res.data.data;
|
567
|
let resData = res.data.data;
|
|
567
|
this.total = resData.total;
|
568
|
this.total = resData.total;
|
