95688102 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 91ef8e93 64c69303
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-23 14:10:30
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
/**
* @description: 初始化
* @param {*} data
* @author: renchao
*/
export function Init (data) {
let apiUrl = "";
switch (data.get("djlx")) {
case "100":
apiUrl = "/system/tdcbjyq/fristInit";
break;
case "200":
apiUrl = "/system/tdcbjyq/transferInit";
break;
case "300":
apiUrl = "/system/tdcbjyq/changeInit";
break;
case "400":
apiUrl = "/system/tdcbjyq/logoutInit";
break;
case "500":
apiUrl = "/system/tdcbjyq/riviseInit";
break;
case "901":
apiUrl = "/system/tdcbjyq/renewalInit";
break;
case "902":
apiUrl = "/system/tdcbjyq/replaceInit";
break;
}
return request({
url: SERVER.SERVERAPI + apiUrl,
method: 'post',
data
})
}
/**
* @description: 受理信息保存
* @param {*} data
* @author: renchao
*/
export function saveData (data) {
return request({
url: SERVER.SERVERAPI + '/system/tdcbjyq/saveData',
method: 'post',
data
})
}
/*
* @Description: 业务申请
* @Autor: renchao
* @LastEditTime: 2023-11-14 09:30:08
* @LastEditTime: 2024-01-23 13:17:00
*/
import request from '@/utils/request'
......@@ -84,6 +84,19 @@ export function selectNydsyqQlxx (data) {
})
}
/**
* @description: 业务办理-查询土地承包经营权-根据条件进行列表查询
* @param {*} data
* @author: renchao
*/
export function selectTdcbjyq (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectTdcbjyq',
method: 'post',
data
})
}
/**
* @description: 业务办理-选择单元-查询宗地基本信息
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-22 14:56:43
* @LastEditTime: 2024-01-23 14:07:58
*/
/**
* @description: 流程环节操作按钮
......@@ -21,6 +21,10 @@ export function getForm (tabName) {
case "jsydsyqslxx300":
form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
break;
//土地承包经营权
case "tdcbjyqslxx100":
form = require("@/views/ywbl/slsqxx/tdcbjyq/slxx.vue");
break;
//国有建设用地使用权/房屋所有权
case "fwsyqdzslxx":
form = require("@/views/ywbl/slsqxx/fdcq1/slxx.vue");
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-24 17:35:49
* @LastEditTime: 2024-01-23 15:14:11
-->
<template>
<!-- 受理信息 -->
......@@ -215,7 +215,7 @@
:key="key"
:gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
<div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0 && ruleForm.qlxx.djlx==200">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 16:48:47
* @LastEditTime: 2024-01-23 15:15:58
-->
<template>
<div class="from-clues">
......@@ -33,7 +33,7 @@
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
......@@ -62,6 +62,7 @@
},
data () {
return {
radioVal: '',
loading: false,
queryForm: defaultParameters.defaultParameters(),
qllxs: [],
......@@ -75,6 +76,28 @@
},
mounted () {
sendThis(this);
if (this.sqywInfo.sqywdylx == "1") {
this.tableData.columns = [{
label: '选择',
width: '50px',
render: (h, scope) => {
return (
<div class="orgColumn">
<el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
&ensp;
</el-radio>
</div>
)
}
}].concat(datas.columns())
} else {
this.tableData.columns =
[{
type: 'selection',
label: '全选',
width: '50'
}].concat(datas.columns())
}
},
methods: {
/**
......@@ -158,21 +181,10 @@
formData: param
})
},
/**
* @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);
}
handleChange () {
let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
arr[0].bsm = arr[0].zdbsm
this.bdcdysz = arr
},
/**
* @description: handleRowClick
......@@ -181,28 +193,15 @@
*/
handleRowClick (row) {
// 如果状态是1,那就是单选
let refs = 'table';
if (this.sqywInfo.sqywdylx == "1") {
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if (bdcdysz.length == 1) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
row.bsm = row.zdbsm
this.bdcdysz = [row]
this.radioVal = row.bdcdyid
} else {
this.$refs.table.toggleRowSelection(row);
this.$refs[refs].toggleRowSelection(row)
}
},
}
}
}
</script>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 14:18:01
* @LastEditTime: 2024-01-23 13:47:01
-->
<template>
<div class="from-clues">
......@@ -53,7 +53,7 @@
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
......@@ -82,6 +82,7 @@
},
data () {
return {
radioVal: '',
loading: false,
queryForm: defaultParameters.defaultParameters(),
tableData: {
......@@ -94,6 +95,28 @@
},
mounted () {
sendThis(this);
if (this.sqywInfo.sqywdylx == "1") {
this.tableData.columns = [{
label: '选择',
width: '50px',
render: (h, scope) => {
return (
<div class="orgColumn">
<el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
&ensp;
</el-radio>
</div>
)
}
}].concat(datas.columns())
} else {
this.tableData.columns =
[{
type: 'selection',
label: '全选',
width: '50'
}].concat(datas.columns())
}
},
methods: {
/**
......@@ -182,21 +205,10 @@
formData: param
})
},
/**
* @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);
}
handleChange () {
let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
arr[0].bsm = arr[0].zdbsm
this.bdcdysz = arr
},
/**
* @description: handleRowClick
......@@ -205,26 +217,13 @@
*/
handleRowClick (row) {
// 如果状态是1,那就是单选
let refs = 'table';
if (this.sqywInfo.sqywdylx == "1") {
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if (bdcdysz.length == 1) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
row.bsm = row.zdbsm
this.bdcdysz = [row]
this.radioVal = row.bdcdyid
} else {
this.$refs.table.toggleRowSelection(row);
this.$refs[refs].toggleRowSelection(row)
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-22 16:24:56
* @LastEditTime: 2024-01-23 13:40:23
-->
<template>
<div class="from-clues">
......@@ -198,6 +198,7 @@
// 如果状态是1,那就是单选
let refs = 'table';
if (this.sqywInfo.sqywdylx == "1") {
row.bsm = row.zdbsm
this.bdcdysz = [row]
this.radioVal = row.bdcdyid
} else {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-23 13:44:44
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" 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>
</el-row>
</el-form>
</div>
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
</div>
<div class="submit_button">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
</template>
<script>
//首次登记
import store from '@/store/index.js'
import ywsqTable from "@/utils/mixin/ywsqTable";
import jump from "../components/mixin/jump";
import { ywPopupDialog } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectJsydsyq.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import { selectTdcbjyq } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
export default {
mixins: [ywsqTable, jump],
props: {
isJump: { type: Boolean, default: false },
sqywInfo: { type: Object, default: () => { } },
},
data () {
return {
radioVal: '',
loading: false,
queryForm: defaultParameters.defaultParameters(),
qllxs: [],
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
bdcdysz: []
};
},
mounted () {
sendThis(this);
if (this.sqywInfo.sqywdylx == "1") {
this.tableData.columns = [{
label: '选择',
width: '50px',
render: (h, scope) => {
return (
<div class="orgColumn">
<el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
&ensp;
</el-radio>
</div>
)
}
}].concat(datas.columns())
} else {
this.tableData.columns =
[{
type: 'selection',
label: '全选',
width: '50'
}].concat(datas.columns())
}
},
methods: {
/**
* @description: queryClick
* @author: renchao
*/
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectTdcbjyq({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
this.tableData.total = total;
this.tableData.data = records;
}
})
},
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
if (this.bdcdysz.length == 0) {
this.$message.error("请至少选择一条数据");
return;
}
this.loading = true
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bdcdysz,
}).then((res) => {
this.loading = false
if (res.code == 200) {
this.$message({
showClose: true,
message: '发起申请成功',
type: 'success'
})
if (!this.isJump) {
this.jump(res.result)
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
} else {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
}
}
}).catch(() => {
this.loading = false
})
},
/**
* @description: handleSelectionChange
* @param {*} val
* @author: renchao
*/
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsm = item.zdbsm;
});
if (this.sqywInfo.sqywdylx == "1") {
if (val.length > 1) {
this.bdcdysz = [...val[val.length - 1]];
} else {
this.bdcdysz = val;
}
} else {
this.bdcdysz = val;
}
},
/**
* @description: openBook
* @param {*} row
* @author: renchao
*/
openBook (row) {
var param = { bdcdyid: row.bdcdyid, qllx: row.qllx, bdcdyh: row.bdcdyh, bsmQlxx: row.bsmQlxx };
this.$popup('登记簿详情', 'registerBook/djbFrame', {
formData: param
})
},
handleChange () {
let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
arr[0].bsm = arr[0].zdbsm
this.bdcdysz = arr
},
/**
* @description: handleRowClick
* @param {*} row
* @author: renchao
*/
handleRowClick (row) {
// 如果状态是1,那就是单选
let refs = 'table';
if (this.sqywInfo.sqywdylx == "1") {
row.bsm = row.zdbsm
this.bdcdysz = [row]
this.radioVal = row.bdcdyid
} else {
this.$refs[refs].toggleRowSelection(row)
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
</style>
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 09:44:35
* @LastEditTime: 2024-01-23 13:43:12
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -15,11 +15,11 @@ class data extends filter {
}
columns () {
return [
{
type: 'selection',
label: '全选',
selectable: this.selected
},
// {
// type: 'selection',
// label: '全选',
// selectable: this.selected
// },
{
label: '序号',
type: 'index',
......
......@@ -73,7 +73,9 @@ export function queueDjywmc (djywbm, djqxbm) {
case "A23200":
case "A23300":
case "A23400":
case "A09200":
case "A09200": // 土地承包经营权(转移登记)
vm = "tdjyq200";
break;
case "A09300":
case "A09400":
vm = "nydsyq200";
......