44c80e10 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents a32cc5e0 205828b4
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 13:13:16
* @LastEditTime: 2023-10-10 14:40:07
-->
<template>
<div class="clxx">
......@@ -33,7 +33,7 @@
:class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
@click="treeClick(item, index)">
<span v-if="item.isrequired == 1" class="required">必选</span>
{{ item.sjmc }}
<span class="item_name">{{ item.sjmc }}</span>
<span class="cl_number" :key="key">({{ item.ys ? item.ys : 0 }})</span>
</div>
</div>
......@@ -322,7 +322,7 @@
ableOperation: this.$parent.ableOperation,
bsmRepair: this.$parent.bsmRepair
},
"60%",
"50%",
true
);
},
......@@ -350,7 +350,7 @@
}
.cl_number {
float: right;
width: 30px;
}
.clxx {
......@@ -409,7 +409,7 @@
width: 20%;
min-width: 160px;
height: 100%;
margin-right: 10px;
font-size: 14px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
......@@ -438,8 +438,16 @@
line-height: 20px;
transition: all 0.3s;
padding: 8px 0;
overflow: hidden;
display: flex;
justify-content: space-between;
}
.item_name {
flex: 1;
font-size: 14px;
display: flex;
justify-content: center;
}
.child:hover {
color: $light-blue;
transform: scale(1.1);
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-21 13:43:52
* @LastEditTime: 2023-10-10 14:34:11
-->
<template>
<div class='dblistDialog'>
<el-table
v-if="formData.result"
:data="formData.result"
height="200">
height="180">
<el-table-column
prop="ywh"
label="业务号">
......@@ -32,4 +32,7 @@
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
.dblistDialog {
padding-bottom: 20px;
}
</style>
\ No newline at end of file
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-20 14:26:30
* @LastEditTime: 2023-10-10 14:24:08
-->
<template>
<!-- 受理信息 -->
......@@ -80,12 +80,12 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积:">
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途:">
<el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.qlxx.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -103,7 +103,7 @@
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
disabled></el-input>
:disabled="!viewEdit"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
<el-option
v-for="item in dictData['A57']"
......@@ -118,7 +118,7 @@
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-20 10:52:39
* @LastEditTime: 2023-10-10 14:32:11
-->
<template>
<!-- 受理信息 -->
......@@ -77,7 +77,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积:">
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-25 14:49:14
* @LastEditTime: 2023-10-10 16:32:22
-->
<template>
<div class="from-clues">
......@@ -62,7 +62,7 @@
</div>
<div class="from-clues-content loadingtext">
<lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select"
:current-page.sync="pageData.currentPage" :total="zrztableData.total"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
:data="zrztableData.data">
</lb-table>
......@@ -90,7 +90,6 @@
</el-col>
<el-col :span="10" class="btnColRight">
<el-form-item>
<!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
......@@ -100,7 +99,7 @@
</div>
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="262"
:current-page.sync="pageData.currentPage" :total="dztableData.total" @size-change="handleSizeChange" @select="select"
:current-page.sync="pageData.currentPage" :total="dztableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="dztableData.columns"
:data="dztableData.data">
</lb-table>
......@@ -132,6 +131,7 @@
return {
loading: false,
activeName: 'zrz',
radioVal: '',
queryzrzForm: {
qllx: '',
bdcdyh: '',
......@@ -159,6 +159,28 @@
},
mounted () {
sendThis(this)
if (this.sqywInfo.djywbm == 'B37100') {
this.zrztableData.columns =
[{
type: 'selection',
label: '全选',
width: '50'
}].concat(datas.zrzcolumns())
} else {
this.zrztableData.columns = [{
label: '选择',
width: '50px',
render: (h, scope) => {
return (
<div class="orgColumn">
<el-radio onChange={() => { this.handleZrzChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
&ensp;
</el-radio>
</div>
)
}
}].concat(datas.zrzcolumns())
}
},
methods: {
/**
......@@ -287,15 +309,7 @@
* @author: renchao
*/
handleSelectionChange (val) {
if (this.sqywInfo.sqywdylx == "1") {
if (val.length > 1) {
this.bdcdysz = [...val[val.length - 1]];
} else {
this.bdcdysz = val;
}
} else {
this.bdcdysz = val;
}
this.bdcdysz = val;
},
/**
* @description: handleLpbClick
......@@ -310,21 +324,10 @@
scyclx: 1
}, '85%', true, false)
},
/**
* @description: select
* @param {*} selection
* @param {*} row
* @author: renchao
*/
select (selection, row) {
if (this.sqywInfo.sqywdylx == "1") {
// 清除 所有勾选项
this.$refs.table.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length == 0) return
this.$refs.table.toggleRowSelection(row, true);
}
// 自然幢单选
handleZrzChange () {
let arr = this.zrztableData.data.filter(item => item.bdcdyid == this.radioVal)
this.bdcdysz = arr
},
/**
* @description: handleRowClick
......@@ -332,23 +335,27 @@
* @author: renchao
*/
handleRowClick (row) {
// 自然幢多选,多幢单选
// 自然幢单选,多幢多选
let that = this
let refs = 'table1';
if (this.activeName == 'dz') {
refs = 'table';
} else {
this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection()
if (this.sqywInfo.djywbm !== 'B37100') {
that.bdcdysz = [row]
that.radioVal = row.bdcdyid
}
}
const bdcdysz = this.bdcdysz
const bdcdysz = that.bdcdysz
if (bdcdysz.length > 0) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$nextTick(() => { this.$refs[refs].toggleRowSelection(row, false); })
that.$nextTick(() => { that.$refs[refs].toggleRowSelection(row, false); })
}
// 不然就让当前的一行勾选
else {
this.$refs[refs].toggleRowSelection(row, true);
that.$refs[refs].toggleRowSelection(row, true);
}
})
}
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 13:05:13
* @LastEditTime: 2023-10-10 16:32:09
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -16,12 +16,6 @@ class data extends filter {
zrzcolumns () {
return [
{
type: 'selection',
label: '全选',
width: '50',
selectable: this.selected
},
{
label: '序号',
type: 'index',
width: '50',
......@@ -152,8 +146,7 @@ class data extends filter {
{
type: 'selection',
label: '全选',
width: '50',
selectable: this.selected
width: '50'
},
{
label: '序号',
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 13:09:15
* @LastEditTime: 2023-10-10 14:20:14
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -96,9 +96,15 @@ class data extends filter {
label: "取得价格",
},
{
prop: "zl",
label: "坐落",
minWidth: '150'
minWidth: '150',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.zl}</span>
</el-tooltip>
)
}
},
{
label: '操作',
......