Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
12df1038 by renchao@pashanhoo.com
Options

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

2 parents 93976ab0 3b52bc54
Inline Side-by-side
Showing 4 changed files with 226 additions and 183 deletions
...@@ -4,24 +4,29 @@ ...@@ -4,24 +4,29 @@
4 * @LastEditTime: 2023-08-11 15:33:53 4 * @LastEditTime: 2023-08-11 15:33:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div class="tableBox"> 8 <div class="tableBox">
9 <div class="title"> 9 <div class="title">
10 {{ title }} 10 {{ title }}
11 <div class="checkbox"> 11 <div class="checkbox">
12 <el-checkbox-group v-model="checkList" @change="checkChange"> 12 <el-checkbox-group v-model="checkList" @change="checkChange">
13 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 13 <el-checkbox
14 </el-checkbox-group> 14 v-for="item in qsztList"
15 </div> 15 :key="item.value"
16 :label="item.value"
17 >{{ item.label }}</el-checkbox>
18 </el-checkbox-group>
16 </div> 19 </div>
17 <div class="xxTableBox rollTable"> 20 </div>
18 <!-- 固定前三个 --> 21 <div class="xxTableBox rollTable">
19 <table class="xxTable"> 22 <!-- 固定前三个 -->
20 <tr v-for="(item, colindex) in columns" :key="colindex"> 23 <table class="xxTable">
21 <td> 24 <tr v-for="(item, colindex) in columns" :key="colindex">
22 {{ item.label }} 25 <td>{{ item.label }}</td>
23 </td> 26 <td
24 <td v-for="(row, index) in tableData" :key="index" :class="[ 27 v-for="(row, index) in tableData"
28 :key="index"
29 :class="[
25 row.qszt == '2' ? 'lishi' : '', 30 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 31 row.qszt == '0' ? 'linshi' : '',
27 row.qlzt == '4' ? 'linshi' : '', 32 row.qlzt == '4' ? 'linshi' : '',
...@@ -30,151 +35,142 @@ ...@@ -30,151 +35,142 @@
30 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 35 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 36 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
32 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 37 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
33 ]"> 38 ]"
34 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 39 >
35 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 40 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
36 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 41 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
37 </div> 42 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
38 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 43 </div>
39 有效 44 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">有效</div>
40 </div> 45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
41 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
42 正在补录 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
43 </div> 48 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'"> 49
45 正在申请 50 <span v-else>{{ row[item.prop] }}</span>
46 </div> 51 </td>
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 52 <td v-for="count in emptycolNum" :key="~count"></td>
48 正在注销 53 </tr>
49 </div> 54 </table>
50 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }}
52 </span>
53
54 <span v-else> {{ row[item.prop] }}</span>
55 </td>
56 <td v-for="count in emptycolNum" :key="~count"></td>
57 </tr>
58 </table>
59 </div>
60 </div> 55 </div>
61 </div> 56 </div>
62 </template> 57 </div>
58 </template>
63 59
64 <script> 60 <script>
65 import { datas } from "./qlxxFormData.js"; 61 import { datas } from "./qlxxFormData.js";
66 import { getSjlx } from "@/utils/dictionary.js"; 62 import { getSjlx } from "@/utils/dictionary.js";
67 import { getLqList } from "@/api/djbDetail.js"; 63 import { getLqList } from "@/api/djbDetail.js";
68 export default { 64 export default {
69 data () { 65 data() {
70 return { 66 return {
71 title: "林地使用权登记信息", 67 title: "林权登记信息",
72 qsztList: datas.columns().qsztList, 68 qsztList: datas.columns().qsztList,
73 checkList: datas.columns().checkList, 69 checkList: datas.columns().checkList,
74 //传递参数 70 //传递参数
75 propsParam: this.$attrs, 71 propsParam: this.$attrs,
76 //列表数据 72 //列表数据
77 tableData: [], 73 tableData: [],
78 //空列值个数 74 //空列值个数
79 emptycolNum: datas.columns().emptycolNum, 75 emptycolNum: datas.columns().emptycolNum,
80 //列名称对象 76 //列名称对象
81 columns: datas.columns().LDSYQ, 77 columns: datas.columns().LDSYQ,
82 }; 78 };
83 }, 79 },
84 created () { 80 created() {
85 this.loadData(); 81 this.loadData();
86 }, 82 },
87 methods: { 83 methods: {
88 /** 84 /**
89 * @description: loadData 85 * @description: loadData
90 * @author: renchao 86 * @author: renchao
91 */ 87 */
92 loadData () { 88 loadData() {
93 89 if (this.$parent.addRepairRecord) {
94 if (this.$parent.addRepairRecord) { 90 this.columns.unshift({
95 this.columns.unshift({ 91 prop: "cz",
96 prop: "cz", 92 label: "操作",
97 label: "操作" 93 });
98 }) 94 }
99 } 95 getLqList({
100 getLqList({ 96 bdcdyid: this.propsParam.bdcdyid,
101 bdcdyid: this.propsParam.bdcdyid, 97 qllx: this.propsParam.qllx,
102 qllx: this.propsParam.qllx, 98 qszt: this.checkList,
103 qszt: this.checkList, 99 }).then((res) => {
104 }).then((res) => { 100 if (res.code === 200) {
105 if (res.code === 200) { 101 this.tableData = res.result;
106 this.tableData = res.result; 102 this.tableData.forEach((item) => {
107 this.tableData.forEach(item => { 103 item.sjlx = getSjlx(item.sjlx);
108 item.sjlx = getSjlx(item.sjlx)
109 })
110 if (this.tableData.length < datas.columns().emptycolNum) {
111 this.emptycolNum =
112 datas.columns().emptycolNum - this.tableData.length;
113 } else {
114 this.emptycolNum = 0;
115 }
116 }
117 }); 104 });
118 }, 105 if (this.tableData.length < datas.columns().emptycolNum) {
119 /** 106 this.emptycolNum =
120 * @description: checkChange 107 datas.columns().emptycolNum - this.tableData.length;
121 * @author: renchao
122 */
123 checkChange () {
124 if (this.checkList.length === 0) {
125 this.tableData = [];
126 this.emptycolNum = datas.columns().emptycolNum;
127 } else { 108 } else {
128 this.loadData(); 109 this.emptycolNum = 0;
129 } 110 }
130 }, 111 }
131 /** 112 });
132 * @description: getQsztName 113 },
133 * @param {*} code 114 /**
134 * @author: renchao 115 * @description: checkChange
135 */ 116 * @author: renchao
136 getQsztName (code) { 117 */
137 let name = ""; 118 checkChange() {
138 for (let item of this.qsztList) { 119 if (this.checkList.length === 0) {
139 if (item.value == code) { 120 this.tableData = [];
140 name = item.label; 121 this.emptycolNum = datas.columns().emptycolNum;
141 break; 122 } else {
142 } 123 this.loadData();
143 } 124 }
144 return name; 125 },
145 }, 126 /**
146 // 新增一条补录信息 127 * @description: getQsztName
147 /** 128 * @param {*} code
148 * @description: 新增一条补录信息 129 * @author: renchao
149 * @param {*} row 130 */
150 * @param {*} del 131 getQsztName(code) {
151 * @author: renchao 132 let name = "";
152 */ 133 for (let item of this.qsztList) {
153 editDialog (row, del) { 134 if (item.value == code) {
154 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 135 name = item.label;
155 confirmButtonText: '确定', 136 break;
156 cancelButtonText: '取消', 137 }
157 type: 'warning' 138 }
158 }).then(() => { 139 return name;
159 this.$parent.addRepairRecord(row, del) 140 },
160 141 // 新增一条补录信息
161 this.$message({ 142 /**
162 type: 'success', 143 * @description: 新增一条补录信息
163 message: '补录成功!' 144 * @param {*} row
164 }); 145 * @param {*} del
165 }).catch(() => { 146 * @author: renchao
166 this.$message({ 147 */
167 type: 'info', 148 editDialog(row, del) {
168 message: '取消编辑' 149 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
169 }); 150 confirmButtonText: "确定",
151 cancelButtonText: "取消",
152 type: "warning",
153 })
154 .then(() => {
155 this.$parent.addRepairRecord(row, del);
156
157 this.$message({
158 type: "success",
159 message: "补录成功!",
170 }); 160 });
171 161 })
172 }, 162 .catch(() => {
173 }, 163 this.$message({
174 }; 164 type: "info",
175 </script> 165 message: "取消编辑",
166 });
167 });
168 },
169 },
170 };
171 </script>
176 172
177 <style lang="scss" scoped> 173 <style lang="scss" scoped>
178 @import "./qlxxCommon.scss"; 174 @import "./qlxxCommon.scss";
179 </style> 175 </style>
180 176
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -1282,14 +1282,14 @@ class data extends filter { ...@@ -1282,14 +1282,14 @@ class data extends filter {
1282 { 1282 {
1283 prop: "gyqk", 1283 prop: "gyqk",
1284 label: "共有情况", 1284 label: "共有情况",
1285 }, 1285 },
1286 { 1286 {
1287 prop: "qlrlx", 1287 prop: "sllmsyq1",
1288 label: "权利人类型", 1288 label: "森林林木所有权人",
1289 }, 1289 },
1290 { 1290 {
1291 prop: "qlrmc", 1291 prop: "sllmsyq2",
1292 label: "权利人", 1292 label: "森林林木使用权人",
1293 }, 1293 },
1294 { 1294 {
1295 prop: "qlrzjzl", 1295 prop: "qlrzjzl",
...@@ -1300,24 +1300,68 @@ class data extends filter { ...@@ -1300,24 +1300,68 @@ class data extends filter {
1300 label: "证件号", 1300 label: "证件号",
1301 }, 1301 },
1302 { 1302 {
1303 prop: "qlxzmc", 1303 prop: "ldsyqxz",
1304 label: "权利性质", 1304 label: "林地所有权性质",
1305 }, 1305 },
1306 { 1306 {
1307 prop: "ytmc", 1307 prop: "fbf",
1308 label: "土地用途", 1308 label: "发包方",
1309 }, 1309 },
1310 { 1310 {
1311 prop: "fbfdm", 1311 prop: "fbfdm",
1312 label: "发包方代码", 1312 label: "发包方代码",
1313 }, 1313 },
1314 { 1314 {
1315 prop: "fbfmc", 1315 prop: "syqmj",
1316 label: "发包方名称", 1316 label: "使用权面积",
1317 }, 1317 },
1318 { 1318 {
1319 prop: "mjmc", 1319 prop: "ldsyqssj",
1320 label: "使用权面积", 1320 label: "林地使用（承包）起始时间",
1321 },
1322 {
1323 prop: "ldsyjssj",
1324 label: "林地使用（承包）结束时间",
1325 },
1326 {
1327 prop: "ldsyqx",
1328 label: "林地使用（承包）期限",
1329 },
1330 {
1331 prop: "sllb",
1332 label: "森林类别",
1333 },
1334 {
1335 prop: "zylz",
1336 label: "主要树种",
1337 },
1338 {
1339 prop: "zs",
1340 label: "株数",
1341 },
1342 {
1343 prop: "lz",
1344 label: "林种",
1345 },
1346 {
1347 prop: "qy",
1348 label: "起源",
1349 },
1350 {
1351 prop: "zlnd",
1352 label: "造林年度",
1353 },
1354 {
1355 prop: "lb",
1356 label: "林班",
1357 },
1358 {
1359 prop: "xb",
1360 label: "小班",
1361 },
1362 {
1363 prop: "xdm",
1364 label: "小地名",
1321 }, 1365 },
1322 { 1366 {
1323 prop: "djjg", 1367 prop: "djjg",
......
...@@ -34,6 +34,10 @@ export function getForm(tabName, djywbm) { ...@@ -34,6 +34,10 @@ export function getForm(tabName, djywbm) {
34 case "fwsyqslxx300": 34 case "fwsyqslxx300":
35 form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue"); 35 form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
36 break; 36 break;
37 //林地使用权
38 case "lqslxx":
39 form = require("@/views/ywbl/slsqxx/lqslxx");
40 break;
37 case "plfdcq2": 41 case "plfdcq2":
38 form = require("@/views/ywbl/slsqxx/fdcq2/slxxOverview.vue"); 42 form = require("@/views/ywbl/slsqxx/fdcq2/slxxOverview.vue");
39 break; 43 break;
...@@ -95,6 +99,9 @@ export function getForm(tabName, djywbm) { ...@@ -95,6 +99,9 @@ export function getForm(tabName, djywbm) {
95 case "fdcq2Qlxx": 99 case "fdcq2Qlxx":
96 form = require("@/views/registerBook/fdcq2.vue"); 100 form = require("@/views/registerBook/fdcq2.vue");
97 break; 101 break;
102 case "lqQlxx":
103 form = require("@/views/registerBook/ldsyq.vue");
104 break;
98 case "diyaqQlxx": 105 case "diyaqQlxx":
99 form = require("@/views/registerBook/diyaq.vue"); 106 form = require("@/views/registerBook/diyaq.vue");
100 break; 107 break;
...@@ -109,11 +116,7 @@ export function getForm(tabName, djywbm) { ...@@ -109,11 +116,7 @@ export function getForm(tabName, djywbm) {
109 break; 116 break;
110 case "zdjbxxImg": 117 case "zdjbxxImg":
111 form = require("@/views/workflow/components/zdt.vue"); 118 form = require("@/views/workflow/components/zdt.vue");
112 break; 119 break;
113 //林地使用权
114 case "lqslxx":
115 form = require("@/views/ywbl/slsqxx/lqslxx");
116 break;
117 default: 120 default:
118 form = require("@/views/error-page/404.vue"); 121 form = require("@/views/error-page/404.vue");
119 break; 122 break;
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-14 12:49:48 4 * @LastEditTime: 2023-08-15 10:24:21
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -338,15 +338,15 @@ ...@@ -338,15 +338,15 @@
338 * @author: renchao 338 * @author: renchao
339 */ 339 */
340 onSubmit () { 340 onSubmit () {
341 let arr = this.ruleForm.tdytqxList.filter(item => !item.yt) 341 // let arr = this.ruleForm.tdytqxList || [] .filter(item => !item.yt)
342 if (arr.length > 0) { 342 // if (arr.length > 0) {
343 this.$message({ 343 // this.$message({
344 showClose: true, 344 // showClose: true,
345 message: "土地用途不能为空", 345 // message: "土地用途不能为空",
346 type: "error", 346 // type: "error",
347 }); 347 // });
348 return false; 348 // return false;
349 } 349 // }
350 saveData(this.ruleForm).then((res) => { 350 saveData(this.ruleForm).then((res) => {
351 if (res.code === 200) { 351 if (res.code === 200) {
352 this.$message({ 352 this.$message({
......