5963d615 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 707abb33 6b930cd5
...@@ -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-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: 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',
......