66d24b36 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents facecaf7 ad8f6c39
......@@ -80,7 +80,7 @@
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=bdcqljqtsx`,
`printdjb`
`bdcqljqtsx`
);
},
}
......
......@@ -211,7 +211,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=cfdj`,
`printdjb`
`cfdj`
);
},
},
......
......@@ -207,7 +207,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyaq`,
`printdjb`
`diyaq`
);
},
},
......
......@@ -208,7 +208,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyiq`,
`printdjb`
`diyiq`
);
},
},
......
......@@ -66,7 +66,7 @@
},
print(){
console.log("this.propsParam.bdcdyid ",this.propsParam);
window.open(`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=djbfm`, `printdjb`);
window.open(`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=djbfm`, `djbfm`);
}
},
};
......
......@@ -241,7 +241,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq1`,
`printdjb`
`fdcq1`
);
},
},
......
......@@ -202,7 +202,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq2`,
`printdjb`
`fdcq2`
);
},
},
......
......@@ -210,7 +210,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=jsydsyq`,
`printdjb`
`jsydsyq`
);
},
},
......
......@@ -211,7 +211,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ldsyq`,
`printdjb`
`ldsyq`
);
},
},
......
......@@ -263,7 +263,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=nydsyq`,
`printdjb`
`nydsyq`
);
},
},
......
......@@ -193,7 +193,7 @@
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=sllmsyq`,
`printdjb`
`sllmsyq`
);
},
},
......
......@@ -183,7 +183,7 @@
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=tdsyq`,
`printdjb`
`tdsyq`
);
},
},
......
......@@ -183,7 +183,7 @@
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ygdj`,
`printdjb`
`ygdj`
);
},
},
......
......@@ -182,7 +182,7 @@
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=yydj`,
`printdjb`
`yydj`
);
},
},
......
......@@ -216,7 +216,7 @@ export default {
console.log("this.propsParam.bdcdyid ", this.propsParam);
window.open(
`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=zdjbxx`,
`printdjb`
`zdjbxx`
);
},
},
......
<template>
<div>
<div>自来水信息</div>
<div>天然气信息</div>
<div>电力信息</div>
</div>
</template>
\ No newline at end of file
<template>
<div>
<div>不动产信息</div>
<div>收费明细</div>
<div>缴费票据</div>
</div>
</template>
\ No newline at end of file
<template>
<div>
<div>不动产信息</div>
<div>买方信息</div>
<div>卖方信息</div>
<div>合同信息</div>
<div>缴税信息</div>
</div>
</template>
\ No newline at end of file
......@@ -66,6 +66,15 @@ export function getForm(tabName, djywbm) {
case "spyj":
form = require("@/views/workflow/components/spyj.vue");
break;
case "swxx":
form = require("@/views/workflow/components/swxx.vue");
break;
case "sfxx":
form = require("@/views/workflow/components/sfxx.vue");
break;
case "sdqxx":
form = require("@/views/workflow/components/sdqxx.vue");
break;
case "zdjbxx":
form = require("@/views/registerBook/zdjbxx.vue");
break;
......
......@@ -369,7 +369,7 @@
:disabled="viewEdit"
:gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div v-if="ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
......@@ -379,7 +379,7 @@
@upDateQlrxxList="upDateYwrxxList"
:tableData="ruleForm.ywrList"
:disabled="viewEdit"
:gyfs="ruleForm.sldy.gyfs" />
/>
</div>
<div class="slxx_title title-block">
登记原因
......
......@@ -253,7 +253,17 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="djyy">
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.ygdj.zxyy">
</el-input>
</el-form-item>
<el-form-item v-else label="登记原因:" prop="djyy">
<el-input
class="textArea"
type="textarea"
......
......@@ -268,14 +268,25 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="djyy">
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.ygdj.djyy"></el-input>
v-model="ruleForm.ygdj.zxyy">
</el-input>
</el-form-item>
<el-form-item v-else label="登记原因:" prop="djyy">
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.ygdj.djyy">
</el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 08:52:44
* @LastEditTime: 2023-09-05 11:32:50
-->
<template>
<div class="from-clues">
......@@ -58,7 +58,7 @@
import { ywPopupDialog } from "@/utils/popup.js";
import { selectLq } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
import { datas, sendThis } from "../javascript/selectQjlqxx.js";
import { datas, sendThis } from "../javascript/selectQjlqxxQt.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
export default {
mixins: [table, jump],
......@@ -75,7 +75,7 @@
columns: datas.columns(),
data: [],
},
bdcdysz: [],
bdcdysz: [],
};
},
mounted () {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-17 16:09:12
* @LastEditTime: 2023-09-05 13:10:53
-->
<template>
<div class="from-clues">
......@@ -58,7 +58,7 @@
import { ywPopupDialog } from "@/utils/popup.js";
import { selectLq } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
import { datas, sendThis } from "../javascript/selectSllmqt.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
export default {
mixins: [table, jump],
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-05 11:33:36
*/
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
vm = _this
}
class data extends filter {
constructor() {
super()
}
columns () {
return [
{
type: 'selection',
label: '全选',
selectable: this.selected
},
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
label: "状态",
width: '130',
render: (h, scope) => {
return (
<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>
</div>
)
}
},
{
prop: "qllxmc",
label: "权利类型",
},
{
prop: "bdcdyh",
label: "不动产单元号",
minWidth: '150'
},
{
prop: "bdcqzh",
label: "不动产权证号",
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.bdcqzh}</span>
</el-tooltip>
)
},
width: '150'
},
{
prop: "gyqk",
label: "共有方式",
},
{
prop: "qlrmc",
label: "使用权人",
},
{
prop: "qlrzjhm",
label: "证件号",
},
{
prop: "qlxzmc",
width: '80',
label: "权利性质",
},
{
prop: "qlmjmc",
width: '100',
label: "使用权面积",
},
{
prop: "qlytmc",
label: "土地用途",
},
{
prop: "qdjgmc",
width: '100',
label: "取得价格",
},
{
prop: "zl",
label: "坐落",
minWidth: '150'
},{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
</div>
)
}
}
]
}
}
let datas = new data()
export {
datas,
sendThis
}
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-05 13:10:31
*/
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
vm = _this
}
class data extends filter {
constructor() {
super()
}
columns () {
return [
{
type: 'selection',
label: '全选',
selectable: this.selected
},
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
label: "状态",
render: (h, scope) => {
return (
<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>
)
}
},
{
prop: "qllxmc",
label: "权利类型",
},
{
prop: "zddm",
label: "宗地代码",
},
{
prop: "bdcdyh",
label: "不动产单元号",
minWidth: '110'
},
{
prop: "showQlxz",
label: "权利性质",
},
{
prop: "zdmj",
label: "宗地面积(㎡)",
},
{
prop: "qlsdfsmc",
label: "权利设定方式",
},
{
prop: "showTdyt",
label: "土地用途",
},
{
prop: "tfh",
label: "图幅号",
},
{
prop: "djh",
label: "地籍号",
},
{
prop: "zl",
label: "坐落",
minWidth: '110'
},{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
</div>
)
}
}
]
}
}
let datas = new data()
export {
datas,
sendThis
}
......@@ -96,7 +96,7 @@ export function queueDjywmc (djywbm, djqxbm) {
// case "C40400": //一并申请注销
// vm = "selectYbbg";
// break;
case "C04372": //一并国有房屋变更
//case "C04372": //一并国有房屋变更
case "C04371": //一并国有房屋转移
vm = "selectYbgybg";
break;
......