a5e8465a by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 37bf885f 09f16926
Showing 35 changed files with 186 additions and 133 deletions
/*
* @Description: 用户首页
* @Autor: renchao
* @LastEditTime: 2023-05-16 16:06:51
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
/**
* @description: 获取首页通知公告列表
* @author: renchao
*/
export function getHomeNoticeList () {
return request({
url: SERVER.SERVERAPI + '/rest/home/getHomeNoticeList',
method: 'get'
})
}
/**
* @description:
* @author: renchao
*/
// 获取首页待办事项
export function getHomeTodoList () {
return request({
url: SERVER.SERVERAPI + '/rest/home/getHomeTodoList',
method: 'get'
})
}
/**
* @description: 获取首页已办事项
* @author: renchao
*/
export function getHomeDoneList () {
return request({
url: SERVER.SERVERAPI + '/rest/home/getHomeDoneList',
method: 'get'
})
}
/**
* @description: 获取首页常办项目
* @author: renchao
*/
export function getHomeFrequentProjects () {
return request({
url: SERVER.SERVERAPI + '/rest/home/getHomeFrequentProjects',
method: 'get'
})
}
/**
* @description: 保存常办项目
* @param {*} data
* @author: renchao
*/
export function saveFrequentProjectsList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/home/saveFrequentProjectsList',
method: 'post',
data
})
}
\ No newline at end of file
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-18 10:53:07
* @LastEditTime: 2023-06-08 13:43:33
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -14,7 +14,7 @@ const url = SERVER.SERVERAPI + '/rest/zhcx/lpcx/'
*/
export function getLpZrz (data) {
return request({
url: 'service-lpb/rest/zhcx/lpcx/getLpZrz',
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpZrz',
method: 'post',
data: data
})
......@@ -27,7 +27,7 @@ export function getLpZrz (data) {
*/
export function getLpb (zrzbsm) {
return request({
url: url + 'getLpb?scyclx=1&zrzbsm=' + zrzbsm,
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=1&zrzbsm=' + zrzbsm,
method: 'get'
})
}
......@@ -38,7 +38,7 @@ export function getLpb (zrzbsm) {
*/
export function getLpbFwytAndQlxz (zrzbsm) {
return request({
url: url + 'getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm,
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm,
method: 'get'
})
}
......
/*
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:13:24
*/
......@@ -285,7 +285,7 @@ export function selectZdjbxxSplitMergeLast (data) {
*/
export function selectZrz (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrzQjdc',
method: 'post',
data
})
......@@ -348,7 +348,7 @@ export function selectJsydQlxxSplitMergeBefore (data) {
*/
export function selectFwsyq (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyq',
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyqQlxx',
method: 'post',
data
})
......@@ -394,9 +394,9 @@ export function selectYgdy (data) {
* @param data
* @returns {*}
*/
export function selectAllHInfo (data) {
export function selectHQjdc (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectAllHInfo',
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHQjdc',
method: 'post',
data
})
......
......@@ -31,9 +31,7 @@
import Cookies from 'js-cookie'
import { mapGetters } from 'vuex'
import NoticeBar from '@/components/NoticeBar/index'
import {
getHomeNoticeList
} from "@/api/user"
import {getHomeNoticeList} from "@/api/home"
export default {
components: {
NoticeBar
......
......@@ -8,7 +8,7 @@
<script>
import { getMenuInfo } from "@/api/user.js";
import Tree from "@/components/Tree/src/tree.vue"
import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/user.js";
import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/home.js";
export default {
components: {
Tree
......
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-24 14:42:24
*/
import { getForm } from "../flowform";
import { getHomeNoticeList } from "@/api/user.js"
import { getHomeNoticeList } from "@/api/home.js"
import { log } from "bpmn-js-token-simulation";
export default {
data () {
......
......@@ -8,7 +8,7 @@
<script>
import { getMenuInfo } from "@/api/user.js";
import Tree from "@/components/Tree/src/tree.vue"
import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/user.js";
import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/home.js";
export default {
components: {
Tree
......
......@@ -106,7 +106,7 @@
<script>
import * as G2 from '@antv/g2'
import vueSeamlessScroll from "vue-seamless-scroll"
import { getHomeNoticeList, getHomeTodoList, getHomeDoneList, getHomeFrequentProjects } from "@/api/user.js";
import { getHomeNoticeList, getHomeTodoList, getHomeDoneList, getHomeFrequentProjects } from "@/api/home.js";
import { setReadStatus } from '@/api/system'
import addDialog from "./components/addProject.vue";
export default {
......
......@@ -105,13 +105,13 @@
</div>
</div>
<!-- 单元列表页面-->
<selectAllHInfo v-else :sqywInfo="formData" />
<selectZrzH v-else :sqywInfo="formData" />
</div>
</template>
<script>
import lpbContent from "./lpbContent/index";
import selectAllHInfo from "../ywbl/ywsq/components/selectAllHInfo"
import selectZrzH from "../ywbl/ywsq/components/selectZrzH"
import { getLpbFwytAndQlxz,getLpbQsxtj } from '@/api/lpb'
export default {
name: "lpb",
......@@ -123,7 +123,7 @@ export default {
},
components: {
lpbContent,
selectAllHInfo
selectZrzH
},
data () {
return {
......
......@@ -5,29 +5,31 @@
{{ title }}
<div class="checkbox">
<el-checkbox-group v-model="checkList" @change="checkChange">
<el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
<el-checkbox
v-for="item in qsztList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div class="xxTableBox rollTable">
<table class="xxTable">
<tr v-for="(item, colindex) in columns" :key="colindex">
<td>
{{ item.label }}
</td>
<td v-for="(row, index) in tableData" :key="index" :class="[
<td>{{ item.label }}</td>
<td
v-for="(row, index) in tableData"
:key="index"
:class="[
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
]"
>
<div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
<span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
<span v-else> {{ row[item.prop] }}</span>
<span v-else>{{ row[item.prop] }}</span>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......@@ -41,7 +43,7 @@
import { getCfdjList } from "@/api/registerBook.js";
import { datas } from "./qlxxFormData.js";
export default {
data () {
data() {
return {
title: "查封登记信息",
qsztList: datas.columns().qsztList,
......@@ -56,11 +58,11 @@ export default {
columns: datas.columns().CFDJ,
};
},
created () {
created() {
this.loadData();
},
methods: {
loadData () {
loadData() {
getCfdjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......@@ -69,12 +71,12 @@ export default {
if (res.code === 200) {
this.tableData = res.result;
this.tableData.forEach((item, index) => {
if (item.sfbxf == '1') {
item.zxywh = '';
item.zxdbr = '';
item.zxsj = '';
if (item.sfbxf == "1") {
item.zxywh = "";
item.zxdbr = "";
item.zxsj = "";
}
})
});
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
datas.columns().emptycolNum - this.tableData.length;
......@@ -84,7 +86,7 @@ export default {
}
});
},
checkChange () {
checkChange() {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
......@@ -92,7 +94,7 @@ export default {
this.loadData();
}
},
getQsztName (code) {
getQsztName(code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
......
......@@ -793,15 +793,15 @@ class data extends filter {
label: "查封机关",
},
{
prop: "qlrmc",
label: "不动产权利人",
prop: "ywrmc",
label: "被执行人",
},
{
prop: "qlrzjzl",
prop: "ywrzjzl",
label: "证件种类",
},
{
prop: "qlrzjhm",
prop: "ywrzjhm",
label: "证件号",
},
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:48
-->
......@@ -52,10 +52,10 @@
{
prop: "qllxmc",
label: "权利类型"
},
},
{
prop: "qlrmc",
label: "权利人"
label: "被执行人"
},
{
prop: "bdcqzh",
......@@ -127,4 +127,4 @@
}
</script>
<style scoped lang='scss'>
</style>
\ No newline at end of file
</style>
......
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-24 14:42:24
*/
import { getForm } from "../flowform";
import { getHomeNoticeList } from "@/api/user.js"
import { getHomeNoticeList } from "@/api/home.js"
export default {
data () {
return {
......
......@@ -105,6 +105,7 @@
},
//申请单元点击事件
stepForm (index) {
this.currentSelectProps.type = "READ_ONLY"
getStepFormInfo(this.currentSelectProps).then((res) => {
if (res.code === 200) {
this.fresh++;
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:43:00
-->
......@@ -56,7 +56,7 @@
查封不动产列表
<div class="triangle"></div>
</div>
<cfBdcdyTable :tableData="ruleForm.yqlxxList" />
<cfBdcdyTable :tableData="ruleForm.ssQlxxList" />
<div class="slxx_title title-block">
批量查封信息
<div class="triangle"></div>
......@@ -72,11 +72,12 @@
<el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- 批量查封状态有多种查封类型,不予展示 -->
<!-- <el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc">
<el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input>
</el-form-item>
</el-col>
</el-col>-->
</el-row>
<el-row :gutter="10">
<el-col :span="8">
......@@ -230,4 +231,4 @@
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
\ No newline at end of file
</style>
......
......@@ -173,7 +173,7 @@
</el-col>
</el-row>
<qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.slsq.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
<div class="slxx_title title-block">
......
......@@ -166,7 +166,7 @@
</el-col>
</el-row>
<qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.slsq.gyfs" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......
......@@ -130,7 +130,7 @@
</el-col>
</el-row>
<qlrCommonTable v-if="ruleForm.qlxxList[0]" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
:gyfs="ruleForm.qlxxList[0].gyfs" />
:gyfs="ruleForm.slsq.gyfs" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......
......@@ -126,10 +126,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -260,9 +260,6 @@
this.$popupCacel()
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.zdbsm
})
this.bdcdysz = val
},
handleLpbClick (item) {
......
......@@ -111,10 +111,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx
item.ybdcqzsh = item.bdcqzh
})
this.bdcdysz = val;
},
openBook (row) {
......
......@@ -139,10 +139,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -116,10 +116,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -48,11 +48,11 @@
</template>
<script>
import store from '@/store/index.js'
import { datas, sendThis } from "../javascript/selectYgdj100.js";
import { datas, sendThis } from "../javascript/selectH.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
import jump from "./mixin/jump";
import { selectYgdj100, startBusinessFlow } from "@/api/ywbl.js";
import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
export default {
mixins: [table, jump],
props: {
......@@ -78,7 +78,7 @@
console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectYgdj100({ ...this.queryForm, ...this.pageData }).then((res) => {
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
......@@ -115,11 +115,7 @@
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
handleSelectionChange (val) {
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -123,11 +123,7 @@
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
handleSelectionChange (val) {
this.bdcdysz = val;
},
openBook (row) {
......
......@@ -110,6 +110,7 @@
if (res.code === 200) {
this.tableData.datastwo = res.result
this.tableData.datastwo.forEach(item => {
item.bsm = item.zdbsm;
item.bglx = '2'
})
this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo]
......@@ -131,8 +132,6 @@
console.log(val, 'valvalvalval');
this.radioVal = val.bhqkbsm
let obj = val
obj.bsmSsql = val.bsmQlxx;
obj.ybdcqzsh = val.bdcqzh;
obj.bglx = '1';
this.bdcdysz[0] = obj
......
......@@ -121,6 +121,9 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsm = item.zdbsm;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -115,11 +115,7 @@
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
handleSelectionChange (val) {
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -116,10 +116,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -52,7 +52,7 @@
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
import jump from "./mixin/jump";
import { selectAllHInfo, startBusinessFlow } from "@/api/ywbl.js";
import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
export default {
mixins: [table, jump],
props: {
......@@ -75,10 +75,10 @@
sendThis(this);
},
methods: {
queryClick () {
console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx);
queryClick () {
this.$startLoading();
selectAllHInfo({ "zrzbsm": this.sqywInfo.zrzbsm, ...this.queryForm, ...this.pageData }).then((res) => {
this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
selectHQjdc({...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
......@@ -116,10 +116,6 @@
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
item.bsmSsql = item.bsmQlxx;
item.ybdcqzsh = item.bdcqzh;
});
this.bdcdysz = val;
},
select(selection, row){
......
......@@ -39,17 +39,7 @@ class data extends filter {
return (
<div>
{/* <a v-on:click="doSomething"></a> */}
<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>
<a style='color:#3498db;' v-show={scope.row.qlblzt == 1} >正在办理</a>
</div>
)
}
......@@ -68,6 +58,10 @@ class data extends filter {
label: "查封机关",
},
{
prop: "cflxmc",
label: "查封类型",
},
{
prop: "cfwh",
label: "查封文号",
},
......
......@@ -51,25 +51,48 @@ class data extends filter {
</div>
)
}
},
},
{
prop: "qllxmc",
label: "权利类型",
label: "测绘类型",
render: (h, scope) => {
return (
<div>
<span v-show={scope.row.scyclx == 0}>预测</span>
<span v-show={scope.row.scyclx == 1}>实测</span>
</div>
)
}
},
{
prop: "bdcdyh",
label: "不动产单元号",
},
{
prop: "jzwmc",
label: "建筑物名称",
},
{
prop: "fwxzmc",
label: "房屋性质",
},
{
prop: "showFwyt",
label: "房屋用途",
},
{
prop: "szc",
label: "房屋所在层数",
label: "所在层",
},
{
prop: "zcs",
label: "总层数",
},
{
prop: "mj",
label: "房屋面积",
prop: "jzmj",
label: "建筑面积",
},
{
prop: "fwjgmc",
prop: "showfwjg",
label: "房屋结构",
},
{
......
......@@ -67,11 +67,11 @@ class data extends filter {
minWidth: '110'
},
{
prop: "qlxzmc",
prop: "showQlxz",
label: "权利性质",
},
{
prop: "mj",
prop: "zdmj",
label: "宗地面积(㎡)",
},
{
......@@ -79,10 +79,18 @@ class data extends filter {
label: "权利设定方式",
},
{
prop: "ytmc",
prop: "showTdyt",
label: "土地用途",
},
{
prop: "tfh",
label: "图幅号",
},
{
prop: "djh",
label: "地籍号",
},
{
prop: "zl",
label: "坐落",
minWidth: '110'
......
......@@ -54,7 +54,7 @@ export function queueDjywmc(djywbm, djqxbm) {
vm = "cfdj";
break;
case "B40100"://预告首次
vm = "selectYgdj100";
vm = "selectH";
break;
case "B40200"://预告转移
case "B40300"://预告变更
......