dc3bba54 by 夏齐

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/workflow/flowform.js
2 parents a3c30052 a869ad39
......@@ -5,4 +5,4 @@ NODE_ENV=development
VUE_APP_BASE_API = '/bdcdj'
# 开发环境
VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'
......
......@@ -3,14 +3,14 @@ import request from '@/utils/request'
// 初始化内容
export function Init(data) {
let apiUrl = "";
switch (data.get("sqywbm")) {
case "B39300":
switch (data.get("djlx")) {
case "300":
apiUrl = "/ywbl/cfdj/xfInit";
break;
case "B39400":
case "400":
apiUrl = "/ywbl/cfdj/jfInit";
break;
case "B39800":
case "800":
apiUrl = "/ywbl/cfdj/cfInit";
break;
}
......@@ -20,11 +20,22 @@ export function Init(data) {
data
})
}
//批量查封
export function cfBatchInit (data) {
//批量初始化
export function BatchInit(data) {
let apiUrl = "";
switch (data.get("djlx")) {
case "300":
apiUrl = "/ywbl/cfdj/xfBatchInit";
break;
case "400":
apiUrl = "/ywbl/cfdj/jfBatchInit";
break;
case "800":
apiUrl = "/ywbl/cfdj/cfBatchInit";
break;
}
return request({
url: '/ywbl/cfdj/cfBatchInit',
url: apiUrl,
method: 'post',
data
})
......@@ -38,3 +49,12 @@ export function saveData (data) {
data
})
}
// 批量数据保存
export function batchSaveData (data) {
return request({
url: '/ywbl/cfdj/batchSaveData',
method: 'post',
data
})
}
......
<template>
<div>
<!-- 界面后期调整开发,报表开发,目前先放一张图片 -->
<el-form :model="ruleForm" label-width="120px">
<el-row>
<el-col :span="6">
<el-form-item label="查询时间:">
<!-- <el-input disabled v-model="ruleForm.cxlx"></el-input> -->
<img :src="imgUrl" alt="" srcset="" />
<!-- <el-form-item label="查询时间:">
{{ ruleForm.cxsj }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号:">
{{ ruleForm.bdcdyh }}
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<table class="table1">
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
<td>4</td>
<td>5</td>
<td>6</td>
<td>7</td>
<td>8</td>
<td>9</td>
<td>10</td>
<td>11</td>
</tr>
</table>
</el-col>
</el-row>
</el-form>
</div>
......@@ -40,6 +23,7 @@
<script>
import { getJtfcInfo } from "@/api/sqcxjl";
import imgPath from "./打印登记薄.png" //先导入
export default {
components: {},
......@@ -56,6 +40,7 @@ export default {
cxsj: "",
bdcdyh: "",
},
imgUrl:imgPath,
};
},
......
......@@ -98,10 +98,10 @@ export default {
// var sqcxBsm = scope.row.bsmSqcx;
this.$popup({
title: "打印登记薄",
width: "85%",
width: "65%",
btnShow: true,
editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
height: "700px",
height: "800px",
formData: {
sqcxdata: scope.row,
},
......
......@@ -30,7 +30,7 @@
<el-button @click="resetClick()">重置</el-button>
</div>
<b class="title">查询结果</b>
<p>查询编号:202200409</p>
<!-- <p>查询编号:{{cxbh}}</p> -->
<lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting
:pagination="false">
</lb-table>
......
......@@ -23,7 +23,7 @@ class data extends filter {
label: '登记时间',
},
{
prop: 'hth',
prop: 'wqhth',
label: '合同号',
},
{
......@@ -39,11 +39,11 @@ class data extends filter {
label: '共有方式',
},
{
prop: 'qlr',
prop: 'qlrmc',
label: '权利人',
},
{
prop: 'zjh',
prop: 'zjhm',
label: '证件号',
},
{
......@@ -51,7 +51,7 @@ class data extends filter {
label: '房地坐落',
},
{
prop: 'jzmj',
prop: 'fwmj',
label: '建筑面积(㎡)',
},
{
......
......@@ -73,7 +73,7 @@
</el-row>
<el-row>
<el-col>
<p>查询编号:202200409</p>
<p>查询编号:{{cxbh}}</p>
</el-col>
</el-row>
<el-row>
......@@ -145,6 +145,7 @@ export default {
this.sqrData.data = res.result.sqxx;
this.qlrData.data = res.result.qlrxx;
this.cxjgData.data = res.result.djSqcxCxjgDOList;
this.cxbh=res.result.djSqcxDO.cxbh;
}
})
......
......@@ -8,11 +8,23 @@ class data extends filter {
constructor() {
super()
}
cxjgcolumns () {
cxjgcolumns() {
return [
{
prop: 'qszt',
label: '权属状态',
render: (h, scope) => {
switch (scope.row.qszt) {
case '0':
return <div>临时</div>
case '1':
return <div>现势</div>
case '2':
return <div>历史</div>
case '3':
return <div>终止</div>
}
}
},
{
prop: 'bdcqzh',
......@@ -23,7 +35,7 @@ class data extends filter {
label: '登记时间',
},
{
prop: 'hth',
prop: 'wqhth',
label: '合同号',
},
{
......@@ -39,19 +51,19 @@ class data extends filter {
label: '共有方式',
},
{
prop: 'qlr',
prop: 'qlrmc',
label: '权利人',
},
{
prop: 'zjh',
prop: 'zjhm',
label: '证件号',
},
{
prop: 'fdzl',
prop: 'zl',
label: '房地坐落',
},
{
prop: 'jzmj',
prop: 'fwmj',
label: '建筑面积(㎡)',
},
{
......@@ -74,7 +86,7 @@ class data extends filter {
}
]
}
sqrcolumns () {
sqrcolumns() {
return [
{
prop: 'sqrxm',
......@@ -95,7 +107,7 @@ class data extends filter {
]
}
qlrcolumns () {
qlrcolumns() {
return [
{
prop: 'sqrxm',
......
<template>
<div>
<lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
<lb-table :column="column" border :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
</div>
......@@ -39,7 +39,7 @@ export default {
width: '50',
renderHeader: (h, scope) => {
return <div> {
this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
}
</div>
},
......@@ -48,7 +48,7 @@ export default {
<div>
{
this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
<i class="el-icon-minus pointer" onClick={() => { this.handleMinus(scope.$index, scope.row) }}></i>
<i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
}
</div>
)
......@@ -86,10 +86,10 @@ export default {
this.$route.query.viewtype == 1 ? <el-button
icon="el-icon-view"
type="text"
onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button> : <el-button
onClick={() => { this.queryViewClick(scope.$index, scope.row) }}>查看</el-button> : <el-button
icon="el-icon-edit-outline"
type="text"
onClick={() => { this.handleEdit(scope.$index, scope.row) }}>编辑</el-button>
onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
}
</div>
)
......@@ -142,24 +142,29 @@ export default {
this.key++
this.$emit('upDateQlrxxList', this.tableDataList)
},
// 添加
handleAdd () {
// 新增
addClick () {
this.dialog = true
},
// 减
handleMinus (index, row) {
// 删除
deleClick (index, row) {
this.tableData.splice(index, 1)
},
// 身份证读取
readClick () { },
// 修改
handleEdit (index, row) {
editClick (index, row) {
console.log(row, 'rowrowrowrowrow');
this.dataIndex = index
this.dialog = true
this.details = row
},
handleView () {
queryViewClick () {
this.dialog = true
}
}
......
......@@ -59,14 +59,6 @@ export default {
label: "权利人"
},
{
prop: "ywrmc",
label: "义务人"
},
{
prop: "qlxz",
label: "权利性质"
},
{
prop: "ytmc",
label: "用途"
},
......
......@@ -44,7 +44,7 @@ export function getForm(tabName, djywbm) {
case "cfdjxx":
form = require("@/views/registerBook/cfdj.vue");
break;
case "qlxx":
case "jsydsyqQlxx":
form = require("@/views/registerBook/jsydsyq.vue");
break;
case "fdcq2Qlxx":
......
......@@ -383,7 +383,16 @@ export default {
type: "warning", //提示类型 success/info/warning/error
}).then(function () {
record(formdata).then((res) => {
if (res.code === 200 || res.code === 2002) {
if (res.code === 200) {
if(res.result.length===1){
res.result[0].state? that.$alert("登簿成功!"): that.$alert(res.result[0].msg);;
}
else{
that.$alert('<div>'+res.result[0].ywh+','+res.result[0].msg+'</div>', '登簿明细', {
dangerouslyUseHTMLString: true
});
}
}else{
that.$alert(res.message);
}
});
......
......@@ -132,7 +132,7 @@
</template>
<script>
import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
import { cfBatchInit, saveData } from "@/api/cfdjFlow.js";
import { BatchInit, batchSaveData } from "@/api/cfdjFlow.js";
import { mapGetters } from "vuex";
export default {
data () {
......@@ -148,7 +148,15 @@ export default {
};
},
created () {
this.list();
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("djlx", this.propsParam.djlx);
BatchInit(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result
}
});
},
watch: {
......@@ -169,18 +177,10 @@ export default {
},
methods: {
list () {
var formdata = new FormData();
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
cfBatchInit(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result
}
});
},
onSubmit () {
saveData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
batchSaveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message.success('保存成功');
}
});
......
......@@ -63,37 +63,37 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="宗地面积:">
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="面积:">
<el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="土地用途:">
<el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="用途:">
<el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:">
<el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利人:" prop="qlxx.qlrmc">
<el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
<el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:">
<el-input disabled v-model="ruleForm.qlxx.ywrzjhm"></el-input>
<el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:">
<el-input disabled v-model="ruleForm.qlxx.ywrzjzl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -104,13 +104,13 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg">
<el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype"></el-input>
<el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflx">
<el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型:"
:disabled="$route.query.viewtype" @change="changeCflx">
:disabled="$route.query.viewtype || ableEdit" @change="changeCflx">
<el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
......@@ -118,25 +118,25 @@
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj">
<el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype"></el-input>
<el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:" prop="cfdj.cfwh">
<el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype"></el-input>
<el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:" prop="cfdj.cfqssj">
<el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" :disabled="$route.query.viewtype"
<el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" :disabled="$route.query.viewtype || ableEdit"
type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:" prop="cfdj.cfjssj">
<el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype"
<el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype || ableEdit"
type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
......@@ -144,26 +144,26 @@
<el-row :gutter="10">
<el-col :span="24">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw">
<el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype"></el-input>
<el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="cfdj.fj">
<el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype"></el-input>
<el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy">
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype"></el-input>
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype || ableEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-row class="btn" v-if="!$route.query.viewtype && !ableEdit">
<el-form-item :class="flag ? 'marginBot0' : ''">
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -185,12 +185,21 @@ export default {
propsParam: {},
//页面数据
ruleForm: {},
//是否可编辑
ableEdit: false
};
},
created () {
async created () {
this.propsParam = this.$attrs;
this.list(this.propsParam.bsmSldy);
this.ableEdit = this.$parent.showBatch;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result
}
});
},
watch: {
......@@ -211,16 +220,6 @@ export default {
},
methods: {
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
formdata.append("sqywbm", this.$route.query.sqywbm);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result
}
});
},
onSubmit () {
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -50,7 +50,7 @@ class data extends filter {
{
prop: "zbhj",
label: "在办环节",
width: '70'
width: '80'
},
{
label: '业务号',
......
......@@ -219,7 +219,7 @@ export default {
methods: {
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrxx = _.cloneDeep(val)
this.ruleForm.qlrList = _.cloneDeep(val)
// this.$store.dispatch('slxx/setQlrxxNew', {
// qlrxx: this.ruleForm.qlrxx,
// fj: this.ruleForm.fj,
......@@ -227,24 +227,20 @@ export default {
// djyy: this.ruleForm.djyy
// })
},
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
}
});
},
onSubmit () {
saveData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -196,32 +196,7 @@ export default {
return {
disabled: true,
czrOptions: [],
ruleForm: {
ywh: "",
slry: "",
slsj: "",
qllx: "",
djlx: "",
djqx: "",
zddm: "",
bdcdyh: "",
qlxzmc: "",
qlrxx: [],
zdmj: "",
zl: "",
tdyt: "",
qlsdfs: "",
qdjg: "",
tdsyqx: "",
syqqzsj: "",
fj: "",
djyy: "",
gyfs: "1",
// 是否分别持证
sffbcz: "",
// 持证人
czr: "",
},
ruleForm: {},
//传递参数
propsParam: {},
rules: {},
......@@ -231,29 +206,25 @@ export default {
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
}, // 更新权利人信息
},
// 更新义务人信息
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
list(bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
}
});
},
onSubmit() {
saveData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -11,111 +11,105 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="业务号:">
<el-input disabled v-model="ruleForm.ywh"></el-input>
<el-input disabled v-model="ruleForm.slywxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员:">
<el-input disabled v-model="ruleForm.slry"></el-input>
<el-input disabled v-model="ruleForm.slywxx.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间:">
<el-input disabled v-model="ruleForm.slsj"></el-input>
<el-input disabled v-model="ruleForm.slywxx.slsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:">
<el-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
<el-input disabled v-model="ruleForm.slywxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型:">
<el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
<el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形:">
<el-input disabled v-model="ruleForm.djqxmc"></el-input>
<el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
不动产单元情况
<div class="triangle"></div>
<div><el-button @click="compare">变化情况对比+</el-button></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码:">
<el-input disabled v-model="ruleForm.zddm"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="原不动产权证号:">
<el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:">
<el-input disabled v-model="ruleForm.bdcdyh"></el-input>
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质:">
<el-input disabled v-model="ruleForm.qlxzmc"></el-input>
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="宗地面积:">
<el-input disabled v-model="ruleForm.zdmj"></el-input>
<el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="土地用途:">
<el-input disabled v-model="ruleForm.ghytmc"></el-input>
<el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式:">
<el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>
<el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格:">
<el-input disabled v-model="ruleForm.qdjg"></el-input>
<el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:">
<el-input disabled v-model="ruleForm.zl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="使用期限:">
<el-input disabled v-model="ruleForm.tdsyqx"></el-input>
<el-input disabled v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="使用权起止时间:">
<el-input disabled v-model="ruleForm.syqqzsj"></el-input>
<el-input disabled v-model="ruleForm.jsydsyq.syqqzsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="fj">
<el-input type="textarea" v-model="ruleForm.fj" :disabled="$route.query.viewtype==1"></el-input>
<el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype==1"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -126,7 +120,7 @@
<el-row :gutter="10">
<el-col :span="14">
<el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:">
<el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.gyfs">
<el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
<el-radio label="1">单独所有</el-radio>
<el-radio label="2">共同共有</el-radio>
<el-radio label="3">按份所有</el-radio>
......@@ -135,7 +129,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs == '2'">
<el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证:">
<el-radio-group v-model="ruleForm.sffbcz">
<el-radio-group v-model="ruleForm.slywxx.sffbcz">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
......@@ -150,7 +144,7 @@
</el-form-item>
</el-col>
</el-row>
<InformationTable :tableData="ruleForm.qlrxx" :viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
<InformationTable :tableData="ruleForm.qlrList" :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......@@ -158,7 +152,7 @@
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.jsydsyq.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -174,21 +168,17 @@
</template>
<script>
import InformationTable from "@/views/workflow/components/InformationTable";
import { Init, fristReg } from "@/api/jsydsyqFlow.js";
import { Init, saveData } from "@/api/jsydsyqFlow.js";
import { mapGetters } from "vuex";
export default {
async created () {
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.ruleForm = res.result;
}
});
},
......@@ -200,59 +190,54 @@ export default {
return {
disabled: true,
czrOptions: [],
ruleForm: {
// ywh: "",
// slry: "",
// slsj: "",
// qllx: "",
// djlx: "",
// djqx: "",
// zddm: "",
// bdcdyh: "",
// qlxzmc: "",
// qlrxx: [],
// zdmj: "",
// zl: "",
// tdyt: "",
// qlsdfs: "",
// qdjg: "",
// tdsyqx: "",
// syqqzsj: "",
// fj: "",
// djyy: "",
// gyfs: "1",
// sffbcz: "",
// czr: "",
},
ruleForm: {},
//传递参数
propsParam: {},
rules: {},
};
},
methods: {
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
}
});
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
},
onSubmit () {
fristReg(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
compare(){
this.$popup({
titleStyle: "left",
title: "土地变化情况比对", // 弹窗标题
editItem: "registerBook/jsydsyq", // 弹窗内容
formData: this.propsParam,
width: "1220px",
height: "790px",
// cancelText: '取消摆烂', // 右边按钮文本
// confirmText: '确定点击', //左边按钮文本
cancel: () => {
console.log("取消回调");
},
confirm: () => {
console.log("确认回调");
},
});
}
},
};
</script>
<style scoped lang='scss'>
......
......@@ -58,7 +58,7 @@ import { datas, sendThis } from "../javascript/cfdj.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
import jump from "../components/mixin/jump";
import { selectCfdj, startBusinessFlow } from "@/api/ywbl.js";
import { selectCfdj, startBusinessFlow ,choiceBdcdy} from "@/api/ywbl.js";
export default {
props: {
isJump: { type: Boolean, default: false },
......@@ -102,6 +102,7 @@ export default {
return;
}
this.saveloding = true;
if (!this.isJump) {
startBusinessFlow({
bsmSqyw: Cookies.get("bsmSqyw"),
bdcdysz: this.bdcdysz,
......@@ -115,15 +116,29 @@ export default {
message: '发起申请成功',
type: 'success'
})
if (!this.isJump) {
this.jump(res.result, this.djywbm)
} else {
this.$emit('updateDialog', true)
this.$message.error(res.message);
}
})
} else {
choiceBdcdy({
bsmSlsq: this.$route.query.bsmSlsq,
bdcdysz: this.bdcdysz
}).then(res => {
this.saveloding = false;
if (res.code == 200) {
this.$message({
showClose: true,
message: '发起申请成功',
type: 'success'
})
this.$emit('updateDialog', true)
} else {
this.$message.error(res.message);
}
});
})
}
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -6,27 +6,52 @@
<el-row>
<el-col :span="5">
<el-form-item label="权利类型">
<el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['权利类型']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select
v-model="queryForm.qllx"
filterable
clearable
placeholder="请选择权利类型"
>
<el-option
v-for="item in dictData['A8']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width200px">
<el-input
placeholder="请输入不动产单元号"
v-model="queryForm.bdcdyh"
clearable
class="width200px"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px">
<el-input
placeholder="请输入不动产权证号"
v-model="queryForm.bdcqzh"
clearable
class="width200px"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="业务号">
<el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px">
<el-input
placeholder="请输入业务号"
v-model="queryForm.ywh"
clearable
class="width200px"
>
</el-input>
</el-form-item>
</el-col>
......@@ -42,9 +67,17 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
:total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
<lb-table
:page-size="pageData.size"
border
@sort-change="handleSort"
:current-page.sync="pageData.current"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
</lb-table>
</div>
</div>
......@@ -58,10 +91,10 @@ import { mapGetters } from "vuex";
export default {
name: "djbcx",
mixins: [table],
mounted () {
mounted() {
sendThis(this);
},
data () {
data() {
return {
queryForm: {
qllx: "",
......@@ -74,7 +107,6 @@ export default {
size: 10,
total: 0,
},
ywlys: datas.ywlys(),
tableData: {
columns: datas.columns(),
data: [],
......@@ -89,42 +121,43 @@ export default {
},
methods: {
// 初始化数据
fetchData () {
fetchData() {
debugger;
getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => {
if (res.code === 200) {
let { total, records } = res.result;
this.pageData.total = total;
this.tableData.data = records;
this.tableData.total = total;
}
});
},
handleSort (name, sort) {
handleSort(name, sort) {
console.log(name, sort);
},
// 查询
queryClick () {
this.pageData.current = 1;
this.pageData.currentPage = 1;
queryClick() {
// this.pageData.current = 1;
// this.pageData.currentPage = 1;
this.fetchData();
},
// 高级查询
moreQueryClick () { },
openDialog (scroll) {
moreQueryClick() {},
openDialog(scroll) {
this.$popup({
titleStyle:"left",
title: '登记簿详情', // 弹窗标题
editItem: 'registerBook/djbFrame', // 弹窗内容
titleStyle: "left",
title: "登记簿详情", // 弹窗标题
editItem: "registerBook/djbFrame", // 弹窗内容
formData: scroll,
width:"1220px",
height:"790px",
width: "1220px",
height: "790px",
// cancelText: '取消摆烂', // 右边按钮文本
// confirmText: '确定点击', //左边按钮文本
cancel: () => {
console.log('取消回调')
console.log("取消回调");
},
confirm: () => {
console.log('确认回调')
}
console.log("确认回调");
},
});
},
},
......
......@@ -35,7 +35,7 @@ class data extends filter {
text: '历史',
color: '#AAAAAA'
},
"3": {
"0": {
text: '临时',
color: '#FE9400'
}
......@@ -110,15 +110,6 @@ class data extends filter {
]
}
ywlys () {
return [
{ value: 1, label: "办事大厅" },
{ value: 2, label: "微信小程序" },
{ value: 3, label: "法院端" },
{ value: 4, label: "银行端" },
]
}
}
let datas = new data()
export {
......
......@@ -46,7 +46,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.pageSize" @sort-change="handleSort" :current-page.sync="pageData.currentPage"
<lb-table border :page-size="pageData.pageSize" @sort-change="handleSort" :current-page.sync="pageData.currentPage"
:total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
</lb-table>
......
......@@ -36,7 +36,7 @@ class data extends filter {
label: "坐落",
},
{
prop: "yt",
prop: "showFwyt",
label: "用途",
},
{
......
......@@ -2,17 +2,23 @@
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh">
<el-input
placeholder="请输入不动产权证号"
v-model="queryForm.bdcqzh"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="印刷序列号">
<el-input placeholder="请输入印刷序列号" v-model="queryForm.ysxlh">
<el-input
placeholder="请输入印刷序列号"
v-model="queryForm.ysxlh"
>
</el-input>
</el-form-item>
</el-col>
......@@ -31,7 +37,11 @@
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
<el-button
type="primary"
@click="queryClick()"
>查询</el-button
>
<el-button @click="moreQueryClick()">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -40,9 +50,15 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
<lb-table
:page-size="pageData.size"
:current-page.sync="pageData.current"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
</lb-table>
</div>
</div>
......@@ -53,32 +69,34 @@ import { datas, sendThis } from "./zslqcx";
export default {
components: {},
mixins: [table],
mounted () {
mounted() {
sendThis(this);
},
data () {
data() {
return {
queryForm: {
bdcqzh: '',
ysxlh: '',
ywh: '',
lqr: ''
bdcqzh: "",
ysxlh: "",
ywh: "",
lqr: "",
},
tableData: {
columns: datas.columns(),
data: [
{
qllx: 'A01'
}
]
}
}
data: [],
},
};
},
methods: {
// 查询
queryClick() {
this.fetchData();
},
// 初始化数据
fetchData () { },
}
}
fetchData() {
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -2,7 +2,7 @@
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm">
<el-form :model="queryForm" ref="queryForm" label-width="80px">
<el-row>
<el-col :span="5">
<el-form-item label="项目名称">
......@@ -31,7 +31,11 @@
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
<el-button
type="primary"
@click="queryClick()"
>查询</el-button
>
<el-button @click="moreQueryClick()">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -40,9 +44,15 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
<lb-table
:page-size="pageData.size"
:current-page.sync="pageData.current"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
</lb-table>
</div>
</div>
......@@ -53,29 +63,33 @@ import { datas, sendThis } from "./zxgcdycx";
export default {
components: {},
mixins: [table],
mounted () {
mounted() {
sendThis(this);
},
data () {
data() {
return {
queryForm: {
xmmc: '',
xmbh: '',
zrzh: '',
zddm: ''
xmmc: "",
xmbh: "",
zrzh: "",
zddm: "",
},
tableData: {
columns: datas.columns(),
data: [
]
}
}
data: [],
},
};
},
methods: {
// 查询
queryClick() {
this.fetchData();
},
// 初始化数据
fetchData () { },
}
}
fetchData() {},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......