83d5ddee by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents c6aaed86 b79e8e27
...@@ -18,51 +18,54 @@ ...@@ -18,51 +18,54 @@
18 > 18 >
19 <el-table-column prop="index" width="50" :render-header="renderHeader"> 19 <el-table-column prop="index" width="50" :render-header="renderHeader">
20 <template slot-scope="scope"> 20 <template slot-scope="scope">
21 <div style="text-align: center"> 21 <div style="text-align: center">{{ scope.$index + 1 }}</div>
22 {{ scope.$index + 1 }}
23 </div>
24 </template> 22 </template>
25 </el-table-column> 23 </el-table-column>
26 <el-table-column prop="bdcdyh" label="不动产单元号" min-width="100"> 24 <el-table-column prop="bdcdyh" label="不动产单元号" min-width="100">
27 <template slot-scope="scope"> 25 <template slot-scope="scope">
28 <div style="text-align: center"> 26 <div style="text-align: center">{{ scope.row.bdcdyh }}</div>
29 {{ scope.row.bdcdyh }}
30 </div>
31 </template> 27 </template>
32 </el-table-column> 28 </el-table-column>
33 <el-table-column prop="xmmc" label="项目名称" min-width="100"> 29 <el-table-column prop="xmmc" label="项目名称" min-width="100">
34 <template slot-scope="scope"> 30 <template slot-scope="scope">
35 <div style="text-align: center"> 31 <div style="text-align: center">{{ scope.row.xmmc }}</div>
36 {{ scope.row.xmmc }} 32 </template>
37 </div> 33 </el-table-column>
34 <el-table-column prop="zcs" label="总层数" min-width="100">
35 <template slot-scope="scope">
36 <div style="text-align: center">{{ scope.row.zcs }}</div>
37 </template>
38 </el-table-column>
39 <el-table-column prop="ytmc" label="房屋用途" min-width="100">
40 <template slot-scope="scope">
41 <div style="text-align: center">{{ scope.row.ytmc }}</div>
42 </template>
43 </el-table-column>
44 <el-table-column prop="fwjgmc" label="房屋结构" min-width="100">
45 <template slot-scope="scope">
46 <div style="text-align: center">{{ scope.row.fwjgmc }}</div>
38 </template> 47 </template>
39 </el-table-column> 48 </el-table-column>
40 <el-table-column prop="jzmj" label="建筑面积" min-width="100"> 49 <el-table-column prop="jzmj" label="建筑面积" min-width="100">
41 <template slot-scope="scope"> 50 <template slot-scope="scope">
42 <div style="text-align: center"> 51 <div style="text-align: center">{{ scope.row.jzmj }}</div>
43 {{ scope.row.jzmj }}
44 </div>
45 </template> 52 </template>
46 </el-table-column> 53 </el-table-column>
47 <el-table-column prop="ytmc" label="用途名称" min-width="100"> 54 <el-table-column prop="jgsj" label="竣工时间" min-width="100">
48 <template slot-scope="scope"> 55 <template slot-scope="scope">
49 <div style="text-align: center"> 56 <div style="text-align: center">{{ scope.row.jgsj }}</div>
50 {{ scope.row.ytmc }}
51 </div>
52 </template> 57 </template>
53 </el-table-column> 58 </el-table-column>
54 <el-table-column prop="fwjgmc" label="房屋结构名称" min-width="100"> 59 <el-table-column prop="zts" label="总套数" min-width="100">
55 <template slot-scope="scope"> 60 <template slot-scope="scope">
56 <div style="text-align: center"> 61 <div style="text-align: center">{{ scope.row.zts }}</div>
57 {{ scope.row.fwjgmc }}
58 </div>
59 </template> 62 </template>
60 </el-table-column> 63 </el-table-column>
61 </el-table> 64 </el-table>
62 </div> 65 </div>
63 </template> 66 </template>
64 <script> 67 <script>
65 import {mapGetters} from "vuex"; 68 import { mapGetters } from "vuex";
66 69
67 export default { 70 export default {
68 computed: { 71 computed: {
...@@ -84,11 +87,10 @@ export default { ...@@ -84,11 +87,10 @@ export default {
84 return { 87 return {
85 // 键名转换,方法默认是label和children进行树状渲染 88 // 键名转换,方法默认是label和children进行树状渲染
86 key: 0, 89 key: 0,
87 tableDataList: [] 90 tableDataList: [],
88 }; 91 };
89 }, 92 },
90 mounted() { 93 mounted() {},
91 },
92 watch: { 94 watch: {
93 tableData: { 95 tableData: {
94 handler: function (val, oldVal) { 96 handler: function (val, oldVal) {
...@@ -133,7 +135,7 @@ export default { ...@@ -133,7 +135,7 @@ export default {
133 )} 135 )}
134 </div> 136 </div>
135 ); 137 );
136 } 138 },
137 }, 139 },
138 }; 140 };
139 </script> 141 </script>
......
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
102 :default-expand-level="1" 102 :default-expand-level="1"
103 :show-count="true" 103 :show-count="true"
104 :options="dictData['A9']" /> 104 :options="dictData['A9']" />
105
106 </el-form-item> 105 </el-form-item>
107 </el-col> 106 </el-col>
108 </el-row> 107 </el-row>
......