35ac0856 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 83105fa5 a31b350b
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-28 09:34:54
-->
<template>
<div class="clmlmx-box">
<div class="title">申请材料目录</div>
<lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
props: {
formData: {
type: Object,
default: () => {
return {}
}
}
},
data () {
return {
column: [
{
width: "50",
label: '序号',
type: 'index'
},
{
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.sfxjcl === "1") {
return (
<div>
<span>可选</span>
</div>
);
}
else {
return (
<div>
<span>必选</span>
</div>
);
}
},
},
{
prop: "sjmc",
label: "材料名称",
},
{
prop: "sjlx",
label: "材料类型",
width: "80",
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
</div>
);
},
},
{
prop: "sjsl",
label: "份数",
width: "50"
},
{
prop: "smzt",
label: "扫描状态",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
return (
<div>
<span>已扫描</span>
</div>
);
} else {
return (
<div>
<span>未扫描</span>
</div>
);
}
},
},
{
label: "扫描页数",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
return (
<div>
<span>{scope.row.children.length}</span>
</div>
);
} else {
return (
<div>
<span>0</span>
</div>
);
}
},
},
{
label: "操作",
width: "80",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
disabled={scope.$index == 0}
onClick={() => {
this.moveUpward(scope.$index, scope.row);
}}
>
上移
</el-button>
<el-button
type="text"
disabled={scope.$index + 1 == this.tableData.length}
onClick={() => {
this.moveDown(scope.$index, scope.row);
}}
>
下移
</el-button>
</div>
);
},
},
],
key: 0,
tableData: []
}
},
created () {
console.log(this.formData.data, 'formData');
},
methods: {
// 材料目录明细初始化
/**
* @description: 材料目录明细初始化
* @author: renchao
*/
clmlInitList () {
return new Promise(resolve => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
if (res.result && res.result.length > 0) {
this.data = res.result;
} else {
this.data = []
}
} else {
this.$message.error(res.message)
}
})
})
},
// 上移
/**
* @description: 上移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveUpward (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "UP",
};
// 接口待调
/**
* @description: 接口待调
* @param {*} obj
* @author: renchao
*/
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '上移成功',
type: 'success'
})
this.$parent.setTableData(this.data)
}
} else {
this.$message.error(res.message);
}
})
},
// 下移
/**
* @description: 下移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveDown (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "DOWN",
}
// 接口待调
/**
* @description: 接口待调
* @param {*} obj
* @author: renchao
*/
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '下移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
// 材料目录删除
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
* @author: renchao
*/
handleDelete (index, row) {
let that = this
this.$confirm('此操作将永久删除该 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => {
if (res.code == 200) {
let res = await that.clmlInitList()
if (res == 200) {
that.$message({
message: "删除成功",
type: "success",
})
// this.$parent.setTableData(this.data)
}
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
// 字典
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus (val, code) {
let data = store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
});
return name;
}
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
.clmlmx-box {
margin: 0 auto;
.title {
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
</style>
export function deleteCollectBiz (bsmSqyw) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
method: 'post'
})
}
......@@ -220,14 +220,15 @@ class data extends filter {
label: "房地产交易价格(万元)",
},
{
prop: "zh",
label: "幢号",
},
{
prop: "xmmc",
label: "项目名称",
},
{
prop: "zh",
label: "幢号",
},
{
prop: "zcs",
label: "总层数",
},
......
......@@ -54,11 +54,10 @@ class data extends filter {
{
prop: "createtime",
label: "创建时间",
// width: '180',
},
{
label: '操作',
width: '130',
width: '100',
render: (h, scope) => {
return (
<div>
......
......@@ -62,66 +62,38 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq2">
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-form-item label="土地使用期限:">
<el-input disabled v-model="ruleForm.fdcq2.tdsyqx"></el-input>
<el-form-item label="独用土地面积:">
<el-input disabled v-model="ruleForm.fdcq1.dytdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途名称:">
<el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
<el-form-item label="分摊土地面积:">
<el-input disabled v-model="ruleForm.fdcq1.fttdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质:">
<el-input disabled v-model="ruleForm.fdcq2.fwxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="房屋结构:">
<el-input disabled v-model="ruleForm.fdcq2.fwjgmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在层:">
<el-input disabled v-model="ruleForm.fdcq2.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数:">
<el-input disabled v-model="ruleForm.fdcq2.zcs"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq2">
<el-col :span="8">
<el-form-item label="竣工时间:">
<el-input disabled v-model="ruleForm.fdcq2.jgsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积:">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<el-form-item label="房地产交易价格:">
<el-input disabled v-model="ruleForm.fdcq1.fdcjyjg"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="分摊建筑面积:">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<el-col :span="24">
<el-form-item label="附记:">
<el-input disabled v-model="ruleForm.fdcq1.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
房屋多幢明细
<div class="triangle"></div>
<fdcqxmTable
:ableOperation="ableOperation"
:tableData="ruleForm.fdcqxm"
@upDateTdytxxList="upDateTdytxxList" />
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
......@@ -175,7 +147,7 @@
<qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
:gyfs="ruleForm.slsq.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
......@@ -191,12 +163,13 @@
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="!ableOperation"
v-model="ruleForm.fdcq2.djyy">
v-model="ruleForm.fdcq1.djyy">
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
<el-row class="btn" v-if="ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
......@@ -208,6 +181,7 @@
<script>
import ywmix from "@/views/ywbl/mixin/index"
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
import { mapGetters } from "vuex";
......@@ -231,7 +205,7 @@
}
});
},
components: { qlrCommonTable, tdytTable },
components: { qlrCommonTable, tdytTable ,fdcqxmTable},
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -253,7 +227,7 @@
slsq: {
},
fdcq2: {
fdcq1: {
zyjzmj: '',
ftjzmj: ''
},
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-03 09:02:02
* @LastEditTime: 2023-08-03 14:37:14
-->
<template>
<div class="slxx">
......@@ -11,7 +11,7 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
label-width="140px"
>
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
......@@ -52,7 +52,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <div class="slxx_title title-block">
<div class="slxx_title title-block">
不动产单元情况
<div class="triangle"></div>
</div>
......@@ -68,64 +68,86 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq2">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="土地使用期限:">
<el-input disabled v-model="ruleForm.fdcq2.tdsyqx"></el-input>
<el-form-item label="发包方:">
<el-input v-model="ruleForm.lq.fbf"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途名称:">
<el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
<el-form-item label="发包方代码:">
<el-input v-model="ruleForm.lq.fbfdm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质:">
<el-input disabled v-model="ruleForm.fdcq2.fwxzmc"></el-input>
<el-form-item label="使用权(承包)面积:">
<el-input v-model="ruleForm.lq.syqmj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="林地所有权性质:">
<el-input v-model="ruleForm.lq.ldsyqxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="森林类别:">
<el-input v-model="ruleForm.lq.sllb"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主要树种:">
<el-input v-model="ruleForm.lq.zysz"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="房屋结构:">
<el-input disabled v-model="ruleForm.fdcq2.fwjgmc"></el-input>
<el-form-item label="株数:">
<el-input v-model="ruleForm.lq.zs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在层:">
<el-input disabled v-model="ruleForm.fdcq2.szc"></el-input>
<el-form-item label="林种:">
<el-input v-model="ruleForm.lq.lz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数:">
<el-input disabled v-model="ruleForm.fdcq2.zcs"></el-input>
<el-form-item label="起源:">
<el-input v-model="ruleForm.lq.qy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq2">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="竣工时间:">
<el-input disabled v-model="ruleForm.fdcq2.jgsj"></el-input>
<el-form-item label="造林年度:">
<el-input v-model="ruleForm.lq.zlnd"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
<el-form-item label="林班:">
<el-input v-model="ruleForm.lq.lb"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积:">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<el-form-item label="小班:">
<el-input v-model="ruleForm.lq.xb"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="分摊建筑面积:">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<el-form-item label="小地名:">
<el-input v-model="ruleForm.lq.xdm"></el-input>
</el-form-item>
</el-col>
</el-row> -->
<el-col :span="8">
<el-form-item label="附记:">
<el-input v-model="ruleForm.lq.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
......@@ -214,19 +236,19 @@
登记原因
<div class="triangle"></div>
</div>
<!-- <el-row :gutter="10">
<el-row :gutter="10">
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
<el-input
class="textArea"
type="textarea"
:disabled="!ableOperation"
v-model="ruleForm.fdcq2.djyy"
v-model="ruleForm.lq.djyy"
>
</el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
</div>
<el-row class="btn" v-if="ableOperation">
<el-form-item>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-14 16:59:31
* @LastEditTime: 2023-08-04 09:52:09
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -113,7 +113,7 @@ class data extends filter {
},
{
label: '操作',
width: '130',
width: '100',
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-14 16:59:35
* @LastEditTime: 2023-08-04 09:54:32
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -40,17 +40,6 @@ class data extends filter {
<div>
<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
<span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
{/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
<span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
<span v-show={scope.row.ycfzt == 1}>,已预查封</span>
<span v-show={scope.row.ycfzt == 1}>,已预查封</span>
<span v-show={scope.row.cfzt == 1}>,已查封</span>
<span v-show={scope.row.diyizt == 1}>,已地役</span>
<span v-show={scope.row.yyzt == 1}>,异议中</span>
<span v-show={scope.row.xzzt == 1}>,已限制</span>
<span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
<span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
<span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
</div>
)
}
......@@ -61,6 +50,8 @@ class data extends filter {
},
{
prop: "qllxmc",
width: '100',
showOverflowTooltip: true,
label: "权利类型",
},
{
......@@ -70,6 +61,8 @@ class data extends filter {
{
prop: "zrzh",
label: "自然幢号",
width: '90',
showOverflowTooltip: true,
},
{
prop: "jzwmc",
......@@ -98,6 +91,7 @@ class data extends filter {
},
{
label: "土地/房屋用途",
minWidth: '170',
render: (h, scope) => {
return (
<div>
......@@ -119,13 +113,13 @@ class data extends filter {
{
prop: "zl",
label: "自然幢坐落",
minWidth: '130'
minWidth: '120',
showOverflowTooltip: true
},
{
label: '操作',
width: '160',
width: '110',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
......
......@@ -112,7 +112,7 @@ class data extends filter {
},
{
label: '操作',
width: '130',
width: '100',
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-14 16:59:53
* @LastEditTime: 2023-08-04 09:47:56
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -104,9 +104,8 @@ class data extends filter {
},
{
label: '操作',
width: '160',
width: '110',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-14 17:00:21
* @LastEditTime: 2023-08-04 09:52:38
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -112,7 +112,7 @@ class data extends filter {
},
{
label: '操作',
width: '130',
width: '100',
render: (h, scope) => {
return (
<div>
......
......@@ -128,8 +128,7 @@ class data extends filter {
},
{
label: '操作',
width: '130',
fixed: "right",
width: '110',
render: (h, scope) => {
return (
<div>
......