Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
849dcd79 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 369296e7 fcf0c30a
Expand all
Inline Side-by-side
Showing 13 changed files with 92 additions and 44 deletions
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
117 * @author: renchao 117 * @author: renchao
118 */ 118 */
119 loadBdcdylist () { 119 loadBdcdylist () {
120 console.log("获取currentSelectProps表单并加载");
121 var formdata = new FormData(); 120 var formdata = new FormData();
122 if (this.bsmSlsq) { 121 if (this.bsmSlsq) {
123 formdata.append("bsmSlsq", this.bsmSlsq); 122 formdata.append("bsmSlsq", this.bsmSlsq);
...@@ -139,7 +138,6 @@ ...@@ -139,7 +138,6 @@
139 * @author: renchao 138 * @author: renchao
140 */ 139 */
141 getleftMenubl (row) { 140 getleftMenubl (row) {
142 console.log("获取右侧菜单传参",row);
143 141
144 leftMenubl(this.bsmSlsq).then((res) => { 142 leftMenubl(this.bsmSlsq).then((res) => {
145 this.supplementarylist = res.result; 143 this.supplementarylist = res.result;
...@@ -156,7 +154,6 @@ ...@@ -156,7 +154,6 @@
156 this.unitClick(0) 154 this.unitClick(0)
157 this.activeIndex = "0" 155 this.activeIndex = "0"
158 } else { 156 } else {
159 console.log("左侧列表为空");
160 this.loadBdcdylist() 157 this.loadBdcdylist()
161 // this.$emit("getCurrentSelectProps", this.currentSelectProps); 158 // this.$emit("getCurrentSelectProps", this.currentSelectProps);
162 } 159 }
...@@ -186,7 +183,6 @@ ...@@ -186,7 +183,6 @@
186 * @author: renchao 183 * @author: renchao
187 */ 184 */
188 unitClick (index) { 185 unitClick (index) {
189 console.log("index数据的下标",index);
190 this.currentSelectProps = this.supplementarylist[index]; 186 this.currentSelectProps = this.supplementarylist[index];
191 this.$emit("getCurrentSelectProps", this.currentSelectProps); 187 this.$emit("getCurrentSelectProps", this.currentSelectProps);
192 }, 188 },
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </el-col> 41 </el-col>
42 </el-row> 42 </el-row>
43 <div class="slxx_title title-block"> 43 <div class="slxx_title title-block">
44 查封不动产情况 44 查封登记不动产情况
45 <div class="triangle"></div> 45 <div class="triangle"></div>
46 </div> 46 </div>
47 <el-row :gutter="10"> 47 <el-row :gutter="10">
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <el-row :gutter="10"> 46 <el-row :gutter="10">
47 <el-col :span="8"> 47 <el-col :span="8">
48 <el-form-item 48 <el-form-item
49 label="抵押不动产信息：" 49 label="地役权不动产信息："
50 prop="ztQlxx.bdcqzh" 50 prop="ztQlxx.bdcqzh"
51 :rules="rules.ztQlxxrules" 51 :rules="rules.ztQlxxrules"
52 > 52 >
......
...@@ -554,7 +554,6 @@ ...@@ -554,7 +554,6 @@
554 * @author: renchao 554 * @author: renchao
555 */ 555 */
556 djlxchange (val) { 556 djlxchange (val) {
557 console.log("val", val);
558 if (val == null || val == 100) { 557 if (val == null || val == 100) {
559 this.ssqlxxshow = false; 558 this.ssqlxxshow = false;
560 } else { 559 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 10:18:10 4 * @LastEditTime: 2023-07-31 14:30:56
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 建设用地、宅基地使用权信息 41 建设用地、宅基地使用权信息
42 <div class="triangle"></div> 42 <div class="triangle"></div>
43 </div> 43 </div>
44 <el-row :gutter="10"> 44 <el-row :gutter="24">
45 <el-col :span="8" v-if="ssqlxxshow"> 45 <el-col :span="8" v-if="ssqlxxshow">
46 <el-form-item label="上手权利信息："> 46 <el-form-item label="上手权利信息：">
47 <select-table 47 <select-table
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
65 </select-table> 65 </select-table>
66 </el-form-item> 66 </el-form-item>
67 </el-col> 67 </el-col>
68 </el-row>
69 <el-row :gutter="10">
68 <el-col :span="8"> 70 <el-col :span="8">
69 <el-form-item label="不动产单元号："> 71 <el-form-item label="不动产单元号：">
70 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 72 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
...@@ -377,8 +379,17 @@ ...@@ -377,8 +379,17 @@
377 }, 379 },
378 }; 380 };
379 }, 381 },
380 created () { 382 /**
381 this.loadData(); 383 * @description: djlxchange
384 * @param {*} val
385 * @author: renchao
386 */
387 djlxchange (val) {
388 if (val == null || val == 100) {
389 this.ssqlxxshow = false;
390 } else {
391 this.ssqlxxshow = true;
392 }
382 }, 393 },
383 mounted () { 394 mounted () {
384 this.ableOperation = this.$parent.ableOperation 395 this.ableOperation = this.$parent.ableOperation
......
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
42 </el-col> 42 </el-col>
43 </el-row> 43 </el-row>
44 <div class="slxx_title title-block"> 44 <div class="slxx_title title-block">
45 抵押不动产情况 45 预告抵押登记信息不动产情况
46 <div class="triangle"></div> 46 <div class="triangle"></div>
47 </div> 47 </div>
48 <el-row :gutter="10"> 48 <el-row :gutter="10">
49 <el-col :span="8"> 49 <el-col :span="8" v-if="ztQlxxList">
50 <el-form-item label="抵押不动产信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules"> 50 <el-form-item label="抵押不动产信息：" prop="ztQlxx" :rules="rules.ztQlxxrules">
51 <select-table 51 <select-table
52 v-model="ruleForm.ztQlxx" 52 v-model="ruleForm.ztQlxx"
53 :table-width="550" 53 :table-width="550"
...@@ -588,7 +588,6 @@ export default { ...@@ -588,7 +588,6 @@ export default {
588 * @author: renchao 588 * @author: renchao
589 */ 589 */
590 djlxchange(val) { 590 djlxchange(val) {
591 console.log("val",val);
592 if (val == null || val == 100) { 591 if (val == null || val == 100) {
593 this.ssqlxxshow = false; 592 this.ssqlxxshow = false;
594 } else { 593 } else {
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-col> 42 </el-col>
43 </el-row> 43 </el-row>
44 <div class="slxx_title title-block"> 44 <div class="slxx_title title-block">
45 预告登记信息 45 预告买卖登记信息不动产情况
46 <div class="triangle"></div> 46 <div class="triangle"></div>
47 </div> 47 </div>
48 <el-row :gutter="10"> 48 <el-row :gutter="10">
...@@ -495,7 +495,6 @@ export default { ...@@ -495,7 +495,6 @@ export default {
495 * @author: renchao 495 * @author: renchao
496 */ 496 */
497 djlxchange(val) { 497 djlxchange(val) {
498 console.log("val",val);
499 if (val == null || val == 100) { 498 if (val == null || val == 100) {
500 this.ssqlxxshow = false; 499 this.ssqlxxshow = false;
501 } else { 500 } else {
......
...@@ -47,7 +47,10 @@ ...@@ -47,7 +47,10 @@
47 当前流程所在环节: 47 当前流程所在环节:
48 <span>{{ this.zbhj }}</span> 48 <span>{{ this.zbhj }}</span>
49 </div> 49 </div>
50 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 50 <el-tabs
51 v-model="tabName"
52 :before-leave="beforeLeave"
53 @tab-click="handleClick">
51 <el-tab-pane 54 <el-tab-pane
52 :label="item.name" 55 :label="item.name"
53 :name="item.value" 56 :name="item.value"
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 11:37:31 4 * @LastEditTime: 2023-07-31 13:59:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -253,7 +253,8 @@ ...@@ -253,7 +253,8 @@
253 //查看明细 253 //查看明细
254 viewDetail () { 254 viewDetail () {
255 this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", { 255 this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", {
256 data: this.tableData 256 data: this.tableData,
257 unitData: this.$parent.unitData
257 }, "60%") 258 }, "60%")
258 }, 259 },
259 //设置tableData 260 //设置tableData
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 09:35:42 4 * @LastEditTime: 2023-07-31 14:27:07
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <div class="title">申请材料目录</div> 8 <div class="title">申请材料目录</div>
9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data"> 9 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
10 </lb-table> 10 </lb-table>
11 <div class="text-center"> 11 <div class="text-center">
12 <el-button @click="$popupCacel">取消</el-button> 12 <el-button @click="$popupCacel">取消</el-button>
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 </div> 14 </div>
15 </template> 15 </template>
16 <script> 16 <script>
17 import Vue from 'vue'
17 import store from '@/store/index.js' 18 import store from '@/store/index.js'
18 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 19 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
19 export default { 20 export default {
...@@ -38,21 +39,21 @@ ...@@ -38,21 +39,21 @@
38 label: "是否必选", 39 label: "是否必选",
39 width: "80", 40 width: "80",
40 render: (h, scope) => { 41 render: (h, scope) => {
41 if (scope.row.sfxjcl === "1") { 42 if (scope.row.isrequired === "1") {
42 return ( 43 return (
43 <div> 44 <div>
44 <span>可选</span> 45 <span>必选</span>
45 </div> 46 </div>
46 ); 47 );
47 } 48 }
48 else { 49 else {
49 return ( 50 return (
50 <div> 51 <div>
51 <span>必选</span> 52 <span>可选</span>
52 </div> 53 </div>
53 ); 54 )
54 } 55 }
55 }, 56 }
56 }, 57 },
57 { 58 {
58 prop: "sjmc", 59 prop: "sjmc",
...@@ -67,13 +68,23 @@ ...@@ -67,13 +68,23 @@
67 <div> 68 <div>
68 <span>{this.dicStatus(scope.row.sjlx, "A40")}</span> 69 <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
69 </div> 70 </div>
70 ); 71 )
71 }, 72 }
72 }, 73 },
73 { 74 {
74 prop: "sjsl", 75 prop: "sjsl",
75 label: "份数", 76 label: "份数",
76 width: "50" 77 width: "50",
78 render: (h, scope) => {
79 return (
80 <div>
81 {
82 scope.row.sjsl ?
83 <span>{scope.row.sjsl}</span> : 1
84 }
85 </div>
86 )
87 }
77 }, 88 },
78 { 89 {
79 prop: "smzt", 90 prop: "smzt",
...@@ -147,11 +158,16 @@ ...@@ -147,11 +158,16 @@
147 tableData: [] 158 tableData: []
148 } 159 }
149 }, 160 },
150 created () { 161 watch: {
151 console.log(this.formData.data, 'formData'); 162 'formData.data': {
163 handler: function (val, oldVal) {
164 this.tableData = val
165 },
166 immediate: true,
167 deep: true
168 }
152 }, 169 },
153 methods: { 170 methods: {
154 // 材料目录明细初始化
155 /** 171 /**
156 * @description: 材料目录明细初始化 172 * @description: 材料目录明细初始化
157 * @author: renchao 173 * @author: renchao
...@@ -160,24 +176,24 @@ ...@@ -160,24 +176,24 @@
160 return new Promise(resolve => { 176 return new Promise(resolve => {
161 this.unitData = this.$parent.unitData; 177 this.unitData = this.$parent.unitData;
162 var formdata = new FormData(); 178 var formdata = new FormData();
163 formdata.append("bsmSldy", this.unitData[0]?.bsmSldy); 179 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
164 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 180 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
165 formdata.append("clfl", 2); 181 formdata.append("clfl", 2);
166 InitClml(formdata).then((res) => { 182 InitClml(formdata).then((res) => {
167 if (res.code == 200) { 183 if (res.code == 200) {
168 resolve(res.code) 184 resolve(res.code)
169 if (res.result && res.result.length > 0) { 185 if (res.result && res.result.length > 0) {
170 this.data = res.result; 186 this.tableData = res.result;
171 } else { 187 } else {
172 this.data = [] 188 this.tableData = []
173 } 189 }
190 console.log(this.tableData, 'this.tableData');
174 } else { 191 } else {
175 this.$message.error(res.message) 192 this.$message.error(res.message)
176 } 193 }
177 }) 194 })
178 }) 195 })
179 }, 196 },
180 // 上移
181 /** 197 /**
182 * @description: 上移 198 * @description: 上移
183 * @param {*} index 199 * @param {*} index
...@@ -199,14 +215,12 @@ ...@@ -199,14 +215,12 @@
199 message: '上移成功', 215 message: '上移成功',
200 type: 'success' 216 type: 'success'
201 }) 217 })
202 this.$parent.setTableData(this.data)
203 } 218 }
204 } else { 219 } else {
205 this.$message.error(res.message); 220 this.$message.error(res.message);
206 } 221 }
207 }) 222 })
208 }, 223 },
209 // 下移
210 /** 224 /**
211 * @description: 下移 225 * @description: 下移
212 * @param {*} index 226 * @param {*} index
...@@ -256,7 +270,6 @@ ...@@ -256,7 +270,6 @@
256 message: "删除成功", 270 message: "删除成功",
257 type: "success", 271 type: "success",
258 }) 272 })
259 // this.$parent.setTableData(this.data)
260 } 273 }
261 } 274 }
262 }) 275 })
...@@ -293,7 +306,6 @@ ...@@ -293,7 +306,6 @@
293 @import "~@/styles/mixin.scss"; 306 @import "~@/styles/mixin.scss";
294 .clmlmx-box { 307 .clmlmx-box {
295 margin: 0 auto; 308 margin: 0 auto;
296
297 .title { 309 .title {
298 text-align: center; 310 text-align: center;
299 height: 60px; 311 height: 60px;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 当前流程所在环节: 39 当前流程所在环节:
40 <span>{{ this.zbhj }}</span> 40 <span>{{ this.zbhj }}</span>
41 </div> 41 </div>
42 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 42 <el-tabs v-model="tabName" :before-leave="beforeLeave" @tab-click="handleClick">
43 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value"> 43 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
44 </el-tab-pane> 44 </el-tab-pane>
45 </el-tabs> 45 </el-tabs>
...@@ -203,7 +203,21 @@ ...@@ -203,7 +203,21 @@
203 } 203 }
204 204
205 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true) 205 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
206 },
207 //选项卡切换事件
208 /**
209 * @description: 右侧表单选项卡事件
210 * @param {*} handleClick
211 * @author: renchao
212 */
213 handleClick(a) {
214 let p = Object.keys(this.tabList[0]).filter(
215 (item) => item == "ableOperation"
216 );
217 if (p) {
218 this.ableOperation = this.tabList[a.index].ableOperation;
206 } 219 }
220 },
207 } 221 }
208 } 222 }
209 </script> 223 </script>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </div> 36 </div>
37 <!-- 表单内容区域 --> 37 <!-- 表单内容区域 -->
38 <div class="rightContainer"> 38 <div class="rightContainer">
39 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 39 <el-tabs v-model="tabName" :before-leave="beforeLeave" @tab-click="handleClick">
40 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value"> 40 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
41 </el-tab-pane> 41 </el-tab-pane>
42 </el-tabs> 42 </el-tabs>
...@@ -148,6 +148,20 @@ ...@@ -148,6 +148,20 @@
148 } 148 }
149 }) 149 })
150 }, 150 },
151 //选项卡切换事件
152 /**
153 * @description: 右侧表单选项卡事件
154 * @param {*} handleClick
155 * @author: renchao
156 */
157 handleClick(a) {
158 let p = Object.keys(this.tabList[0]).filter(
159 (item) => item == "ableOperation"
160 );
161 if (p) {
162 this.ableOperation = this.tabList[a.index].ableOperation;
163 }
164 },
151 } 165 }
152 } 166 }
153 </script> 167 </script>
......