Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
44c80e10 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents a32cc5e0 205828b4
Expand all
Inline Side-by-side
Showing 8 changed files with 77 additions and 60 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 13:13:16 4 * @LastEditTime: 2023-10-10 14:40:07
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" 33 :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
34 @click="treeClick(item, index)"> 34 @click="treeClick(item, index)">
35 <span v-if="item.isrequired == 1" class="required">必选</span> 35 <span v-if="item.isrequired == 1" class="required">必选</span>
36 {{ item.sjmc }} 36 <span class="item_name">{{ item.sjmc }}</span>
37 <span class="cl_number" :key="key">({{ item.ys ? item.ys : 0 }})</span> 37 <span class="cl_number" :key="key">({{ item.ys ? item.ys : 0 }})</span>
38 </div> 38 </div>
39 </div> 39 </div>
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
322 ableOperation: this.$parent.ableOperation, 322 ableOperation: this.$parent.ableOperation,
323 bsmRepair: this.$parent.bsmRepair 323 bsmRepair: this.$parent.bsmRepair
324 }, 324 },
325 "60%", 325 "50%",
326 true 326 true
327 ); 327 );
328 }, 328 },
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
350 } 350 }
351 351
352 .cl_number { 352 .cl_number {
353 float: right; 353 width: 30px;
354 } 354 }
355 355
356 .clxx { 356 .clxx {
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
409 width: 20%; 409 width: 20%;
410 min-width: 160px; 410 min-width: 160px;
411 height: 100%; 411 height: 100%;
412 margin-right: 10px; 412 font-size: 14px;
413 border-right: 1px dotted #d9d9d9; 413 border-right: 1px dotted #d9d9d9;
414 padding: 0 15px; 414 padding: 0 15px;
415 415
...@@ -438,8 +438,16 @@ ...@@ -438,8 +438,16 @@
438 line-height: 20px; 438 line-height: 20px;
439 transition: all 0.3s; 439 transition: all 0.3s;
440 padding: 8px 0; 440 padding: 8px 0;
441 overflow: hidden;
442 display: flex;
443 justify-content: space-between;
444 }
445 .item_name {
446 flex: 1;
447 font-size: 14px;
448 display: flex;
449 justify-content: center;
441 } 450 }
442
443 .child:hover { 451 .child:hover {
444 color: $light-blue; 452 color: $light-blue;
445 transform: scale(1.1); 453 transform: scale(1.1);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 13:43:52 4 * @LastEditTime: 2023-10-10 14:34:11
5 --> 5 -->
6 <template> 6 <template>
7 <div class='dblistDialog'> 7 <div class='dblistDialog'>
8 <el-table 8 <el-table
9 v-if="formData.result" 9 v-if="formData.result"
10 :data="formData.result" 10 :data="formData.result"
11 height="200"> 11 height="180">
12 <el-table-column 12 <el-table-column
13 prop="ywh" 13 prop="ywh"
14 label="业务号"> 14 label="业务号">
...@@ -32,4 +32,7 @@ ...@@ -32,4 +32,7 @@
32 </script> 32 </script>
33 <style scoped lang='scss'> 33 <style scoped lang='scss'>
34 @import "~@/styles/public.scss"; 34 @import "~@/styles/public.scss";
35 .dblistDialog {
36 padding-bottom: 20px;
37 }
35 </style> 38 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-09-20 14:26:30 5 * @LastEditTime: 2023-10-10 14:24:08
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -80,12 +80,12 @@ ...@@ -80,12 +80,12 @@
80 <el-row :gutter="10"> 80 <el-row :gutter="10">
81 <el-col :span="8"> 81 <el-col :span="8">
82 <el-form-item label="宗地面积："> 82 <el-form-item label="宗地面积：">
83 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input> 83 <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
84 </el-form-item> 84 </el-form-item>
85 </el-col> 85 </el-col>
86 <el-col :span="8"> 86 <el-col :span="8">
87 <el-form-item label="土地用途："> 87 <el-form-item label="土地用途：">
88 <el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input> 88 <el-input :disabled="!viewEdit" v-model="ruleForm.qlxx.ytmc"></el-input>
89 </el-form-item> 89 </el-form-item>
90 </el-col> 90 </el-col>
91 <el-col :span="8"> 91 <el-col :span="8">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 v-model="ruleForm.jsydsyq.qdjg" 103 v-model="ruleForm.jsydsyq.qdjg"
104 style="width: 500%" 104 style="width: 500%"
105 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" 105 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
106 disabled></el-input> 106 :disabled="!viewEdit"></el-input>
107 <el-select v-model="ruleForm.jsydsyq.jedw" disabled> 107 <el-select v-model="ruleForm.jsydsyq.jedw" disabled>
108 <el-option 108 <el-option
109 v-for="item in dictData['A57']" 109 v-for="item in dictData['A57']"
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 118
119 <el-col :span="16"> 119 <el-col :span="16">
120 <el-form-item label="坐落："> 120 <el-form-item label="坐落：">
121 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 121 <el-input :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
122 </el-form-item> 122 </el-form-item>
123 </el-col> 123 </el-col>
124 </el-row> 124 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 10:52:39 4 * @LastEditTime: 2023-10-10 14:32:11
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 <el-row :gutter="10"> 77 <el-row :gutter="10">
78 <el-col :span="8"> 78 <el-col :span="8">
79 <el-form-item label="宗地面积："> 79 <el-form-item label="宗地面积：">
80 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input> 80 <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-25 14:49:14 4 * @LastEditTime: 2023-10-10 16:32:22
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" @size-change="handleSizeChange" @select="select" 65 :current-page.sync="pageData.currentPage" :total="zrztableData.total"
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>
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
90 </el-col> 90 </el-col>
91 <el-col :span="10" class="btnColRight"> 91 <el-col :span="10" class="btnColRight">
92 <el-form-item> 92 <el-form-item>
93 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
94 <el-button type="primary" @click="handleSearch">查询</el-button> 93 <el-button type="primary" @click="handleSearch">查询</el-button>
95 </el-form-item> 94 </el-form-item>
96 </el-col> 95 </el-col>
...@@ -100,7 +99,7 @@ ...@@ -100,7 +99,7 @@
100 </div> 99 </div>
101 <div class="from-clues-content loadingtext"> 100 <div class="from-clues-content loadingtext">
102 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="262" 101 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="262"
103 :current-page.sync="pageData.currentPage" :total="dztableData.total" @size-change="handleSizeChange" @select="select" 102 :current-page.sync="pageData.currentPage" :total="dztableData.total" @size-change="handleSizeChange"
104 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="dztableData.columns" 103 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="dztableData.columns"
105 :data="dztableData.data"> 104 :data="dztableData.data">
106 </lb-table> 105 </lb-table>
...@@ -132,6 +131,7 @@ ...@@ -132,6 +131,7 @@
132 return { 131 return {
133 loading: false, 132 loading: false,
134 activeName: 'zrz', 133 activeName: 'zrz',
134 radioVal: '',
135 queryzrzForm: { 135 queryzrzForm: {
136 qllx: '', 136 qllx: '',
137 bdcdyh: '', 137 bdcdyh: '',
...@@ -159,6 +159,28 @@ ...@@ -159,6 +159,28 @@
159 }, 159 },
160 mounted () { 160 mounted () {
161 sendThis(this) 161 sendThis(this)
162 if (this.sqywInfo.djywbm == 'B37100') {
163 this.zrztableData.columns =
164 [{
165 type: 'selection',
166 label: '全选',
167 width: '50'
168 }].concat(datas.zrzcolumns())
169 } else {
170 this.zrztableData.columns = [{
171 label: '选择',
172 width: '50px',
173 render: (h, scope) => {
174 return (
175 <div class="orgColumn">
176 <el-radio onChange={() => { this.handleZrzChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
177 &ensp;
178 </el-radio>
179 </div>
180 )
181 }
182 }].concat(datas.zrzcolumns())
183 }
162 }, 184 },
163 methods: { 185 methods: {
164 /** 186 /**
...@@ -287,15 +309,7 @@ ...@@ -287,15 +309,7 @@
287 * @author: renchao 309 * @author: renchao
288 */ 310 */
289 handleSelectionChange (val) { 311 handleSelectionChange (val) {
290 if (this.sqywInfo.sqywdylx == "1") { 312 this.bdcdysz = val;
291 if (val.length > 1) {
292 this.bdcdysz = [...val[val.length - 1]];
293 } else {
294 this.bdcdysz = val;
295 }
296 } else {
297 this.bdcdysz = val;
298 }
299 }, 313 },
300 /** 314 /**
301 * @description: handleLpbClick 315 * @description: handleLpbClick
...@@ -310,21 +324,10 @@ ...@@ -310,21 +324,10 @@
310 scyclx: 1 324 scyclx: 1
311 }, '85%', true, false) 325 }, '85%', true, false)
312 }, 326 },
313 /** 327 // 自然幢单选
314 * @description: select 328 handleZrzChange () {
315 * @param {*} selection 329 let arr = this.zrztableData.data.filter(item => item.bdcdyid == this.radioVal)
316 * @param {*} row 330 this.bdcdysz = arr
317 * @author: renchao
318 */
319 select (selection, row) {
320 if (this.sqywInfo.sqywdylx == "1") {
321 // 清除 所有勾选项
322 this.$refs.table.clearSelection()
323 // 当表格数据都没有被勾选的时候 就返回
324 // 主要用于将当前勾选的表格状态清除
325 if (selection.length == 0) return
326 this.$refs.table.toggleRowSelection(row, true);
327 }
328 }, 331 },
329 /** 332 /**
330 * @description: handleRowClick 333 * @description: handleRowClick
...@@ -332,23 +335,27 @@ ...@@ -332,23 +335,27 @@
332 * @author: renchao 335 * @author: renchao
333 */ 336 */
334 handleRowClick (row) { 337 handleRowClick (row) {
335 // 自然幢多选，多幢单选 338 // 自然幢单选，多幢多选
339 let that = this
336 let refs = 'table1'; 340 let refs = 'table1';
337 if (this.activeName == 'dz') { 341 if (this.activeName == 'dz') {
338 refs = 'table'; 342 refs = 'table';
339 } else { 343 } else {
340 this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection() 344 if (this.sqywInfo.djywbm !== 'B37100') {
345 that.bdcdysz = [row]
346 that.radioVal = row.bdcdyid
347 }
341 } 348 }
342 const bdcdysz = this.bdcdysz 349 const bdcdysz = that.bdcdysz
343 if (bdcdysz.length > 0) { 350 if (bdcdysz.length > 0) {
344 bdcdysz.forEach(item => { 351 bdcdysz.forEach(item => {
345 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 352 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
346 if (item == row) { 353 if (item == row) {
347 this.$nextTick(() => { this.$refs[refs].toggleRowSelection(row, false); }) 354 that.$nextTick(() => { that.$refs[refs].toggleRowSelection(row, false); })
348 } 355 }
349 // 不然就让当前的一行勾选 356 // 不然就让当前的一行勾选
350 else { 357 else {
351 this.$refs[refs].toggleRowSelection(row, true); 358 that.$refs[refs].toggleRowSelection(row, true);
352 } 359 }
353 }) 360 })
354 } 361 }
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-29 13:05:13 4 * @LastEditTime: 2023-10-10 16:32:09
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -16,12 +16,6 @@ class data extends filter { ...@@ -16,12 +16,6 @@ class data extends filter {
16 zrzcolumns () { 16 zrzcolumns () {
17 return [ 17 return [
18 { 18 {
19 type: 'selection',
20 label: '全选',
21 width: '50',
22 selectable: this.selected
23 },
24 {
25 label: '序号', 19 label: '序号',
26 type: 'index', 20 type: 'index',
27 width: '50', 21 width: '50',
...@@ -152,8 +146,7 @@ class data extends filter { ...@@ -152,8 +146,7 @@ class data extends filter {
152 { 146 {
153 type: 'selection', 147 type: 'selection',
154 label: '全选', 148 label: '全选',
155 width: '50', 149 width: '50'
156 selectable: this.selected
157 }, 150 },
158 { 151 {
159 label: '序号', 152 label: '序号',
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-29 13:09:15 4 * @LastEditTime: 2023-10-10 14:20:14
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -96,9 +96,15 @@ class data extends filter { ...@@ -96,9 +96,15 @@ class data extends filter {
96 label: "取得价格", 96 label: "取得价格",
97 }, 97 },
98 { 98 {
99 prop: "zl",
100 label: "坐落", 99 label: "坐落",
101 minWidth: '150' 100 minWidth: '150',
101 render: (h, scope) => {
102 return (
103 <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
104 <span class="ellipsis-table"> {scope.row.zl}</span>
105 </el-tooltip>
106 )
107 }
102 }, 108 },
103 { 109 {
104 label: '操作', 110 label: '操作',
......