d1019468 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 65191eef 9da623a6
/*
* @Description: 企业银行接口
* @Autor: renchao
* @LastEditTime: 2023-11-01 08:41:46
* @LastEditTime: 2024-03-29 14:11:30
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -129,14 +129,15 @@ export function editCompanyMaterialList (data, bsmCompany) {
* @description: 是否覆盖才材料信息
* @author: renchao
*/
export function replace (bsmCompany, bsmSlsq, bsmSldy) {
export function replace (bsmCompany, bsmSlsq, bsmSldy, qlrlx) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/company/replace',
method: 'get',
params: {
bsmCompany: bsmCompany,
bsmSlsq: bsmSlsq,
bsmSldy: bsmSldy,
bsmSlsq: bsmSlsq
qlrlx: qlrlx
}
})
}
\ No newline at end of file
......
......@@ -78,6 +78,27 @@ export function getNewDate(type = 1) {
}
}
// 获取当前时间
/**
* @description: 获取当前时间
* @param {*} type
* @author: renchao
*/
export function getDateToString(date,type) {
const now = new Date(date);
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0');
const hours = String(now.getHours()).padStart(2, '0');
const minutes = String(now.getMinutes()).padStart(2, '0');
const seconds = String(now.getSeconds()).padStart(2, '0');
if (type == 1) {
return `${year}${month}${day}日`
} else {
return `${year}${month}${day}${hours}${minutes}${seconds}秒`
}
}
export function getNewDatesh() {
const now = new Date();
const year = now.getFullYear();
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-03-29 13:26:04
-->
<template>
<div class="jtfccx-edit-con">
<b class="title"></b>
......@@ -41,20 +46,15 @@
<script>
import { datas, sendThis } from "./infodata";
import { getFwmxInfo } from "@/api/jtfc.js";
export default {
props: {
formData: {
resultData: {
type: Object,
default: () => { },
},
},
data () {
return {
ruleForm: {
cxsj: "",
bdcdyh: "",
},
//房屋列表字段
fwColumns: datas.fwCol(),
//土地列表字段
......@@ -69,37 +69,9 @@
cfdjColumns: datas.cfdjCol(),
//异议登记列表字段
yydjColumns: datas.yydjCol(),
form: {},
resultData: {},
};
},
mounted () {
if (this.formData) {
this.getDetailInfo()
}
},
methods: {
/**
* @description: setResult
* @param {*} data
* @author: renchao
*/
setResult (data) {
this.resultData = data
},
/**
* @description: getDetailInfo
* @author: renchao
*/
getDetailInfo () {
this.$startLoading();
getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
this.$endLoading();
if (res.code == 200) {
this.resultData = res.result
}
})
}
}
};
</script>
......
import filter from '@/utils/filter.js'
let vm = null
import store from '@/store/index.js'
const sendThis = (_this) => {
vm = _this
......@@ -64,294 +65,19 @@ class data extends filter {
align: 'center',
fixed: 'right',
render: (h, scope) => {
if(scope.row.dyzt != '0' && scope.row.cfzt != '0'){
if (scope.row.dyzt != '0' && scope.row.cfzt != '0') {
return <div>抵押、查封</div>
}
if(scope.row.dyzt != '0'){
if (scope.row.dyzt != '0') {
return <div>抵押</div>
}
if(scope.row.cfzt != '0'){
if (scope.row.cfzt != '0') {
return <div>查封</div>
}
}
}
]
}
sqrCol () {
return [
{
width: "60",
renderHeader: (h, scope) => {
return (
<i
class="el-icon-plus pointer"
onClick={() => {
vm.add("sqr");
}}
style="color:#409EFF"
></i>
);
},
render: (h, scope) => {
return (
<i
class="el-icon-minus pointer"
onClick={() => {
vm.remove(scope.$index, scope.row, "sqr");
}}
></i>
);
},
},
{
width: "150",
label: "身份证读卡器",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
icon="el-icon-edit-outline"
onClick={() => {
vm.handleRead(scope);
}}
>
读取
</el-button>
</div>
);
},
},
{
width: "150",
prop: "sqrxm",
label: "姓名/名称",
render: (h, scope) => {
return (
<el-input
placeholder="姓名/名称"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
></el-input>
);
},
},
{
prop: "sqrzjlxbm",
label: "证件种类",
render: (h, scope) => {
return (
<el-select
class="width100"
clearable
value={scope.row[scope.column.property]}
onChange={(val) => {
scope.row[scope.column.property] = val;
}}
>
{vm.dictData["A30"].map((option) => {
return (
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
);
},
},
{
prop: "sqrzjhm",
label: "证件号",
render: (h, scope) => {
return (
<el-input
placeholder="证件号"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
maxlength="21"
></el-input>
);
},
},
{
prop: "lxdh",
label: "联系电话",
render: (h, scope) => {
return (
<div class="typePhone">
<el-input
placeholder="联系电话"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
onBlur={(val) => {
vm.teltest(scope.row);
}}
type="tel"
maxlength="11"
></el-input>
<span
v-show={scope.row.inputErr}
style={{
fontSize: "12px",
color: "red",
position: "absolute",
bottom: "-2px",
left: "0",
}}
>
请输入正确手机号
</span>
</div>
);
},
},
]
}
qlrCol () {
return [
{
width: "60",
renderHeader: (h, scope) => {
return (
<i
class="el-icon-plus pointer"
onClick={() => {
vm.add("qlr");
}}
style="color:#409EFF"
></i>
);
},
render: (h, scope) => {
return (
<i
class="el-icon-minus pointer"
onClick={() => {
vm.remove(scope.$index, scope.row, "qlr");
}}
></i>
);
},
},
{
width: "150",
label: "身份证读卡器",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
icon="el-icon-edit-outline"
onClick={() => {
vm.handleRead(scope);
}}
>
读取
</el-button>
</div>
);
},
},
{
width: "150",
prop: "sqrxm",
label: "姓名/名称",
render: (h, scope) => {
return (
<el-input
placeholder="姓名/名称"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
></el-input>
);
},
},
{
prop: "sqrzjlxbm",
label: "证件种类",
render: (h, scope) => {
return (
<el-select
class="width100"
value={scope.row[scope.column.property]}
onChange={(val) => {
scope.row[scope.column.property] = val;
}}
>
{vm.dictData["A30"].map((option) => {
return (
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
);
},
},
{
prop: "sqrzjhm",
label: "证件号",
render: (h, scope) => {
return (
<el-input
placeholder="证件号"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
maxlength="21"
></el-input>
);
},
},
{
prop: "lxdh",
label: "联系电话",
render: (h, scope) => {
return (
<div class="typePhone">
<el-input
placeholder="联系电话"
value={scope.row[scope.column.property]}
onInput={(val) => {
scope.row[scope.column.property] = val;
}}
onBlur={(val) => {
vm.teltest(scope.row);
}}
type="tel"
maxlength="11"
></el-input>
<span
v-show={scope.row.inputErr}
style={{
fontSize: "12px",
color: "red",
position: "absolute",
bottom: "-2px",
left: "0",
}}
>
请输入正确手机号
</span>
</div>
);
},
},
]
}
}
let datas = new data()
export {
......
......@@ -22,17 +22,17 @@ class data extends filter {
)
}
},
{
label: "查询类型",
render: (h, scope) => {
switch (scope.row.cxlx) {
case '1':
return <div>家庭房产</div>
case '2':
return <div>房屋明细</div>
}
}
},
// {
// label: "查询类型",
// render: (h, scope) => {
// switch (scope.row.cxlx) {
// case '1':
// return <div>家庭房产</div>
// case '2':
// return <div>房屋明细</div>
// }
// }
// },
{
prop: "cxbh",
label: "查询编号",
......@@ -52,6 +52,17 @@ class data extends filter {
{
prop: "ycqrgxmc",
label: "与产权人的关系",
render: (h, scope) => {
switch (scope.row.ycqrgx) {
case '1':
return <div>房屋权利人</div>
case '2':
return <div>产权利害关系人</div>
case '3':
return <div>委托人</div>
}
}
},
{
prop: "qlrxm",
......
......@@ -37,9 +37,9 @@ class data extends filter {
render: (h, scope) => {
switch (scope.row.cxlx) {
case '1':
return <div>家庭房产</div>
return <div>家庭房产查询</div>
case '2':
return <div>房屋明细</div>
return <div>不动产明细查询</div>
}
}
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-03-19 13:17:22
* @LastEditTime: 2024-03-29 14:12:16
-->
<template>
<dialogBox
......@@ -571,7 +571,7 @@
cancelButtonText: '取消',
distinguishCancelAndClose: true,//区分取消与关闭
}).then(() => {
replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy, this.details.qlrlx).then(res => {
that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2', id: getUuid(16) }));
that.$emit("input", false);
if (res.code == 200) {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-18 14:55:20
* @LastEditTime: 2024-03-29 14:03:52
-->
<template>
<div>
<lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0" :rowStyleHeight='25'
:data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" :showButton="disabled" @updateDetail="handleupdateDetail" />
<addQlr v-model="dialog" :details="{qlrlx: 1,...details}" :showButton="disabled" @updateDetail="handleupdateDetail" />
</div>
</template>
<script>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-18 15:03:10
* @LastEditTime: 2024-03-29 14:04:33
-->
<template>
<div>
<lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0" :rowStyleHeight='25'
:data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" :showButton="disabled" @updateDetail="handleupdateDetail" />
<addQlr v-model="dialog" :details="{qlrlx: 2,...details}" :showButton="disabled" @updateDetail="handleupdateDetail" />
</div>
</template>
<script>
......
<!--
* @Description: 交易合同
* @Autor: renchao
* @LastEditTime: 2024-03-21 16:58:45
-->
<template>
<div class='jyht'>
<el-form :model="queryForm">
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="合同号">
<el-input v-model="queryForm.htbh"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="证件号码">
<el-col :span="8">
<el-form-item label="行政区">
<el-input v-model="queryForm.sfzjhm"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="业务号">
<el-input v-model="queryForm.ywh"></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6" class="btnColRight">
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-col> -->
</el-col>
<el-col :span="8">
<el-form-item label="用户编号">
<el-input v-model="queryForm.ywh"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="房产证编号">
<el-input v-model="queryForm.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="房屋坐落(地址)">
<el-input v-model="queryForm.sfzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key"
:column="tableData.columns"
:data="tableData.data">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
<!-- <el-button type="primary" @click="handleSubmit" plain>保存</el-button> -->
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleSearch">保存</el-button>
</div>
</div>
</template>
......
......@@ -71,8 +71,7 @@
</el-row>
<div class="slxx_title title-block">
电力过户信息
<el-button @click="showDialogDlxx">电力过户信息修改</el-button>
<el-button type="primary" @click="handleDlxx">电力过户信息修改</el-button>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -172,12 +171,6 @@
</div>
</div>
</el-form>
<el-dialog :visible.sync="dialogDlxx" title="电力过户信息修改">
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" @click="onSubmit" plain>保存</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -195,7 +188,6 @@ export default {
},
data() {
return {
dialogDlxx: false,
loading: false,
//表单是否可操作
viewEdit: false,
......@@ -220,8 +212,18 @@ export default {
});
},
onSubmit() {},
showDialogDlxx() {
this.dialogDlxx = true;
handleDlxx() {
let formData = {
bsmSldy: this.propsParam.bsmSldy,
qxdm: this.ruleForm.qlxx.qxdm,
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
};
if(this.ruleForm.wqht==null){
formData.htbh='';
}else{
formData.htbh=this.ruleForm.wqht.wqhth;
}
this.$popupDialog('房产电力过户详情', 'workflow/main/sdqxx/dlxx', formData, '60%', true)
},
},
};
......
......@@ -90,9 +90,9 @@
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq2">
<el-col :span="8">
<el-form-item label="宗地面积:" prop="zdjbxx.zdmj">
<el-form-item label="宗地面积:">
<div class="flex">
<el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-select
disabled
v-model="ruleForm.zdjbxx.mjdw"
......@@ -235,7 +235,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房产交易价格:" prop="fdcq2.fdcjyjg">
<el-form-item label="房产交易价格:" prop="fdcq2.fdcjyjg">
<div class="flex">
<el-input
maxlength="11"
......
......@@ -66,7 +66,7 @@
<div class="slxx_title title-block">
<el-row>
<el-col :span="24"> 房屋合同信息
&nbsp;&nbsp;<el-button type="primary" @click="handleContract">查询房屋交易合同</el-button> </el-col>
&nbsp;&nbsp;<el-button type="primary" v-show="viewEdit" @click="handleContract">查询房屋交易合同</el-button> </el-col>
<!-- <el-col :span="4" class="btnColRight">
</el-col> -->
......@@ -183,7 +183,7 @@
<div class="slxx_title title-block">
<el-row>
<el-col :span="24"> 缴税信息 <el-button type="primary" @click="handleSwwsxx">查询契税完税信息</el-button></el-col>
<el-col :span="24"> 缴税信息 <el-button type="primary" v-show="viewEdit" @click="handleSwwsxx">查询契税完税信息</el-button></el-col>
</el-row>
<div class="triangle"></div>
</div>
......