Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
564b20c1 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 3028361f 3c7f49a2
Inline Side-by-side
Showing 6 changed files with 21 additions and 10 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-21 14:16:39 4 * @LastEditTime: 2024-01-22 11:00:07
5 */ 5 */
6 import { getForm } from "../flowform"; 6 import { getForm } from "../flowform";
7 import { getHomeNoticeList } from "@/api/home.js" 7 import { getHomeNoticeList } from "@/api/home.js"
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
40 */ 40 */
41 beforeLeave (activeName, oldActiveName) { 41 beforeLeave (activeName, oldActiveName) {
42 sessionStorage.setItem('activeName', activeName); 42 sessionStorage.setItem('activeName', activeName);
43 if (activeName && activeName != 0) this.getFromRouter(activeName) 43 this.getFromRouter(activeName)
44 }, 44 },
45 /** 45 /**
46 * @description: 切换选项卡内容组件 46 * @description: 切换选项卡内容组件
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 15:02:23 4 * @LastEditTime: 2024-01-22 11:02:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -256,6 +256,7 @@ ...@@ -256,6 +256,7 @@
256 this.fresh++; 256 this.fresh++;
257 } 257 }
258 this.ableOperation = this.tabList[0].ableOperation; 258 this.ableOperation = this.tabList[0].ableOperation;
259 this.currentSelectTab = this.tabList[0];
259 //批量操作无分屏按钮 260 //批量操作无分屏按钮
260 if (index != null) { 261 if (index != null) {
261 //处理分屏材料信息 262 //处理分屏材料信息
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 10:45:37 4 * @LastEditTime: 2024-01-22 11:04:51
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
137 that.fresh++; 137 that.fresh++;
138 } 138 }
139 this.ableOperation = this.tabList[0].ableOperation 139 this.ableOperation = this.tabList[0].ableOperation
140 this.currentSelectTab = this.tabList[0];
140 //批量操作无分屏按钮 141 //批量操作无分屏按钮
141 if (index != null) { 142 if (index != null) {
142 //处理分屏材料信息 143 //处理分屏材料信息
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2024-01-17 10:56:52 5 * @LastEditTime: 2024-01-22 10:43:54
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
......
...@@ -104,7 +104,11 @@ ...@@ -104,7 +104,11 @@
104 </el-table-column> 104 </el-table-column>
105 <el-table-column 105 <el-table-column
106 property="syqmj" 106 property="syqmj"
107 label="使用权面积"> 107 label="面积">
108 </el-table-column>
109 <el-table-column
110 property="qlytmc"
111 label="用途">
108 </el-table-column> 112 </el-table-column>
109 <el-table-column 113 <el-table-column
110 property="zl" 114 property="zl"
...@@ -283,8 +287,8 @@ ...@@ -283,8 +287,8 @@
283 */ 287 */
284 handleRowClick (row) { 288 handleRowClick (row) {
285 this.queryForm.bhqkbsm = row.bhqkbsm 289 this.queryForm.bhqkbsm = row.bhqkbsm
286 this.radioVal = row.bdcdyh 290 //this.radioVal = row.bdcdyh
287 row.bglx = '1' 291 //row.bglx = '1'
288 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => { 292 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
289 this.$endLoading(); 293 this.$endLoading();
290 if (res.code === 200) { 294 if (res.code === 200) {
......
...@@ -81,7 +81,7 @@ class data extends filter { ...@@ -81,7 +81,7 @@ class data extends filter {
81 }, 81 },
82 { 82 {
83 prop: "qlmjmc", 83 prop: "qlmjmc",
84 width: '100', 84 width: 100,
85 label: "使用权面积", 85 label: "使用权面积",
86 }, 86 },
87 { 87 {
...@@ -198,7 +198,12 @@ class datatwo extends filter { ...@@ -198,7 +198,12 @@ class datatwo extends filter {
198 { 198 {
199 prop: "qlmjmc", 199 prop: "qlmjmc",
200 width: 100, 200 width: 100,
201 label: "使用权面积", 201 label: "面积",
202 },
203 {
204 prop: "qlytmc",
205 width: 100,
206 label: "用途",
202 }, 207 },
203 { 208 {
204 prop: "zl", 209 prop: "zl",
......