c88a4847 by tianhaohao@pashanhoo.com

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

2 parents d94bf034 a376e09d
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 40
41 <br> 41 <br>
42 <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background 42 <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
43 layout="total, prev, pager, next" @current-change="paginationCurrentChange" 43 layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange" @size-change="handleSizeChange"
44 :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }"> 44 :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
45 </el-pagination> 45 </el-pagination>
46 </div> 46 </div>
...@@ -306,6 +306,9 @@ ...@@ -306,6 +306,9 @@
306 paginationCurrentChange (val) { 306 paginationCurrentChange (val) {
307 this.$emit('p-current-change', val) 307 this.$emit('p-current-change', val)
308 }, 308 },
309 handleSizeChange (val) {
310 this.$emit('size-change', val)
311 },
309 /** 312 /**
310 * @description: getMergeArr 313 * @description: getMergeArr
311 * @param {*} tableData 314 * @param {*} tableData
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-19 16:10:10 4 * @LastEditTime: 2024-01-25 15:06:08
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
257 let that = this 257 let that = this
258 let sjlx = row.sjlx, 258 let sjlx = row.sjlx,
259 bsmQlxx = row.bsmQlxx 259 bsmQlxx = row.bsmQlxx
260 if (sjlx == '系统数据') { 260 if (['系统数据', '存量数据'].includes(sjlx)) {
261 getXtParamsByYwh(ywh).then(res => { 261 getXtParamsByYwh(ywh).then(res => {
262 let data = res.result 262 let data = res.result
263 that.$popup('材料信息', 'registerBook/components/clxx/index', { 263 that.$popup('材料信息', 'registerBook/components/clxx/index', {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2024-01-19 16:09:59 4 * @LastEditTime: 2024-01-25 15:08:01
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
304 let that = this 304 let that = this
305 let sjlx = row.sjlx, 305 let sjlx = row.sjlx,
306 bsmQlxx = row.bsmQlxx 306 bsmQlxx = row.bsmQlxx
307 if (sjlx == '系统数据') { 307 if (['系统数据', '存量数据'].includes(sjlx)) {
308 getXtParamsByYwh(ywh).then(res => { 308 getXtParamsByYwh(ywh).then(res => {
309 let data = res.result 309 let data = res.result
310 that.$popup('材料信息', 'registerBook/components/clxx/index', { 310 that.$popup('材料信息', 'registerBook/components/clxx/index', {
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 import { mapGetters } from "vuex"; 32 import { mapGetters } from "vuex";
33 import table from "@/utils/mixin/table"; 33 import table from "@/utils/mixin/table";
34 import { datas, sendThis } from "./djbcxdata"; 34 import { datas, sendThis } from "./djbcxdata";
35 import { list, detail } from "@/api/sysPushRecord.js"; 35 import { list, detail } from "@/api/sysPushRecord.js";
36 36
37 export default { 37 export default {
38 name: "djbcx", 38 name: "djbcx",
39 mixins: [table], 39 mixins: [table],
40 mounted () { 40 mounted () {
...@@ -123,16 +123,16 @@ export default { ...@@ -123,16 +123,16 @@ export default {
123 }) 123 })
124 } 124 }
125 } 125 }
126 } 126 }
127 </script> 127 </script>
128 <style scoped lang="scss"> 128 <style scoped lang="scss">
129 @import "~@/styles/public.scss"; 129 @import "~@/styles/public.scss";
130 130
131 .icon-circle { 131 .icon-circle {
132 position: relative; 132 position: relative;
133 } 133 }
134 134
135 .icon-circle::before { 135 .icon-circle::before {
136 content: ""; 136 content: "";
137 width: 4px; 137 width: 4px;
138 height: 4px; 138 height: 4px;
...@@ -140,5 +140,5 @@ export default { ...@@ -140,5 +140,5 @@ export default {
140 background: #000; 140 background: #000;
141 top: 0px; 141 top: 0px;
142 left: 0px; 142 left: 0px;
143 } 143 }
144 </style> 144 </style>
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-25 13:40:13 4 * @LastEditTime: 2024-01-25 14:21:36
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <div v-if="this.isShowdrawer"> 13 <div v-if="this.isShowdrawer">
14 <div class="title"> 14 <div class="title">
15 申请单元列表({{ unitData.length }}) 15 申请单元列表({{ unitData.length }})
16 <!-- <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button> --> 16 <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1&& isDel">批量删除</el-button>
17 </div> 17 </div>
18 <el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick"> 18 <el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick">
19 <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index"> 19 <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <p v-else class="title-detail">{{ item.qllxmc }}</p> 25 <p v-else class="title-detail">{{ item.qllxmc }}</p>
26 </el-tooltip> 26 </el-tooltip>
27 </div> 27 </div>
28 <!-- <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i> --> 28 <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1' && isDel" @click.stop="handleDel(item)"></i>
29 </el-menu-item> 29 </el-menu-item>
30 </el-menu> 30 </el-menu>
31 </div> 31 </div>
...@@ -45,6 +45,12 @@ ...@@ -45,6 +45,12 @@
45 import { mapGetters } from 'vuex' 45 import { mapGetters } from 'vuex'
46 import { leftMenu, deleteSlbdcdy, jdcxLeftMenu } from "@/api/workFlow.js" 46 import { leftMenu, deleteSlbdcdy, jdcxLeftMenu } from "@/api/workFlow.js"
47 export default { 47 export default {
48 props: {
49 isDel: {
50 type: Boolean,
51 default: true
52 }
53 },
48 data () { 54 data () {
49 return { 55 return {
50 key: 0, 56 key: 0,
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-25 13:40:28 4 * @LastEditTime: 2024-01-25 14:21:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <p class="title-detail">{{ item.zl }}</p> 23 <p class="title-detail">{{ item.zl }}</p>
24 </el-tooltip> 24 </el-tooltip>
25 </div> 25 </div>
26 <!-- <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i> --> 26 <i class="el-icon-delete" v-if="aroundUnitData.length > 1 && isDel" @click.stop="handleDel(item,'around')"></i>
27 </el-menu-item> 27 </el-menu-item>
28 </el-menu> 28 </el-menu>
29 <!-- 变更后单元 --> 29 <!-- 变更后单元 -->
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <p class="title-detail">{{ item.zl }}</p> 39 <p class="title-detail">{{ item.zl }}</p>
40 </el-tooltip> 40 </el-tooltip>
41 </div> 41 </div>
42 <!-- <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i> --> 42 <i class="el-icon-delete" v-if="afterUnitData.length > 1 && isDel" @click.stop="handleDel(item, 'after')"></i>
43 </el-menu-item> 43 </el-menu-item>
44 </el-menu> 44 </el-menu>
45 </div> 45 </div>
......
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
25 </el-col> 25 </el-col>
26 <el-col :span="8"> 26 <el-col :span="8">
27 <el-form-item label="行政区划区县代码:"> 27 <el-form-item label="行政区划区县代码:">
28 <el-input v-model="ruleForm.AREACODE"></el-input> 28 <el-input v-model="ruleForm.areacode"></el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="8"> 31 <el-col :span="8">
32 <el-form-item label="登记系统业务号:"> 32 <el-form-item label="登记系统业务号:">
33 <el-input v-model="ruleForm.YWH"></el-input> 33 <el-input v-model="ruleForm.ywh"></el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 </el-row> 36 </el-row>
...@@ -43,47 +43,47 @@ ...@@ -43,47 +43,47 @@
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="原户主姓名:"> 45 <el-form-item label="原户主姓名:">
46 <el-input v-model="ruleForm.MC_OLD"></el-input> 46 <el-input v-model="ruleForm.mcOld"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="8"> 49 <el-col :span="8">
50 <el-form-item label="原户主身份证号码:"> 50 <el-form-item label="原户主身份证号码:">
51 <el-input v-model="ruleForm.ZJHM_OLD"></el-input> 51 <el-input v-model="ruleForm.zjhmOld"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 </el-row> 54 </el-row>
55 <el-row :gutter="10"> 55 <el-row :gutter="10">
56 <el-col :span="8"> 56 <el-col :span="8">
57 <el-form-item label="原户主联系电话:"> 57 <el-form-item label="原户主联系电话:">
58 <el-input v-model="ruleForm.LXDH_OLD"></el-input> 58 <el-input v-model="ruleForm.lxdhOld"></el-input>
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 <el-col :span="8"> 61 <el-col :span="8">
62 <el-form-item label="新户主姓名:"> 62 <el-form-item label="新户主姓名:">
63 <el-input v-model="ruleForm.MC_NEW"></el-input> 63 <el-input v-model="ruleForm.mcNew"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="新户主身份证号码:"> 67 <el-form-item label="新户主身份证号码:">
68 <el-input v-model="ruleForm.ZJHM_NEW"></el-input> 68 <el-input v-model="ruleForm.zjhmNew"></el-input>
69 </el-form-item> 69 </el-form-item>
70 </el-col> 70 </el-col>
71 </el-row> 71 </el-row>
72 <el-row :gutter="10"> 72 <el-row :gutter="10">
73 <el-col :span="8"> 73 <el-col :span="8">
74 <el-form-item label="新户主联系电话:"> 74 <el-form-item label="新户主联系电话:">
75 <el-input v-model="ruleForm.LXDH_NEW"></el-input> 75 <el-input v-model="ruleForm.lxdhNew"></el-input>
76 </el-form-item> 76 </el-form-item>
77 </el-col> 77 </el-col>
78 <el-col :span="8"> 78 <el-col :span="8">
79 <el-form-item label="房产证编号:"> 79 <el-form-item label="房产证编号:">
80 <el-input v-model="ruleForm.FCZBH"></el-input> 80 <el-input v-model="ruleForm.fczbh"></el-input>
81 </el-form-item> 81 </el-form-item>
82 </el-col> 82 </el-col>
83 <el-col :span="8"> 83 <el-col :span="8">
84 <el-form-item label="是否过户:"> 84 <el-form-item label="是否过户:">
85 <el-switch 85 <el-switch
86 v-model="ruleForm.SFGH" 86 v-model="ruleForm.sfgh"
87 :active-value='1' 87 :active-value='1'
88 active-text="是" 88 active-text="是"
89 :inactive-value="0" 89 :inactive-value="0"
...@@ -96,17 +96,23 @@ ...@@ -96,17 +96,23 @@
96 <el-row :gutter="10"> 96 <el-row :gutter="10">
97 <el-col :span="24"> 97 <el-col :span="24">
98 <el-form-item label="房屋坐落(地址):"> 98 <el-form-item label="房屋坐落(地址):">
99 <el-input v-model="ruleForm.FWZL" type="textarea" 99 <el-input v-model="ruleForm.fwzl" type="textarea"
100 :rows="2"></el-input> 100 :rows="2"></el-input>
101 </el-form-item> 101 </el-form-item>
102 </el-col> 102 </el-col>
103 </el-row> 103 </el-row>
104 <el-row class="btn" v-if="viewEdit">
105 <el-form-item>
106 <el-button type="primary" @click="onSubmit">保存</el-button>
107 </el-form-item>
108 </el-row>
104 </div> 109 </div>
105 </el-form> 110 </el-form>
106 </div> 111 </div>
107 </template> 112 </template>
108 <script> 113 <script>
109 import { mapGetters } from "vuex"; 114 import { mapGetters } from "vuex";
115 import { getDlxxByBsmSldy, saveOrUpdateDlxx } from "@/api/sfxx.js";
110 export default { 116 export default {
111 computed: { 117 computed: {
112 ...mapGetters(["dictData", "flag"]), 118 ...mapGetters(["dictData", "flag"]),
...@@ -119,6 +125,8 @@ ...@@ -119,6 +125,8 @@
119 formdata.append("bsmSldy", this.propsParam.bsmSldy); 125 formdata.append("bsmSldy", this.propsParam.bsmSldy);
120 formdata.append("djlx", this.propsParam.djlx); 126 formdata.append("djlx", this.propsParam.djlx);
121 formdata.append("isEdit", this.viewEdit); 127 formdata.append("isEdit", this.viewEdit);
128 console.log(this.propsParam)
129 this.getDlxxByBsmSldy()
122 }, 130 },
123 data () { 131 data () {
124 return { 132 return {
...@@ -131,6 +139,25 @@ ...@@ -131,6 +139,25 @@
131 } 139 }
132 }, 140 },
133 methods: { 141 methods: {
142 getDlxxByBsmSldy() {
143 getDlxxByBsmSldy(this.propsParam.bsmSldy).then((res) => {
144 if (res.code === 200) {
145 if (res.result != null) {
146 this.ruleForm = res.result
147 }
148 }
149 });
150 },
151 saveOrUpdateDlxx() {
152 saveOrUpdateDlxx(this.ruleForm).then((res) => {
153 if (res.code === 200) {
154 this.$message.success("成功")
155 }
156 });
157 },
158 onSubmit () {
159 this.saveOrUpdateDlxx()
160 }
134 } 161 }
135 } 162 }
136 </script> 163 </script>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-23 10:21:28 4 * @LastEditTime: 2024-01-25 14:22:07
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 <!-- 内容框架 --> 26 <!-- 内容框架 -->
27 <div class="containerFrame"> 27 <div class="containerFrame">
28 <!-- 左侧菜单栏 区分业务--> 28 <!-- 左侧菜单栏 区分业务-->
29 <segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" /> 29 <segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" :isDel="false" @getCurrentSelectProps="getCurrentSelectProps" />
30 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> 30 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" :isDel="false" />
31 31
32 <div class="leftCon"> 32 <div class="leftCon">
33 <!-- 分屏左侧预览 --> 33 <!-- 分屏左侧预览 -->
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-23 16:05:38 4 * @LastEditTime: 2024-01-25 14:15:55
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -179,7 +179,10 @@ ...@@ -179,7 +179,10 @@
179 </el-col> 179 </el-col>
180 <el-col :span="8"> 180 <el-col :span="8">
181 <el-form-item label="土地所有权性质:"> 181 <el-form-item label="土地所有权性质:">
182 <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.tdsyqxz"></el-input> 182 <el-select clearable v-model="ruleForm.tdcbjyq.tdsyqxz" class="width100" placeholder="请选择" :disabled="!viewEdit">
183 <el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
184 </el-option>
185 </el-select>
183 </el-form-item> 186 </el-form-item>
184 </el-col> 187 </el-col>
185 </el-row> 188 </el-row>
...@@ -207,7 +210,10 @@ ...@@ -207,7 +210,10 @@
207 </el-col> 210 </el-col>
208 <el-col :span="8"> 211 <el-col :span="8">
209 <el-form-item label="用地用海分类:"> 212 <el-form-item label="用地用海分类:">
210 <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.ydyhfl"></el-input> 213 <el-select clearable v-model="ruleForm.tdcbjyq.ydyhfl" class="width100" placeholder="请选择" :disabled="!viewEdit">
214 <el-option v-for="item in dictData['A56']" :key="item.dcode" :label="item.dname" :value="item.dcode">
215 </el-option>
216 </el-select>
211 </el-form-item> 217 </el-form-item>
212 </el-col> 218 </el-col>
213 </el-row> 219 </el-row>
...@@ -215,7 +221,10 @@ ...@@ -215,7 +221,10 @@
215 <el-row :gutter="10"> 221 <el-row :gutter="10">
216 <el-col :span="8"> 222 <el-col :span="8">
217 <el-form-item label="承包经营权取得方式:"> 223 <el-form-item label="承包经营权取得方式:">
218 <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.cbjyqqdfs"></el-input> 224 <el-select clearable v-model="ruleForm.tdcbjyq.cbjyqqdfs" class="width100" placeholder="请选择" :disabled="!viewEdit">
225 <el-option v-for="item in dictData['A59']" :key="item.dcode" :label="item.dname" :value="item.dcode">
226 </el-option>
227 </el-select>
219 </el-form-item> 228 </el-form-item>
220 </el-col> 229 </el-col>
221 <el-col :span="16"> 230 <el-col :span="16">
...@@ -278,7 +287,7 @@ ...@@ -278,7 +287,7 @@
278 :key="key" 287 :key="key"
279 :gyfs="ruleForm.sldy.gyfs" /> 288 :gyfs="ruleForm.sldy.gyfs" />
280 289
281 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0"> 290 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0 && ruleForm.qlxx.djlx == '200'">
282 <div class="slxx_title title-block"> 291 <div class="slxx_title title-block">
283 义务人信息 292 义务人信息
284 <div class="triangle"></div> 293 <div class="triangle"></div>
...@@ -401,8 +410,8 @@ ...@@ -401,8 +410,8 @@
401 ruleForm: {}, 410 ruleForm: {},
402 //传递参数 411 //传递参数
403 propsParam: {}, 412 propsParam: {},
404 rules: {}, 413 rules: {}
405 }; 414 }
406 }, 415 },
407 methods: { 416 methods: {
408 /** 417 /**
...@@ -502,23 +511,30 @@ ...@@ -502,23 +511,30 @@
502 * @description: saveData 511 * @description: saveData
503 * @author: renchao 512 * @author: renchao
504 */ 513 */
505 this.$store.dispatch("user/refreshPage", false); 514
506 saveData(this.ruleForm).then((res) => { 515 this.$refs['ruleForm'].validate((valid) => {
516 if (valid) {
517 that.$store.dispatch("user/refreshPage", false);
518 saveData(that.ruleForm).then((res) => {
507 if (res.code === 200) { 519 if (res.code === 200) {
508 this.$message({ 520 that.$message({
509 showClose: true, 521 showClose: true,
510 message: "保存成功!", 522 message: "保存成功!",
511 type: "success", 523 type: "success",
512 }); 524 });
513 this.$store.dispatch("user/refreshPage", true); 525 that.$store.dispatch("user/refreshPage", true);
514 } else { 526 } else {
515 this.$message({ 527 that.$message({
516 showClose: true, 528 showClose: true,
517 message: res.message, 529 message: res.message,
518 type: "error" 530 type: "error"
519 }) 531 })
520 } 532 }
521 }) 533 })
534 } else {
535 return false;
536 }
537 })
522 } 538 }
523 } 539 }
524 } 540 }
...@@ -526,4 +542,7 @@ ...@@ -526,4 +542,7 @@
526 <style scoped lang="scss"> 542 <style scoped lang="scss">
527 @import "~@/styles/public.scss"; 543 @import "~@/styles/public.scss";
528 @import "~@/styles/slxx/slxx.scss"; 544 @import "~@/styles/slxx/slxx.scss";
545 /deep/.el-form-item__error {
546 display: none;
547 }
529 </style> 548 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 17:30:08 4 * @LastEditTime: 2024-01-25 15:01:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
69 :current-page.sync="pageData.currentPage" 69 :current-page.sync="pageData.currentPage"
70 :total="tableData.total" 70 :total="tableData.total"
71 @size-change="handleSizeChange" 71 @size-change="handleSizeChange"
72 @select="select"
73 @p-current-change="handleCurrentChange" 72 @p-current-change="handleCurrentChange"
74 @selection-change="handleSelectionChange" 73 @selection-change="handleSelectionChange"
75 :column="tableData.columns" 74 :column="tableData.columns"
...@@ -99,6 +98,7 @@ ...@@ -99,6 +98,7 @@
99 mixins: [ywsqTable, jump], 98 mixins: [ywsqTable, jump],
100 data () { 99 data () {
101 return { 100 return {
101 radioVal: '',
102 loading: false, 102 loading: false,
103 queryForm: defaultParameters.defaultParameters(), 103 queryForm: defaultParameters.defaultParameters(),
104 tableData: { 104 tableData: {
...@@ -111,6 +111,28 @@ ...@@ -111,6 +111,28 @@
111 }, 111 },
112 mounted () { 112 mounted () {
113 sendThis(this); 113 sendThis(this);
114 if (this.sqywInfo.sqywdylx == "1") {
115 this.tableData.columns = [{
116 label: '选择',
117 width: '50px',
118 render: (h, scope) => {
119 return (
120 <div class="orgColumn">
121 <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
122 &ensp;
123 </el-radio>
124 </div>
125 )
126 }
127 }].concat(datas.columns())
128 } else {
129 this.tableData.columns =
130 [{
131 type: 'selection',
132 label: '全选',
133 width: '50'
134 }].concat(datas.columns())
135 }
114 }, 136 },
115 methods: { 137 methods: {
116 /** 138 /**
...@@ -207,54 +229,26 @@ ...@@ -207,54 +229,26 @@
207 } 229 }
208 }, 230 },
209 /** 231 /**
210 * @description: select
211 * @param {*} selection
212 * @param {*} row
213 * @author: renchao
214 */
215 select (selection, row) {
216 if (this.sqywInfo.sqywdylx == "1") {
217 // 清除 所有勾选项
218 this.$refs.table.clearSelection();
219 // 当表格数据都没有被勾选的时候 就返回
220 // 主要用于将当前勾选的表格状态清除
221 if (selection.length == 0) return;
222 this.$refs.table.toggleRowSelection(row, true);
223 }
224 },
225 /**
226 * @description: handleRowClick 232 * @description: handleRowClick
227 * @param {*} row 233 * @param {*} row
228 * @author: renchao 234 * @author: renchao
229 */ 235 */
236 handleChange () {
237 let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
238 arr[0].bsm = arr[0].zdbsm
239 this.bdcdysz = arr
240 },
230 handleRowClick (row) { 241 handleRowClick (row) {
231 // 如果状态是1,那就是单选 242 // 如果状态是1,那就是单选
243 let refs = 'table';
232 if (this.sqywInfo.sqywdylx == "1") { 244 if (this.sqywInfo.sqywdylx == "1") {
233 const bdcdysz = this.bdcdysz; 245 row.bsm = row.zdbsm
234 this.$refs.table.clearSelection(); 246 this.bdcdysz = [row]
235 if (bdcdysz.length == 1) { 247 this.radioVal = row.bdcdyid
236 bdcdysz.forEach((item) => {
237 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
238 if (item == row) {
239 this.$refs.table.toggleRowSelection(row, false);
240 }
241 // 不然就让当前的一行勾选
242 else {
243 this.$refs.table.toggleRowSelection(row, true);
244 }
245 });
246 } else { 248 } else {
247 this.$refs.table.toggleRowSelection(row, true); 249 this.$refs[refs].toggleRowSelection(row)
248 }
249 } else {
250 this.$refs.table.toggleRowSelection(row);
251 } 250 }
252 }, 251 },
253 /**
254 * @description: openBook
255 * @param {*} row
256 * @author: miaofang
257 */
258 openBook (row) { 252 openBook (row) {
259 var param = { 253 var param = {
260 bdcdyid: row.bdcdyid, 254 bdcdyid: row.bdcdyid,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 15:34:28 4 * @LastEditTime: 2024-01-25 14:59:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </div> 74 </div>
75 <div class="from-clues-content loadingtext"> 75 <div class="from-clues-content loadingtext">
76 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 76 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
77 :current-page.sync="pageData.currentPage" :total="zrztableData.total" 77 :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
78 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" 78 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
79 :data="zrztableData.data"> 79 :data="zrztableData.data">
80 </lb-table> 80 </lb-table>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 17:20:34 4 * @LastEditTime: 2024-01-25 14:59:36
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 </div> 62 </div>
63 <div class="from-clues-content loadingtext"> 63 <div class="from-clues-content loadingtext">
64 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 64 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" 65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" 66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
67 :data="zrztableData.data"> 67 :data="zrztableData.data">
68 </lb-table> 68 </lb-table>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-19 16:25:18 4 * @LastEditTime: 2024-01-25 14:45:25
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -180,9 +180,6 @@ ...@@ -180,9 +180,6 @@
180 * @author: renchao 180 * @author: renchao
181 */ 181 */
182 handleSelectionChange (val) { 182 handleSelectionChange (val) {
183 val.forEach((item, index) => {
184 item.bsm = item.zdbsm;
185 });
186 if (this.sqywInfo.sqywdylx == "1") { 183 if (this.sqywInfo.sqywdylx == "1") {
187 if (val.length > 1) { 184 if (val.length > 1) {
188 this.bdcdysz = [...val[val.length - 1]]; 185 this.bdcdysz = [...val[val.length - 1]];
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-16 14:13:30 4 * @LastEditTime: 2024-01-25 14:45:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
8 <!-- 表单部分 森林林木 --> 8 <!-- 表单部分 森林林木 -->
9 <div class="from-clues-header"> 9 <div class="from-clues-header">
10 <el-form :model="queryForm" ref="queryForm"> 10 <el-form :model="queryForm" ref="queryForm" label-width="100px">
11 <el-row :gutter="20"> 11 <el-row :gutter="20">
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="宗地代码"> 13 <el-form-item label="宗地代码">
...@@ -27,10 +27,22 @@ ...@@ -27,10 +27,22 @@
27 </el-input> 27 </el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6" class="btnColRight"> 30 <el-col :span="6">
31 <el-form-item label="权利人">
32 <el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
33 </el-input>
34 </el-form-item>
35 </el-col>
36 <el-col :span="6">
37 <el-form-item label="证件号">
38 <el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
39 </el-input>
40 </el-form-item>
41 </el-col>
42 <el-col :span="18" class="btnColRight">
31 <el-form-item> 43 <el-form-item>
32 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
33 <el-button type="primary" @click="handleSearch">查询</el-button> 44 <el-button type="primary" @click="handleSearch">查询</el-button>
45 <el-button type="primary" @click="resetForm(true)">重置</el-button>
34 </el-form-item> 46 </el-form-item>
35 </el-col> 47 </el-col>
36 </el-row> 48 </el-row>
...@@ -39,7 +51,7 @@ ...@@ -39,7 +51,7 @@
39 <!-- 表格 --> 51 <!-- 表格 -->
40 <div class="from-clues-content loadingtext"> 52 <div class="from-clues-content loadingtext">
41 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 53 <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" 54 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
43 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" 55 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
44 :data="tableData.data"> 56 :data="tableData.data">
45 </lb-table> 57 </lb-table>
...@@ -68,6 +80,7 @@ ...@@ -68,6 +80,7 @@
68 }, 80 },
69 data () { 81 data () {
70 return { 82 return {
83 radioVal: '',
71 loading: false, 84 loading: false,
72 queryForm: defaultParameters.defaultParameters(), 85 queryForm: defaultParameters.defaultParameters(),
73 tableData: { 86 tableData: {
...@@ -80,6 +93,28 @@ ...@@ -80,6 +93,28 @@
80 }, 93 },
81 mounted () { 94 mounted () {
82 sendThis(this); 95 sendThis(this);
96 if (this.sqywInfo.sqywdylx == "1") {
97 this.tableData.columns = [{
98 label: '选择',
99 width: '50px',
100 render: (h, scope) => {
101 return (
102 <div class="orgColumn">
103 <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
104 &ensp;
105 </el-radio>
106 </div>
107 )
108 }
109 }].concat(datas.columns())
110 } else {
111 this.tableData.columns =
112 [{
113 type: 'selection',
114 label: '全选',
115 width: '50'
116 }].concat(datas.columns())
117 }
83 }, 118 },
84 methods: { 119 methods: {
85 /** 120 /**
...@@ -96,9 +131,8 @@ ...@@ -96,9 +131,8 @@
96 this.tableData.total = total; 131 this.tableData.total = total;
97 this.tableData.data = records; 132 this.tableData.data = records;
98 } 133 }
99 }); 134 })
100 }, 135 },
101
102 /** 136 /**
103 * @description: submitForm 137 * @description: submitForm
104 * @author: renchao 138 * @author: renchao
...@@ -157,49 +191,22 @@ ...@@ -157,49 +191,22 @@
157 } 191 }
158 }, 192 },
159 /** 193 /**
160 * @description: select
161 * @param {*} selection
162 * @param {*} row
163 * @author: renchao
164 */
165 select (selection, row) {
166 if (this.sqywInfo.sqywdylx == "1") {
167 // 清除 所有勾选项
168 this.$refs.table.clearSelection()
169 // 当表格数据都没有被勾选的时候 就返回
170 // 主要用于将当前勾选的表格状态清除
171 if (selection.length == 0) return
172 this.$refs.table.toggleRowSelection(row, true);
173 }
174 },
175
176 /**
177 * @description: handleRowClick 194 * @description: handleRowClick
178 * @param {*} row 195 * @param {*} row
179 * @author: renchao 196 * @author: renchao
180 */ 197 */
198 handleChange () {
199 let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
200 this.bdcdysz = arr
201 },
181 handleRowClick (row) { 202 handleRowClick (row) {
182 // 如果状态是1,那就是单选 203 // 如果状态是1,那就是单选
204 let refs = 'table';
183 if (this.sqywInfo.sqywdylx == "1") { 205 if (this.sqywInfo.sqywdylx == "1") {
184 const bdcdysz = this.bdcdysz 206 this.bdcdysz = [row]
185 this.$refs.table.clearSelection() 207 this.radioVal = row.bdcdyid
186 if (bdcdysz.length == 1) {
187 bdcdysz.forEach(item => {
188 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
189 if (item == row) {
190 this.$refs.table.toggleRowSelection(row, false);
191 }
192 // 不然就让当前的一行勾选
193 else {
194 this.$refs.table.toggleRowSelection(row, true);
195 }
196 })
197 }
198 else {
199 this.$refs.table.toggleRowSelection(row, true);
200 }
201 } else { 208 } else {
202 this.$refs.table.toggleRowSelection(row); 209 this.$refs[refs].toggleRowSelection(row)
203 } 210 }
204 }, 211 },
205 /** 212 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 17:26:18 4 * @LastEditTime: 2024-01-25 14:37:38
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 <!-- 表格 --> 52 <!-- 表格 -->
53 <div class="from-clues-content loadingtext"> 53 <div class="from-clues-content loadingtext">
54 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 54 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
55 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select" 55 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
56 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" 56 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
57 :data="tableData.data"> 57 :data="tableData.data">
58 </lb-table> 58 </lb-table>
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
80 }, 80 },
81 data () { 81 data () {
82 return { 82 return {
83 radioVal: '',
83 loading: false, 84 loading: false,
84 queryForm: defaultParameters.defaultParameters(), 85 queryForm: defaultParameters.defaultParameters(),
85 tableData: { 86 tableData: {
...@@ -87,11 +88,33 @@ ...@@ -87,11 +88,33 @@
87 columns: datas.columns(), 88 columns: datas.columns(),
88 data: [], 89 data: [],
89 }, 90 },
90 bdcdysz: [], 91 bdcdysz: []
91 }; 92 }
92 }, 93 },
93 mounted () { 94 mounted () {
94 sendThis(this); 95 sendThis(this);
96 if (this.sqywInfo.sqywdylx == "1") {
97 this.tableData.columns = [{
98 label: '选择',
99 width: '50px',
100 render: (h, scope) => {
101 return (
102 <div class="orgColumn">
103 <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
104 &ensp;
105 </el-radio>
106 </div>
107 )
108 }
109 }].concat(datas.columns())
110 } else {
111 this.tableData.columns =
112 [{
113 type: 'selection',
114 label: '全选',
115 width: '50'
116 }].concat(datas.columns())
117 }
95 }, 118 },
96 methods: { 119 methods: {
97 /** 120 /**
...@@ -164,21 +187,10 @@ ...@@ -164,21 +187,10 @@
164 this.bdcdysz = val; 187 this.bdcdysz = val;
165 } 188 }
166 }, 189 },
167 /** 190 handleChange () {
168 * @description: select 191 let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
169 * @param {*} selection 192 arr[0].bsm = arr[0].zdbsm
170 * @param {*} row 193 this.bdcdysz = arr
171 * @author: renchao
172 */
173 select (selection, row) {
174 if (this.sqywInfo.sqywdylx == "1") {
175 // 清除 所有勾选项
176 this.$refs.table.clearSelection()
177 // 当表格数据都没有被勾选的时候 就返回
178 // 主要用于将当前勾选的表格状态清除
179 if (selection.length == 0) return
180 this.$refs.table.toggleRowSelection(row, true);
181 }
182 }, 194 },
183 /** 195 /**
184 * @description: handleRowClick 196 * @description: handleRowClick
...@@ -187,26 +199,13 @@ ...@@ -187,26 +199,13 @@
187 */ 199 */
188 handleRowClick (row) { 200 handleRowClick (row) {
189 // 如果状态是1,那就是单选 201 // 如果状态是1,那就是单选
202 let refs = 'table';
190 if (this.sqywInfo.sqywdylx == "1") { 203 if (this.sqywInfo.sqywdylx == "1") {
191 const bdcdysz = this.bdcdysz 204 row.bsm = row.zdbsm
192 this.$refs.table.clearSelection() 205 this.bdcdysz = [row]
193 if (bdcdysz.length == 1) { 206 this.radioVal = row.bdcdyid
194 bdcdysz.forEach(item => {
195 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
196 if (item == row) {
197 this.$refs.table.toggleRowSelection(row, false);
198 }
199 // 不然就让当前的一行勾选
200 else {
201 this.$refs.table.toggleRowSelection(row, true);
202 }
203 })
204 }
205 else {
206 this.$refs.table.toggleRowSelection(row, true);
207 }
208 } else { 207 } else {
209 this.$refs.table.toggleRowSelection(row); 208 this.$refs[refs].toggleRowSelection(row)
210 } 209 }
211 }, 210 },
212 /** 211 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 17:15:13 4 * @LastEditTime: 2024-01-25 14:57:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 </div> 62 </div>
63 <div class="from-clues-content loadingtext"> 63 <div class="from-clues-content loadingtext">
64 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 64 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" 65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" 66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
67 :data="zrztableData.data"> 67 :data="zrztableData.data">
68 </lb-table> 68 </lb-table>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-31 08:56:52 4 * @LastEditTime: 2024-01-25 14:38:58
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -15,11 +15,11 @@ class data extends filter { ...@@ -15,11 +15,11 @@ class data extends filter {
15 } 15 }
16 columns () { 16 columns () {
17 return [ 17 return [
18 { 18 // {
19 type: 'selection', 19 // type: 'selection',
20 label: '全选', 20 // label: '全选',
21 selectable: this.selected 21 // selectable: this.selected
22 }, 22 // },
23 { 23 {
24 label: '序号', 24 label: '序号',
25 type: 'index', 25 type: 'index',
......