49a985f7 by renchao@pashanhoo.com

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

2 parents 5a7556f3 aa061113
...@@ -254,3 +254,28 @@ export function selectRepairQlxx (data) { ...@@ -254,3 +254,28 @@ export function selectRepairQlxx (data) {
254 data 254 data
255 }) 255 })
256 } 256 }
257 /**
258 * @description: 选择林权首次
259 * @param {*} data
260 * @author: renchao
261 */
262 export function selectLqQjdc (data) {
263 return request({
264 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectLqQjdc',
265 method: 'post',
266 data
267 })
268 }
269 /**
270 * @description: 选择林权转移/变更/注销
271 * @param {*} data
272 * @author: renchao
273 */
274 export function selectLq (data) {
275 return request({
276 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectLq',
277 method: 'post',
278 data
279 })
280 }
281
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:52:46 4 * @LastEditTime: 2023-08-10 16:28:55
5 --> 5 -->
6 <template> 6 <template>
7 <div class="content"> 7 <div class="content">
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 if (res.code === 200) { 57 if (res.code === 200) {
58 this.treedata = loadTreeData(res.result, this.formData.bdcdyh); 58 this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
59 this.$nextTick(function () { 59 this.$nextTick(function () {
60 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 60 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, this.formData.bdcdylx || "");
61 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 61 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
62 this.loadComponent(this.defaultNode.form); 62 this.loadComponent(this.defaultNode.form);
63 }); 63 });
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 </script> 95 </script>
96 <style scoped lang="scss"> 96 <style scoped lang="scss">
97 /deep/.rollTable { 97 /deep/.rollTable {
98 height: calc(100vh - 240px) !important; 98 height: calc(100vh - 300px) !important;
99 } 99 }
100 100
101 .content { 101 .content {
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 width: calc(100% - 256px); 115 width: calc(100% - 256px);
116 height: 704px; 116 height: 704px;
117 // overflow-y: scroll; 117 // overflow-y: scroll;
118 overflow: auto; 118 // overflow: auto;
119 background-color: #f5f5f5; 119 background-color: #f5f5f5;
120 border: 1px solid rgb(228, 228, 228); 120 border: 1px solid rgb(228, 228, 228);
121 } 121 }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 <div class="xxTableBox rollTable"> 12 <div class="xxTableBox rollTable">
13 <!-- 固定前三个 --> 13 <!-- 固定前三个 -->
14 <table class="xxTable"> 14 <table class="xxTable">
15 <tr v-for="(item, colindex) in columns" :key="colindex"> 15 <tr v-for="(item, colindex) in columns" :class="judge(item.label) ? 'cols':''" :key="colindex">
16 <td> 16 <td>
17 {{ item.label }} 17 {{ item.label }}
18 </td> 18 </td>
...@@ -46,9 +46,14 @@ ...@@ -46,9 +46,14 @@
46 {{ getQsztName(row[item.prop]) }} 46 {{ getQsztName(row[item.prop]) }}
47 </span> 47 </span>
48 48
49 <span v-else> {{ row[item.prop] }}</span> 49 <span v-if="item.prop !== 'qszt' && !judge(item.label)"> {{ row[item.prop] }}</span>
50 <div class="many" v-if="judge(item.label)">
51 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
52 {{ label[item.prop] }}
53 </div>
54 </div>
50 </td> 55 </td>
51 <td v-for="count in emptycolNum" :key="~count"></td> 56 <td v-for="count in emptycolNum" class="empty" :key="~count"></td>
52 </tr> 57 </tr>
53 </table> 58 </table>
54 </div> 59 </div>
...@@ -137,6 +142,18 @@ ...@@ -137,6 +142,18 @@
137 } 142 }
138 return name; 143 return name;
139 }, 144 },
145 /**
146 * @description: judge
147 * @param {*} lable
148 * @author: renchao
149 */
150 judge(label){
151 if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) {
152 return true
153 }else{
154 return false
155 }
156 },
140 // 新增一条补录信息 157 // 新增一条补录信息
141 /** 158 /**
142 * @description: 新增一条补录信息 159 * @description: 新增一条补录信息
...@@ -170,4 +187,23 @@ ...@@ -170,4 +187,23 @@
170 187
171 <style lang="scss" scoped> 188 <style lang="scss" scoped>
172 @import "./qlxxCommon.scss"; 189 @import "./qlxxCommon.scss";
190 .cols{
191 td{
192 .many{
193 width: 100%;
194 height: 100%;
195 display: flex;
196 flex-direction: row;
197 div{
198 flex: 1;
199 border-right: 2px solid #e3e2e2;
200 line-height: 40px;
201 overflow: hidden;
202 }
203 div:last-child{
204 border: 0;
205 }
206 }
207 }
208 }
173 </style> 209 </style>
......
...@@ -183,7 +183,11 @@ ...@@ -183,7 +183,11 @@
183 min-width: 280px; 183 min-width: 280px;
184 z-index: 1; 184 z-index: 1;
185 } 185 }
186 186 td:first-child{
187 flex: inherit !important;
188 width: 200px !important;
189 min-width: auto !important;
190 }
187 >tr:nth-child(odd) td { 191 >tr:nth-child(odd) td {
188 background: #f2f2f2; 192 background: #f2f2f2;
189 } 193 }
......
...@@ -354,8 +354,8 @@ ...@@ -354,8 +354,8 @@
354 * @author: renchao 354 * @author: renchao
355 */ 355 */
356 handleRowClick (row) { 356 handleRowClick (row) {
357 // 如果状态是1,那就是单选 357 // 自然幢多选,多幢单选
358 if (this.sqywInfo.sqywdylx == "1") { 358 if (this.activeName == 'dz') {
359 const bdcdysz = this.bdcdysz 359 const bdcdysz = this.bdcdysz
360 this.$refs.table.clearSelection() 360 this.$refs.table.clearSelection()
361 if (bdcdysz.length == 1) { 361 if (bdcdysz.length == 1) {
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-08-10 16:30:18
5 -->
6 <template>
7 <div class="from-clues">
8 <!-- 表单部分 林权转移变更注销 -->
9 <div class="from-clues-header">
10 <el-form :model="queryForm" ref="queryForm">
11 <el-row :gutter="20">
12 <el-col :span="6">
13 <el-form-item label="宗地代码">
14 <el-input placeholder="请输入宗地代码" maxlength="19" v-model="queryForm.zddm" clearable class="width100">
15 </el-input>
16 </el-form-item>
17 </el-col>
18 <el-col :span="6">
19 <el-form-item label="不动产单元号">
20 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
21 </el-input>
22 </el-form-item>
23 </el-col>
24 <el-col :span="6">
25 <el-form-item label="坐落">
26 <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
27 </el-input>
28 </el-form-item>
29 </el-col>
30 <el-col :span="6" class="btnColRight">
31 <el-form-item>
32 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
33 <el-button type="primary" @click="handleSearch">查询</el-button>
34 </el-form-item>
35 </el-col>
36 </el-row>
37 </el-form>
38 </div>
39 <!-- 表格 -->
40 <div class="from-clues-content loadingtext">
41 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
42 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
43 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
44 :data="tableData.data">
45 </lb-table>
46 </div>
47 <div class="submit_button">
48 <el-button @click="$popupCacel">取消</el-button>
49 <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
50 </div>
51 </div>
52 </template>
53 <script>
54 //首次登记
55 import jump from "./mixin/jump";
56 import store from '@/store/index.js'
57 import table from "@/utils/mixin/table";
58 import { ywPopupDialog } from "@/utils/popup.js";
59 import { selectLq } from "@/api/ywsq.js";
60 import { startBusinessFlow } from "@/api/workFlow.js";
61 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
62 import { defaultParameters } from "../javascript/publicDefaultPar.js";
63 export default {
64 mixins: [table, jump],
65 props: {
66 isJump: { type: Boolean, default: false },
67 sqywInfo: { type: Object, default: () => { } },
68 },
69 data () {
70 return {
71 loading: false,
72 queryForm: defaultParameters.defaultParameters(),
73 tableData: {
74 total: 0,
75 columns: datas.columns(),
76 data: [],
77 },
78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 };
84 },
85 mounted () {
86 sendThis(this);
87 },
88 methods: {
89 /**
90 * @description: queryClick
91 * @author: renchao
92 */
93 queryClick () {
94 this.$startLoading();
95 this.queryForm.sqywbm = this.sqywInfo.djywbm;
96 selectLq({ ...this.queryForm, ...this.pageData }).then((res) => {
97 this.$endLoading();
98 if (res.code === 200) {
99 let { total, records } = res.result;
100 this.tableData.total = total;
101 this.tableData.data = records;
102 }
103 });
104 },
105
106 /**
107 * @description: submitForm
108 * @author: renchao
109 */
110 submitForm () {
111 if (this.bdcdysz.length == 0) {
112 this.$alert("请至少选择一条数据");
113 return;
114 }
115 this.loading = true
116 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw,
118 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => {
122 this.loading = false
123 if (res.code == 200) {
124 this.$message({
125 showClose: true,
126 message: "发起申请成功",
127 type: "success",
128 });
129 if (!this.isJump) {
130 this.jump(res.result, this.djywbm);
131 } else {
132 store.dispatch('user/refreshPage', true);
133 }
134 this.$popupCacel()
135 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
137 }
138 }).catch(() => {
139 this.loading = false
140 })
141 },
142 /**
143 * @description: handleSelectionChange
144 * @param {*} val
145 * @author: renchao
146 */
147 handleSelectionChange (val) {
148 val.forEach((item, index) => {
149 item.bsm = item.zdbsm;
150 });
151 if (this.sqywInfo.sqywdylx == "1") {
152 if (val.length > 1) {
153 this.bdcdysz = [...val[val.length - 1]];
154 } else {
155 this.bdcdysz = val;
156 }
157 } else {
158 this.bdcdysz = val;
159 }
160 },
161 /**
162 * @description: select
163 * @param {*} selection
164 * @param {*} row
165 * @author: renchao
166 */
167 select (selection, row) {
168 if (this.sqywInfo.sqywdylx == "1") {
169 // 清除 所有勾选项
170 this.$refs.table.clearSelection()
171 // 当表格数据都没有被勾选的时候 就返回
172 // 主要用于将当前勾选的表格状态清除
173 if (selection.length == 0) return
174 this.$refs.table.toggleRowSelection(row, true);
175 }
176 },
177
178 /**
179 * @description: handleRowClick
180 * @param {*} row
181 * @author: renchao
182 */
183 handleRowClick (row) {
184 // 如果状态是1,那就是单选
185 if (this.sqywInfo.sqywdylx == "1") {
186 const bdcdysz = this.bdcdysz
187 this.$refs.table.clearSelection()
188 if (bdcdysz.length == 1) {
189 bdcdysz.forEach(item => {
190 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
191 if (item == row) {
192 this.$refs.table.toggleRowSelection(row, false);
193 }
194 // 不然就让当前的一行勾选
195 else {
196 this.$refs.table.toggleRowSelection(row, true);
197 }
198 })
199 }
200 else {
201 this.$refs.table.toggleRowSelection(row, true);
202 }
203 } else {
204 this.$refs.table.toggleRowSelection(row);
205 }
206 },
207 /**
208 * @description: openBook
209 * @param {*} row
210 * @author: renchao
211 */
212 openBook (row) {
213 var param = {
214 bdcdyid: row.bdcdyid,
215 qllx: row.qllx,
216 bdcdyh: row.bdcdyh,
217 bsmQlxx: row.bsmQlxx,
218 };
219 this.$popup("登记簿详情", "registerBook/djbFrame", {
220 formData: param
221 })
222 },
223
224 },
225 };
226 </script>
227 <style scoped lang="scss">
228 @import "~@/styles/mixin.scss";
229 @import "~@/styles/public.scss";
230 </style>
231
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-08-09 16:12:34
5 -->
6 <template>
7 <div class="from-clues">
8 <!-- 表单部分 林权首次 -->
9 <div class="from-clues-header">
10 <el-form :model="queryForm" ref="queryForm">
11 <el-row :gutter="20">
12 <el-col :span="6">
13 <el-form-item label="宗地代码">
14 <el-input placeholder="请输入宗地代码" maxlength="19" v-model="queryForm.zddm" clearable class="width100">
15 </el-input>
16 </el-form-item>
17 </el-col>
18 <el-col :span="6">
19 <el-form-item label="不动产单元号">
20 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
21 </el-input>
22 </el-form-item>
23 </el-col>
24 <el-col :span="6">
25 <el-form-item label="坐落">
26 <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
27 </el-input>
28 </el-form-item>
29 </el-col>
30 <el-col :span="6" class="btnColRight">
31 <el-form-item>
32 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
33 <el-button type="primary" @click="handleSearch">查询</el-button>
34 </el-form-item>
35 </el-col>
36 </el-row>
37 </el-form>
38 </div>
39 <!-- 表格 -->
40 <div class="from-clues-content loadingtext">
41 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
42 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
43 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
44 :data="tableData.data">
45 </lb-table>
46 </div>
47 <div class="submit_button">
48 <el-button @click="$popupCacel">取消</el-button>
49 <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
50 </div>
51 </div>
52 </template>
53 <script>
54 //首次登记
55 import jump from "./mixin/jump";
56 import store from '@/store/index.js'
57 import table from "@/utils/mixin/table";
58 import { ywPopupDialog } from "@/utils/popup.js";
59 import { selectLqQjdc } from "@/api/ywsq.js";
60 import { startBusinessFlow } from "@/api/workFlow.js";
61 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
62 import { defaultParameters } from "../javascript/publicDefaultPar.js";
63 export default {
64 mixins: [table, jump],
65 props: {
66 isJump: { type: Boolean, default: false },
67 sqywInfo: { type: Object, default: () => { } },
68 },
69 data () {
70 return {
71 loading: false,
72 queryForm: defaultParameters.defaultParameters(),
73 tableData: {
74 total: 0,
75 columns: datas.columns(),
76 data: [],
77 },
78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 };
84 },
85 mounted () {
86 sendThis(this);
87 },
88 methods: {
89 /**
90 * @description: queryClick
91 * @author: renchao
92 */
93 queryClick () {
94 this.$startLoading();
95 this.queryForm.sqywbm = this.sqywInfo.djywbm;
96 selectLqQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
97 this.$endLoading();
98 if (res.code === 200) {
99 let { total, records } = res.result;
100 this.tableData.total = total;
101 this.tableData.data = records;
102 }
103 });
104 },
105
106 /**
107 * @description: submitForm
108 * @author: renchao
109 */
110 submitForm () {
111 if (this.bdcdysz.length == 0) {
112 this.$alert("请至少选择一条数据");
113 return;
114 }
115 this.loading = true
116 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw,
118 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => {
122 this.loading = false
123 if (res.code == 200) {
124 this.$message({
125 showClose: true,
126 message: "发起申请成功",
127 type: "success",
128 });
129 if (!this.isJump) {
130 this.jump(res.result, this.djywbm);
131 } else {
132 store.dispatch('user/refreshPage', true);
133 }
134 this.$popupCacel()
135 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
137 }
138 }).catch(() => {
139 this.loading = false
140 })
141 },
142 /**
143 * @description: handleSelectionChange
144 * @param {*} val
145 * @author: renchao
146 */
147 handleSelectionChange (val) {
148 val.forEach((item, index) => {
149 item.bsm = item.zdbsm;
150 });
151 if (this.sqywInfo.sqywdylx == "1") {
152 if (val.length > 1) {
153 this.bdcdysz = [...val[val.length - 1]];
154 } else {
155 this.bdcdysz = val;
156 }
157 } else {
158 this.bdcdysz = val;
159 }
160 },
161 /**
162 * @description: select
163 * @param {*} selection
164 * @param {*} row
165 * @author: renchao
166 */
167 select (selection, row) {
168 if (this.sqywInfo.sqywdylx == "1") {
169 // 清除 所有勾选项
170 this.$refs.table.clearSelection()
171 // 当表格数据都没有被勾选的时候 就返回
172 // 主要用于将当前勾选的表格状态清除
173 if (selection.length == 0) return
174 this.$refs.table.toggleRowSelection(row, true);
175 }
176 },
177
178 /**
179 * @description: handleRowClick
180 * @param {*} row
181 * @author: renchao
182 */
183 handleRowClick (row) {
184 // 如果状态是1,那就是单选
185 if (this.sqywInfo.sqywdylx == "1") {
186 const bdcdysz = this.bdcdysz
187 this.$refs.table.clearSelection()
188 if (bdcdysz.length == 1) {
189 bdcdysz.forEach(item => {
190 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
191 if (item == row) {
192 this.$refs.table.toggleRowSelection(row, false);
193 }
194 // 不然就让当前的一行勾选
195 else {
196 this.$refs.table.toggleRowSelection(row, true);
197 }
198 })
199 }
200 else {
201 this.$refs.table.toggleRowSelection(row, true);
202 }
203 } else {
204 this.$refs.table.toggleRowSelection(row);
205 }
206 },
207 /**
208 * @description: openBook
209 * @param {*} row
210 * @author: renchao
211 */
212 openBook (row) {
213 var param = {
214 bdcdyid: row.bdcdyid,
215 qllx: row.qllx,
216 bdcdyh: row.bdcdyh,
217 bsmQlxx: row.bsmQlxx,
218 };
219 this.$popup("登记簿详情", "registerBook/djbFrame", {
220 formData: param
221 })
222 },
223
224 },
225 };
226 </script>
227 <style scoped lang="scss">
228 @import "~@/styles/mixin.scss";
229 @import "~@/styles/public.scss";
230 </style>
231
...@@ -13,7 +13,6 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -13,7 +13,6 @@ export function queueDjywmc (djywbm, djqxbm) {
13 case "A03100"://建设用地使用权(首次登记) 13 case "A03100"://建设用地使用权(首次登记)
14 case "A05100"://宅基地使用权(首次登记) 14 case "A05100"://宅基地使用权(首次登记)
15 case "A07100"://集体建设用地使用权(首次登记) 15 case "A07100"://集体建设用地使用权(首次登记)
16 case "A11100"://林地使用权
17 vm = "selectQjzdjbxx"; 16 vm = "selectQjzdjbxx";
18 break; 17 break;
19 case "A01200": 18 case "A01200":
...@@ -95,6 +94,14 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -95,6 +94,14 @@ export function queueDjywmc (djywbm, djqxbm) {
95 case "C04371": //一并国有房屋转移 94 case "C04371": //一并国有房屋转移
96 vm = "selectYbgybg"; 95 vm = "selectYbgybg";
97 break; 96 break;
97 case "A11100"://林地使用权首次
98 vm = "selectLqsc";
99 break;
100 case "A11200"://林地使用权转移
101 case "A11300"://林地使用权登记
102 case "A11400"://林地使用权变更
103 vm = "selectLqqt";
104 break;
98 default: 105 default:
99 vm = "selecBdcql"; 106 vm = "selecBdcql";
100 break; 107 break;
......