Merge remote-tracking branch 'origin/master'
Showing
6 changed files
with
255 additions
and
211 deletions
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | v-for="(items, index) in countList" | 5 | v-for="(items, index) in countList" |
6 | :key="items.id" | 6 | :key="items.id" |
7 | > | 7 | > |
8 | <template v-for="(childItem,childIndex) in items.addQjTdytRequestList" > | 8 | <template v-for="(childItem,childIndex) in items.list" > |
9 | <el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''"> | 9 | <el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''"> |
10 | <el-button | 10 | <el-button |
11 | v-show="childIndex<1" | 11 | v-show="childIndex<1" |
... | @@ -78,6 +78,7 @@ | ... | @@ -78,6 +78,7 @@ |
78 | <el-date-picker | 78 | <el-date-picker |
79 | v-model="childItem.tdsyqssj" | 79 | v-model="childItem.tdsyqssj" |
80 | type="date" | 80 | type="date" |
81 | value-format="yyyy-MM-dd" | ||
81 | placeholder="选择日期" | 82 | placeholder="选择日期" |
82 | > | 83 | > |
83 | </el-date-picker> | 84 | </el-date-picker> |
... | @@ -139,6 +140,7 @@ | ... | @@ -139,6 +140,7 @@ |
139 | <el-date-picker | 140 | <el-date-picker |
140 | v-model="childItem.tdsyjssj" | 141 | v-model="childItem.tdsyjssj" |
141 | type="date" | 142 | type="date" |
143 | value-format="yyyy-MM-dd" | ||
142 | placeholder="选择日期" | 144 | placeholder="选择日期" |
143 | > | 145 | > |
144 | </el-date-picker> | 146 | </el-date-picker> |
... | @@ -182,7 +184,7 @@ export default { | ... | @@ -182,7 +184,7 @@ export default { |
182 | "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM | 184 | "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM |
183 | "qlxzdm": "", | 185 | "qlxzdm": "", |
184 | "zhqlxzlx": "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质 | 186 | "zhqlxzlx": "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质 |
185 | addQjTdytRequestList:[ | 187 | list:[ |
186 | { | 188 | { |
187 | "pzdjbsm": "", | 189 | "pzdjbsm": "", |
188 | "pzdjmc": "", | 190 | "pzdjmc": "", |
... | @@ -219,7 +221,7 @@ export default { | ... | @@ -219,7 +221,7 @@ export default { |
219 | "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM | 221 | "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM |
220 | "qlxzdm": "", | 222 | "qlxzdm": "", |
221 | "zhqlxzlx": "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质 | 223 | "zhqlxzlx": "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质 |
222 | addQjTdytRequestList:[ | 224 | list:[ |
223 | { | 225 | { |
224 | "pzdjbsm": "", | 226 | "pzdjbsm": "", |
225 | "pzdjmc": "", | 227 | "pzdjmc": "", |
... | @@ -271,11 +273,11 @@ export default { | ... | @@ -271,11 +273,11 @@ export default { |
271 | "tdzh": "" | 273 | "tdzh": "" |
272 | }; | 274 | }; |
273 | if (type === "add") { | 275 | if (type === "add") { |
274 | this.countList[index].addQjTdytRequestList.splice(childIndex + 1, 0, insideObj); | 276 | this.countList[index].list.splice(childIndex + 1, 0, insideObj); |
275 | } else { | 277 | } else { |
276 | this.countList[index].addQjTdytRequestList.forEach((item, childInd) => { | 278 | this.countList[index].list.forEach((item, childInd) => { |
277 | if (childIndex == childInd && this.countList[index].addQjTdytRequestList.length > 1) { | 279 | if (childIndex == childInd && this.countList[index].list.length > 1) { |
278 | this.countList[index].addQjTdytRequestList.splice(childIndex, 1); | 280 | this.countList[index].list.splice(childIndex, 1); |
279 | } | 281 | } |
280 | }); | 282 | }); |
281 | } | 283 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main"> |
3 | <SearchHead @getSearchCondition="getData"></SearchHead> | 3 | <SearchHead @getSearchCondition="geQuerytData"></SearchHead> |
4 | <div class="dataGrid" ref="dataGrid"> | 4 | <div class="dataGrid" ref="dataGrid"> |
5 | <el-table | 5 | <el-table |
6 | :data="tableData" | 6 | :data="tableData" |
7 | :height="tableHeight" | 7 | :height="tableHeight" |
8 | :row-class-name="tableRowClassName" | 8 | :row-class-name="tableRowClassName" |
9 | > | 9 | > |
10 | <el-table-column type="index" width="80" align="center" label="序号"> | 10 | <el-table-column type="index" width="80" align="center" label="序号"> |
11 | </el-table-column> | 11 | </el-table-column> |
12 | <el-table-column label="操作" width="100"> | 12 | <el-table-column label="操作" width="100"> |
13 | <template slot-scope="scope"> | 13 | <template slot-scope="scope"> |
14 | <el-button @click="handleClick(scope.row)" type="text" size="small" | 14 | <el-button @click="handleClick(scope.row)" type="text" size="small" |
15 | >办理</el-button | 15 | >办理 |
16 | > | 16 | </el-button |
17 | <el-button type="text" size="small">定位</el-button> | 17 | > |
18 | </template> | 18 | <el-button type="text" size="small">定位</el-button> |
19 | </el-table-column> | 19 | </template> |
20 | <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> | 20 | </el-table-column> |
21 | </el-table-column> | 21 | <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> |
22 | <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> | 22 | </el-table-column> |
23 | </el-table-column> | 23 | <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> |
24 | <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> | 24 | </el-table-column> |
25 | </el-table-column> | 25 | <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> |
26 | <el-table-column prop="lx" align="left" width="120" label="类型"> | 26 | </el-table-column> |
27 | </el-table-column> | 27 | <el-table-column prop="lx" align="left" width="120" label="类型"> |
28 | <el-table-column prop="qlr" align="left" width="120" label="权利人"> | 28 | </el-table-column> |
29 | </el-table-column> | 29 | <el-table-column prop="qlr" align="left" width="120" label="权利人"> |
30 | <el-table-column prop="zl" align="left" label="坐落"> </el-table-column> | 30 | </el-table-column> |
31 | <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> | 31 | <el-table-column prop="zl" align="left" label="坐落"></el-table-column> |
32 | </el-table-column> | 32 | <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> |
33 | <el-table-column prop="cjr" align="left" width="120" label="创建人"> | 33 | </el-table-column> |
34 | </el-table-column> | 34 | <el-table-column prop="cjr" align="left" width="120" label="创建人"> |
35 | </el-table> | 35 | </el-table-column> |
36 | <div class="pagination"> | 36 | </el-table> |
37 | <el-pagination background layout="prev, pager, next" :total="1000"> | 37 | <div class="pagination"> |
38 | </el-pagination> | 38 | <el-pagination background layout="prev, pager, next" :total="1000"> |
39 | </div> | 39 | </el-pagination> |
40 | </div> | 40 | </div> |
41 | </div> | 41 | </div> |
42 | </div> | ||
42 | </template> | 43 | </template> |
43 | 44 | ||
44 | <script> | 45 | <script> |
45 | import SearchHead from "../../../components/searchHead/searchHead"; | 46 | import SearchHead from "../../../components/searchHead/searchHead"; |
46 | export default { | 47 | import {getSearchList} from "../../../api/search"; |
47 | name: "", | ||
48 | components: { SearchHead }, | ||
49 | props: {}, | ||
50 | data() { | ||
51 | return { | ||
52 | formData: { | ||
53 | user: "", | ||
54 | region: "", | ||
55 | type: [], | ||
56 | }, | ||
57 | tableData: [ | ||
58 | { | ||
59 | bdcdyh: "610101001001GB00001W", | ||
60 | xmmc: "万科集团万科城", | ||
61 | bdcqzh: "陕(2017)西安市不动产权第00000", | ||
62 | lx: "宗地", | ||
63 | qlr: "李子新", | ||
64 | zl: "灞桥-田家湾-咸宁东路,近浐河西路", | ||
65 | zrsj: "2020.09.07 ", | ||
66 | cjr: "李子新", | ||
67 | }, | ||
68 | ], | ||
69 | tableHeight: "", | ||
70 | }; | ||
71 | }, | ||
72 | created() {}, | ||
73 | mounted() { | ||
74 | for (let i = 0; i < 11; i++) { | ||
75 | let obj = { | ||
76 | bdcdyh: "610101001001GB00001W", | ||
77 | xmmc: "万科集团万科城", | ||
78 | bdcqzh: "陕(2017)西安市不动产权第00000", | ||
79 | lx: "自然幢", | ||
80 | qlr: "李子新", | ||
81 | zl: "灞桥-田家湾-咸宁东路,近浐河西路", | ||
82 | zrsj: "2020.09.07 ", | ||
83 | cjr: "李子新", | ||
84 | }; | ||
85 | this.tableData.push(obj); | ||
86 | } | ||
87 | this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; | ||
88 | }, | ||
89 | methods: { | ||
90 | onSubmit() {}, | ||
91 | tableRowClassName({ row, rowIndex }) { | ||
92 | if (rowIndex % 2 !== 0) { | ||
93 | return "even-row"; | ||
94 | } else { | ||
95 | return ""; | ||
96 | } | ||
97 | }, | ||
98 | 48 | ||
99 | //获取子组件点击查询触发的事件 | 49 | export default { |
100 | getData(obj) { | 50 | name: "", |
101 | console.log(obj); | 51 | components: {SearchHead}, |
102 | //将obj作为参数调用接口查询表格数据 | 52 | props: {}, |
103 | }, | 53 | data() { |
104 | //点击办理 | 54 | return { |
105 | handleClick(row) { | 55 | total: 0, |
106 | let path = ""; | 56 | pageNo: 1, |
107 | switch (row.lx) { | 57 | pageSize: 10, |
108 | case "自然幢": | 58 | queryData: {}, |
109 | path = "/zrz"; | 59 | formData: { |
110 | break; | 60 | user: "", |
111 | case "宗地": | 61 | region: "", |
112 | path = "/zd"; | 62 | type: [], |
113 | break; | 63 | }, |
114 | default: | 64 | tableData: [], |
115 | break; | 65 | tableHeight: "", |
116 | } | 66 | }; |
117 | this.$router.push(path); | 67 | }, |
118 | }, | 68 | created() { |
119 | }, | 69 | }, |
120 | computed: {}, | 70 | mounted() { |
121 | watch: {}, | 71 | this.getData({}) |
122 | }; | 72 | this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; |
73 | }, | ||
74 | methods: { | ||
75 | handleCurrentChange(val) { | ||
76 | console.log(`当前页: ${val}`); | ||
77 | this.pageNo = val; | ||
78 | this.queryData.pageNo = val; | ||
79 | this.getData(this.queryData); | ||
80 | }, | ||
81 | getData(data) { | ||
82 | getSearchList(data).then(res => { | ||
83 | this.tableData = res.result.records | ||
84 | this.total = res.result.total | ||
85 | }) | ||
86 | }, | ||
87 | //获取子组件点击查询触发的事件 | ||
88 | geQuerytData(obj) { | ||
89 | this.queryData = obj | ||
90 | //将obj作为参数调用接口查询表格数据 | ||
91 | this.queryData['pageSize'] = this.pageSize | ||
92 | this.pageNo = 1 | ||
93 | this.queryData['pageNo'] = 1 | ||
94 | this.getData(this.queryData) | ||
95 | }, | ||
96 | onSubmit() { | ||
97 | }, | ||
98 | tableRowClassName({row, rowIndex}) { | ||
99 | if (rowIndex % 2 !== 0) { | ||
100 | return "even-row"; | ||
101 | } else { | ||
102 | return ""; | ||
103 | } | ||
104 | }, | ||
105 | //点击办理 | ||
106 | handleClick(row) { | ||
107 | let path = ""; | ||
108 | switch (row.lx) { | ||
109 | case "自然幢": | ||
110 | path = "/zrz"; | ||
111 | break; | ||
112 | case "宗地": | ||
113 | path = "/zd"; | ||
114 | break; | ||
115 | default: | ||
116 | break; | ||
117 | } | ||
118 | this.$router.push(path); | ||
119 | }, | ||
120 | }, | ||
121 | computed: {}, | ||
122 | watch: {}, | ||
123 | }; | ||
123 | </script> | 124 | </script> |
124 | <style scoped lang="less"> | 125 | <style scoped lang="less"> |
125 | .main { | 126 | .main { |
126 | width: 100%; | 127 | width: 100%; |
127 | height: 100%; | 128 | height: 100%; |
128 | box-sizing: border-box; | 129 | box-sizing: border-box; |
129 | padding: 0 18px; | 130 | padding: 0 18px; |
130 | display: flex; | 131 | display: flex; |
131 | flex-direction: column; | 132 | flex-direction: column; |
132 | background-color: #fcfdff; | 133 | background-color: #fcfdff; |
133 | .demo-form-inline { | 134 | .demo-form-inline { |
134 | margin-top: 18px; | 135 | margin-top: 18px; |
135 | .moreSearchBtn { | 136 | .moreSearchBtn { |
136 | background-color: #1ad6e1; | 137 | background-color: #1ad6e1; |
137 | border-color: #1ad6e1; | 138 | border-color: #1ad6e1; |
138 | } | 139 | } |
139 | .moreSearchBtn:focus, | 140 | .moreSearchBtn:focus, |
140 | .moreSearchBtn:hover { | 141 | .moreSearchBtn:hover { |
141 | background-color: rgba(28, 200, 229, 0.6); | 142 | background-color: rgba(28, 200, 229, 0.6); |
142 | } | 143 | } |
143 | } | 144 | } |
144 | .dataGrid { | 145 | .dataGrid { |
145 | flex: 1; | 146 | flex: 1; |
146 | .pagination { | 147 | .pagination { |
147 | padding: 18px 0; | 148 | padding: 18px 0; |
148 | } | 149 | } |
149 | } | 150 | } |
150 | } | 151 | } |
151 | </style> | 152 | </style> | ... | ... |
... | @@ -17,8 +17,8 @@ | ... | @@ -17,8 +17,8 @@ |
17 | :value="item.xzqbsm"> | 17 | :value="item.xzqbsm"> |
18 | </el-option> | 18 | </el-option> |
19 | </el-select> | 19 | </el-select> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | <el-form-item > | 21 | <el-form-item > |
22 | <el-select v-model="djqValue" style="width:130px;" placeholder="地籍区" @change="changeDjq(djqValue)"> | 22 | <el-select v-model="djqValue" style="width:130px;" placeholder="地籍区" @change="changeDjq(djqValue)"> |
23 | <el-option | 23 | <el-option |
24 | v-for="item in djq" | 24 | v-for="item in djq" |
... | @@ -27,8 +27,8 @@ | ... | @@ -27,8 +27,8 @@ |
27 | :value="item.bsm"> | 27 | :value="item.bsm"> |
28 | </el-option> | 28 | </el-option> |
29 | </el-select> | 29 | </el-select> |
30 | </el-form-item> | 30 | </el-form-item> |
31 | <el-form-item > | 31 | <el-form-item > |
32 | <el-select v-model="djzqValue" style="width:150px;" placeholder="地籍子区"> | 32 | <el-select v-model="djzqValue" style="width:150px;" placeholder="地籍子区"> |
33 | <el-option | 33 | <el-option |
34 | v-for="item in djzq" | 34 | v-for="item in djzq" |
... | @@ -37,7 +37,7 @@ | ... | @@ -37,7 +37,7 @@ |
37 | :value="item.bsm"> | 37 | :value="item.bsm"> |
38 | </el-option> | 38 | </el-option> |
39 | </el-select> | 39 | </el-select> |
40 | </el-form-item> | 40 | </el-form-item> |
41 | <el-form-item label="项目名称"> | 41 | <el-form-item label="项目名称"> |
42 | <el-input | 42 | <el-input |
43 | v-model="zdProjectName" | 43 | v-model="zdProjectName" |
... | @@ -194,7 +194,7 @@ export default { | ... | @@ -194,7 +194,7 @@ export default { |
194 | this.close(); | 194 | this.close(); |
195 | this.$router.push("/zd"); | 195 | this.$router.push("/zd"); |
196 | } else { | 196 | } else { |
197 | this.$message.error("创建失败!"); | 197 | this.$message.error(res.message); |
198 | } | 198 | } |
199 | }) | 199 | }) |
200 | .catch((error) => {}); | 200 | .catch((error) => {}); | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main"> |
3 | <SearchHead @getSearchCondition="getData"></SearchHead> | 3 | <SearchHead @getSearchCondition="geQuerytData"></SearchHead> |
4 | <div class="dataGrid" ref="dataGrid"> | 4 | <div class="dataGrid" ref="dataGrid"> |
5 | <el-table | 5 | <el-table |
6 | :data="tableData" | 6 | :data="tableData" |
... | @@ -35,7 +35,8 @@ | ... | @@ -35,7 +35,8 @@ |
35 | </el-table-column> | 35 | </el-table-column> |
36 | </el-table> | 36 | </el-table> |
37 | <div class="pagination"> | 37 | <div class="pagination"> |
38 | <el-pagination background layout="prev, pager, next" :total="1000"> | 38 | <el-pagination background layout="prev, pager, next" :total="total" |
39 | :current-page="pageNo" @current-change="handleCurrentChange"> | ||
39 | </el-pagination> | 40 | </el-pagination> |
40 | </div> | 41 | </div> |
41 | </div> | 42 | </div> |
... | @@ -44,6 +45,7 @@ | ... | @@ -44,6 +45,7 @@ |
44 | 45 | ||
45 | <script> | 46 | <script> |
46 | import SearchHead from "../../../components/searchHead/searchHead"; | 47 | import SearchHead from "../../../components/searchHead/searchHead"; |
48 | import {getSearchList} from "../../../api/search"; | ||
47 | 49 | ||
48 | export default { | 50 | export default { |
49 | name: "", | 51 | name: "", |
... | @@ -51,45 +53,47 @@ | ... | @@ -51,45 +53,47 @@ |
51 | props: {}, | 53 | props: {}, |
52 | data() { | 54 | data() { |
53 | return { | 55 | return { |
56 | total: 0, | ||
57 | pageNo: 1, | ||
58 | pageSize: 10, | ||
54 | formData: { | 59 | formData: { |
55 | user: "", | 60 | user: "", |
56 | region: "", | 61 | region: "", |
57 | type: [], | 62 | type: [], |
58 | }, | 63 | }, |
59 | tableData: [ | 64 | queryData: {}, |
60 | { | 65 | tableData: [], |
61 | bdcdyh: "610101001001GB00001W", | ||
62 | xmmc: "万科集团万科城", | ||
63 | bdcqzh: "陕(2017)西安市不动产权第00000", | ||
64 | lx: "宗地", | ||
65 | qlr: "李子新", | ||
66 | zl: "灞桥-田家湾-咸宁东路,近浐河西路", | ||
67 | zrsj: "2020.09.07 ", | ||
68 | cjr: "李子新", | ||
69 | }, | ||
70 | ], | ||
71 | tableHeight: "", | 66 | tableHeight: "", |
72 | }; | 67 | }; |
73 | }, | 68 | }, |
74 | created() { | 69 | created() { |
75 | }, | 70 | }, |
76 | mounted() { | 71 | mounted() { |
77 | for (let i = 0; i < 11; i++) { | 72 | this.getData({}) |
78 | let obj = { | ||
79 | bdcdyh: "610101001001GB00001W", | ||
80 | xmmc: "万科集团万科城", | ||
81 | bdcqzh: "陕(2017)西安市不动产权第00000", | ||
82 | lx: "自然幢", | ||
83 | qlr: "李子新", | ||
84 | zl: "灞桥-田家湾-咸宁东路,近浐河西路", | ||
85 | zrsj: "2020.09.07 ", | ||
86 | cjr: "李子新", | ||
87 | }; | ||
88 | this.tableData.push(obj); | ||
89 | } | ||
90 | this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; | 73 | this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; |
91 | }, | 74 | }, |
92 | methods: { | 75 | methods: { |
76 | handleCurrentChange(val) { | ||
77 | console.log(`当前页: ${val}`); | ||
78 | this.pageNo = val; | ||
79 | this.queryData.pageNo = val; | ||
80 | this.getData(this.queryData); | ||
81 | }, | ||
82 | getData(data) { | ||
83 | getSearchList(data).then(res => { | ||
84 | this.tableData = res.result.records | ||
85 | this.total = res.result.total | ||
86 | }) | ||
87 | }, | ||
88 | //获取子组件点击查询触发的事件 | ||
89 | geQuerytData(obj) { | ||
90 | this.queryData = obj | ||
91 | //将obj作为参数调用接口查询表格数据 | ||
92 | this.queryData['pageSize'] = this.pageSize | ||
93 | this.pageNo = 1 | ||
94 | this.queryData['pageNo'] = 1 | ||
95 | this.getData(this.queryData) | ||
96 | }, | ||
93 | onSubmit() { | 97 | onSubmit() { |
94 | }, | 98 | }, |
95 | tableRowClassName({row, rowIndex}) { | 99 | tableRowClassName({row, rowIndex}) { |
... | @@ -99,11 +103,6 @@ | ... | @@ -99,11 +103,6 @@ |
99 | return ""; | 103 | return ""; |
100 | } | 104 | } |
101 | }, | 105 | }, |
102 | |||
103 | //获取子组件点击查询触发的事件 | ||
104 | getData(obj) { | ||
105 | console.log(obj); | ||
106 | }, | ||
107 | //点击办理 | 106 | //点击办理 |
108 | handleClick(row) { | 107 | handleClick(row) { |
109 | let path = ""; | 108 | let path = ""; | ... | ... |
... | @@ -192,17 +192,15 @@ | ... | @@ -192,17 +192,15 @@ |
192 | <td colspan="2"> | 192 | <td colspan="2"> |
193 | <input | 193 | <input |
194 | type="text" | 194 | type="text" |
195 | v-model="formData.rjl" | 195 | v-model="rjl" |
196 | :class=" | 196 | v-show="isInterval(formData.jyrjl)" |
197 | formData.jyrjl == '-' ? 'formInput percent47' : 'formInput' | 197 | class="formInput percent47" |
198 | " | ||
199 | /> | 198 | /> |
200 | <span class="percent4" v-show="formData.jyrjl == '-'">-</span> | 199 | <span class="percent4" v-show="isInterval(formData.jyrjl)">-</span> |
201 | <input | 200 | <input |
202 | type="text" | 201 | type="text" |
203 | v-show="formData.jyrjl == '-'" | ||
204 | v-model="formData.rjl" | 202 | v-model="formData.rjl" |
205 | class="formInput percent47" | 203 | :class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'" |
206 | /> | 204 | /> |
207 | </td> | 205 | </td> |
208 | <td colspan="2">容积说明</td> | 206 | <td colspan="2">容积说明</td> |
... | @@ -226,17 +224,15 @@ | ... | @@ -226,17 +224,15 @@ |
226 | <td colspan="2"> | 224 | <td colspan="2"> |
227 | <input | 225 | <input |
228 | type="text" | 226 | type="text" |
229 | v-model="formData.jzmd" | 227 | v-model="jzmd" |
230 | :class=" | 228 | v-show="isInterval(formData.jyjzmd)" |
231 | formData.jyjzmd == '-' ? 'formInput percent47' : 'formInput' | 229 | class="formInput percent47" |
232 | " | ||
233 | /> | 230 | /> |
234 | <span class="percent4" v-show="formData.jyjzmd == '-'">-</span> | 231 | <span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span> |
235 | <input | 232 | <input |
236 | type="text" | 233 | type="text" |
237 | v-show="formData.jyjzmd == '-'" | ||
238 | v-model="formData.jzmd" | 234 | v-model="formData.jzmd" |
239 | class="formInput percent47" | 235 | :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'" |
240 | /> | 236 | /> |
241 | </td> | 237 | </td> |
242 | <td colspan="2">建筑密度说明</td> | 238 | <td colspan="2">建筑密度说明</td> |
... | @@ -260,17 +256,15 @@ | ... | @@ -260,17 +256,15 @@ |
260 | <td colspan="2"> | 256 | <td colspan="2"> |
261 | <input | 257 | <input |
262 | type="text" | 258 | type="text" |
263 | v-model="formData.jzxg" | 259 | v-model="jzxg" |
264 | :class=" | 260 | v-show="isInterval(formData.jyjzxg)" |
265 | formData.jyjzxg == '-' ? 'formInput percent47' : 'formInput' | 261 | class="formInput percent47" |
266 | " | ||
267 | /> | 262 | /> |
268 | <span class="percent4" v-show="formData.jyjzxg == '-'">-</span> | 263 | <span class="percent4" v-show="isInterval(formData.jyjzxg)">-</span> |
269 | <input | 264 | <input |
270 | type="text" | 265 | type="text" |
271 | v-show="formData.jyjzxg == '-'" | ||
272 | v-model="formData.jzxg" | 266 | v-model="formData.jzxg" |
273 | class="formInput percent47" | 267 | :class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'" |
274 | /> | 268 | /> |
275 | </td> | 269 | </td> |
276 | <td colspan="2">建筑限高说明</td> | 270 | <td colspan="2">建筑限高说明</td> |
... | @@ -372,6 +366,9 @@ export default { | ... | @@ -372,6 +366,9 @@ export default { |
372 | props: {}, | 366 | props: {}, |
373 | data() { | 367 | data() { |
374 | return { | 368 | return { |
369 | rjl:'', | ||
370 | jzmd:'', | ||
371 | jzxg:'', | ||
375 | compareList: [ | 372 | compareList: [ |
376 | { label: "<", value: "<" }, | 373 | { label: "<", value: "<" }, |
377 | { label: ">", value: ">" }, | 374 | { label: ">", value: ">" }, |
... | @@ -386,7 +383,7 @@ export default { | ... | @@ -386,7 +383,7 @@ export default { |
386 | bhqkbsm: "", | 383 | bhqkbsm: "", |
387 | blc: "", | 384 | blc: "", |
388 | bz: "", | 385 | bz: "", |
389 | dcrq: "2020-10-22T09:07:38.644Z", | 386 | dcrq: "", |
390 | dcy: "", | 387 | dcy: "", |
391 | dcyj: "", | 388 | dcyj: "", |
392 | djh: "", | 389 | djh: "", |
... | @@ -444,8 +441,37 @@ export default { | ... | @@ -444,8 +441,37 @@ export default { |
444 | getQjZdjbxxDetailById(this.$store.state.zdbsm) | 441 | getQjZdjbxxDetailById(this.$store.state.zdbsm) |
445 | .then((res) => { | 442 | .then((res) => { |
446 | if (res.result) { | 443 | if (res.result) { |
447 | console.log(res.result); | ||
448 | this.formData = res.result; | 444 | this.formData = res.result; |
445 | //判断容密高是否为区间值,如果是区间值,则将校验值置为'-'并给rjl,jzmd,jzxg赋值 | ||
446 | this.rjl = this.isInterval(this.formData.jyrjl) ? this.formData.jyrjl : ''; | ||
447 | this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? '-' : this.formData.jyrjl; | ||
448 | this.jzmd = this.isInterval(this.formData.jyjzmd) ? this.formData.jyjzmd : ''; | ||
449 | this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? '-' : this.formData.jyjzmd; | ||
450 | this.jzxg = this.isInterval(this.formData.jyjzxg) ? this.formData.jyjzxg : ''; | ||
451 | this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? '-' : this.formData.jyjzxg; | ||
452 | if(res.result.list.length>0){ | ||
453 | if(res.result.list[0].list.length<1){ | ||
454 | res.result.list[0].list.push({ | ||
455 | "pzdjbsm": "", | ||
456 | "pzdjmc": "", | ||
457 | "pzytdm": "", | ||
458 | "pzytmc": "", | ||
459 | "pzytmj": 0, | ||
460 | "qlxzbsm": "", | ||
461 | "sjdjbsm": "", | ||
462 | "sjdjmc": "", | ||
463 | "sjytdm": "", | ||
464 | "sjytmc": "", | ||
465 | "sjytmj": 0, | ||
466 | "syqx": "", | ||
467 | "tdsyjssj": "", | ||
468 | "tdsyqssj": "", | ||
469 | "tdzh": "" | ||
470 | }) | ||
471 | } | ||
472 | //权利性质数据传给子组件 | ||
473 | this.$refs.qlxzModule.countList = res.result.list | ||
474 | } | ||
449 | } | 475 | } |
450 | }) | 476 | }) |
451 | .catch((error) => {}); | 477 | .catch((error) => {}); |
... | @@ -465,6 +491,10 @@ export default { | ... | @@ -465,6 +491,10 @@ export default { |
465 | updateZDxx() { | 491 | updateZDxx() { |
466 | //获取权利性质数据 | 492 | //获取权利性质数据 |
467 | this.formData.list = this.$refs.qlxzModule.getQlxzDataList(); | 493 | this.formData.list = this.$refs.qlxzModule.getQlxzDataList(); |
494 | //判断容密高是否为区间值,如果是区间值,则将输入框的值赋予 | ||
495 | this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl; | ||
496 | this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd; | ||
497 | this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg; | ||
468 | updateQjZdjbxx(this.formData) | 498 | updateQjZdjbxx(this.formData) |
469 | .then((res) => { | 499 | .then((res) => { |
470 | if (res.code == 200) { | 500 | if (res.code == 200) { |
... | @@ -473,6 +503,8 @@ export default { | ... | @@ -473,6 +503,8 @@ export default { |
473 | message: '保存成功', | 503 | message: '保存成功', |
474 | type: "success", | 504 | type: "success", |
475 | }); | 505 | }); |
506 | // 保存成功再次查询 | ||
507 | this.getZdjbxxData(); | ||
476 | } else { | 508 | } else { |
477 | this.$message({ | 509 | this.$message({ |
478 | message: res.message, | 510 | message: res.message, |
... | @@ -509,6 +541,15 @@ export default { | ... | @@ -509,6 +541,15 @@ export default { |
509 | }) | 541 | }) |
510 | .catch((error) => {}); | 542 | .catch((error) => {}); |
511 | }, | 543 | }, |
544 | //判断容密高是否为区间 | ||
545 | isInterval(val){ | ||
546 | if(val == '>' || val == '<' || val == '=' || val == '>=' || val == '<='){ | ||
547 | return false | ||
548 | }else{ | ||
549 | return true; | ||
550 | } | ||
551 | }, | ||
552 | |||
512 | }, | 553 | }, |
513 | computed: { | 554 | computed: { |
514 | zl() { | 555 | zl() { | ... | ... |
-
Please register or sign in to post a comment