b4865ddb by tianhaohao@pashanhoo.com

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

2 parents b817299f 66f57e60
<svg t="1661331325273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2167" width="200" height="200"><path d="M521.309091 158.254545a27.927273 27.927273 0 0 1 27.927273 27.927273v586.472727a27.927273 27.927273 0 0 1-27.927273 27.927273h-372.363636a83.781818 83.781818 0 0 1-83.781819-83.781818V242.036364a83.781818 83.781818 0 0 1 83.781819-83.781819z m400.290909 0a83.781818 83.781818 0 0 1 83.502545 76.893091l0.279273 6.888728v474.763636a83.781818 83.781818 0 0 1-76.893091 83.502545l-6.888727 0.279273h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 744.727273h260.654545a27.927273 27.927273 0 0 0 27.554909-23.412364l0.372364-4.514909V242.036364a27.927273 27.927273 0 0 0-23.412364-27.554909L921.6 214.109091h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 158.254545h260.654545z m-428.218182 55.854546H148.945455a27.927273 27.927273 0 0 0-27.55491 23.412364L121.018182 242.036364v474.763636a27.927273 27.927273 0 0 0 27.927273 27.927273h344.436363V214.109091z" p-id="2168"></path></svg>
\ No newline at end of file
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-09 09:20:10
-->
<template>
<el-dialog
:close-on-click-modal="false"
title="选择权利类型"
class="qllxdialog"
:visible.sync="dialogVisible"
custom-class="insetDialog"
append-to-body
width="20%"
>
<el-select v-model="qllxvalue" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<!-- <el-radio-group v-model="radio">
<el-radio :label="1">111</el-radio>
<el-radio :label="2">111</el-radio>
</el-radio-group> -->
<el-button type="primary" @click="handleSubmit">确定</el-button>
<el-button type="primary" @click="closeDialog">取消</el-button>
</el-dialog>
</template>
<script>
export default {
data () {
return {
dialogVisible:false,
options: [
{
value: "选项1",
label: "抵押权",
},
{
value: "选项2",
label: "地役权",
},
{
value: "选项3",
label: "预告登记",
},
{
value: "选项4",
label: "异议登记",
},
{
value: "选项5",
label: "查封登记",
},
],
qllxvalue: "",
radio:3,
qllxobj:{
qllx:"",
bsmQlxx
}
};
},
methods: {
closeDialog () {
this.dialogVisible=false
},
handleSubmit () {
let qllxobj={
qllx:this.value,
bsmQlxx:this.value
}
// this.$parent.addRepairRecord(qllxobj)
},
},
};
</script>
<style scoped lang="scss">
.qllxdialog{
margin-top: 200px;
/deep/.el-dialog__body{
margin-top: 10px;
height: 100px;
}
.el-button{
margin-top: 10px;
margin-left: 20px;
}
}
</style>
......@@ -26,7 +26,7 @@
</tr>
<tr>
<td style="width:15%">宗地面积</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:15%">用途</td>
<td style="width:30%">{{ zdjbxx.ghytmc }}</td>
</tr>
......@@ -193,11 +193,11 @@
},
methods: {
loadData () {
console.log("this.$attrs",this.$attrs);
console.log("this.propsParam",this.propsParam);
if(this.propsParam.bsmSldy){
console.log("this.$attrs", this.$attrs);
console.log("this.propsParam", this.propsParam);
if (this.propsParam.bsmSldy) {
console.log("宗地基本信息");
}else{
} else {
console.log("登记簿里宗地基本信息");
getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code === 200) {
......
......@@ -56,46 +56,79 @@ export function getForm (tabName, djywbm) {
// case "zdt":
// form = require("@/views/djbworkflow/components/zdt.vue");
// break;
// 宗地基本信息
case "zdjbxx":
form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
form = require("@/views/registerBook/zdjbxx.vue");
break;
// 查封登记
case "cfdj":
form = require("@/views/djbworkflow/djbBook/cfdj.vue");
form = require("@/views/registerBook/cfdj.vue");
break;
// 国有建设用地使用权
case "jsydsyq":
form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
form = require("@/views/registerBook/jsydsyq.vue");
break;
// 农用地使用权
case "nydsyq":
form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
form = require("@/views/registerBook/nydsyq.vue");
break;
// 房屋产权2
case "fdcq2":
form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
form = require("@/views/registerBook/fdcq2.vue");
break;
// 抵押权
case "diyaq":
form = require("@/views/djbworkflow/djbBook/diyaq.vue");
form = require("@/views/registerBook/diyaq.vue");
break;
// 预告登记
case "ygdj":
form = require("@/views/djbworkflow/djbBook/ygdj.vue");
form = require("@/views/registerBook/ygdj.vue");
break;
// 地役权
case "diyiq":
form = require("@/views/djbworkflow/djbBook/diyiq.vue");
form = require("@/views/registerBook/diyiq.vue");
break;
// 登记簿封面
case "djbfm":
form = require("@/views/djbworkflow/djbBook/djbfm.vue");
form = require("@/views/registerBook/djbfm.vue");
break;
// 异议登记
case "yydj":
form = require("@/views/djbworkflow/djbBook/yydj.vue");
form = require("@/views/registerBook/yydj.vue");
break;
// // 宗地基本信息
// case "zdjbxx":
// form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
// break;
// // 查封登记
// case "cfdj":
// form = require("@/views/djbworkflow/djbBook/cfdj.vue");
// break;
// // 国有建设用地使用权
// case "jsydsyq":
// form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
// break;
// // 农用地使用权
// case "nydsyq":
// form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
// break;
// // 房屋产权2
// case "fdcq2":
// form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
// break;
// // 抵押权
// case "diyaq":
// form = require("@/views/djbworkflow/djbBook/diyaq.vue");
// break;
// // 预告登记
// case "ygdj":
// form = require("@/views/djbworkflow/djbBook/ygdj.vue");
// break;
// // 地役权
// case "diyiq":
// form = require("@/views/djbworkflow/djbBook/diyiq.vue");
// break;
// // 登记簿封面
// case "djbfm":
// form = require("@/views/djbworkflow/djbBook/djbfm.vue");
// break;
// // 异议登记
// case "yydj":
// form = require("@/views/djbworkflow/djbBook/yydj.vue");
// break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
......
......@@ -80,7 +80,7 @@ export default {
break;
case "B2": //材料分屏按钮
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/settScreen", this.splitScreen);
this.$store.dispatch("app/set1tScreen", this.splitScreen);
if (this.splitScreen) {
//如果当前选项卡为材料信息内容,递减到上一个选项卡内容
if (this.tabName == this.clxxTab.value) {
......@@ -100,59 +100,44 @@ export default {
case "B4":
this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
break;
case "B5":
const h = this.$createElement;
this.$msgbox({
title: '消息',
message: h('p', null, [
h('span', null, '内容可以是 '),
h('i', { style: 'color: teal' }, 'VNode')
]),
showCancelButton: true,
confirmButtonText: '确定',
cancelButtonText: '取消',
beforeClose: (action, instance, done) => {
if (action === 'confirm') {
instance.confirmButtonLoading = true;
instance.confirmButtonText = '执行中...';
setTimeout(() => {
done();
setTimeout(() => {
instance.confirmButtonLoading = false;
}, 300);
}, 3000);
} else {
done();
}
}
}).then(action => {
this.addRepairRecord()
this.$message({
type: 'info',
message: 'action: ' + action
});
});
// this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
// bsmSlsq: this.bsmSlsq,
// entryType: '1'
// }, '65%', true)
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// case "B5":
// const h = this.$createElement;
// this.$msgbox({
// title: '请选择新增权利类型',
// message: h('p', null, [
// h('span', null, '内容可以是 '),
// h('el-button', { style: 'color: teal' }, 'VNode'),
// h('i', { style: 'color: teal' }, 'VNode')
// ]),
// showCancelButton: true,
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// beforeClose: (action, instance, done) => {
// if (action === 'confirm') {
// instance.confirmButtonLoading = true;
// instance.confirmButtonText = '执行中...';
// setTimeout(() => {
// done();
// setTimeout(() => {
// instance.confirmButtonLoading = false;
// }, 300);
// }, 3000);
// } else {
// done();
// }
// }
// }).then(action => {
// this.addRepairRecord()
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// message: 'action: ' + action
// });
// });
// break;
case "B5":
// this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
this.$refs.qllxlist.dialogVisible=true
break;
case "B6":
//根据编号获取对应信息
......
......@@ -62,6 +62,8 @@
</div>
</div>
</div>
<!-- 新增补录信息勾选权利类型 -->
<qllxDailog ref="qllxlist"/>
</div>
</template>
<style scoped lang="scss">
......@@ -70,18 +72,18 @@
</style>
<script>
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform"
import { getForm } from "./flowform";
import NoticeBar from "@/components/NoticeBar/index";
import { unClaimTask } from "@/api/ywbl.js";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbbl.js"
import { addRepairRecord } from "@/api/djbbl.js";
// 获取权利类型数组
import { getQllxByBdcdyid } from "@/api/djbbl.js"
import { getQllxByBdcdyid } from "@/api/djbbl.js";
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
......@@ -90,6 +92,7 @@ export default {
NoticeBar,
ProcessViewer,
ordinaryMenu,
qllxDailog,
},
mixins: [WorkFlow],
data() {
......@@ -104,8 +107,10 @@ export default {
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
// 弹框显示
dialogVisible: true,
// 权利类型数组
qllxlist:[],
qllxlist: [],
//表单集合
tabList: [],
//选择加载哪一个组件
......@@ -118,37 +123,35 @@ export default {
clxxTab: {},
//页面监听时间
_beforeUnload_time: "",
treedata:{},
tabdata:[],
defaultNode:{}
};
},
mounted() {
treedata: {},
tabdata: [],
defaultNode: {},
};
},
mounted() {},
methods: {
getQllxByBdcdyid(){
console.log("this.currentSelectProps.bdcdyid",this.currentSelectProps.bdcdyid);
getQllxByBdcdyid({bdcdyid:this.currentSelectProps.bdcdyid}).then((res) => {
getQllxByBdcdyid() {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
console.log("Qllxlist",res);
console.log("Qllxlist", res);
}
});
}
);
},
// 获取右侧选项卡
getCurrentSelectProps (val) {
this.currentSelectProps = val
if(this.currentSelectProps.bsmRepair){
this.tabset(val)
}else{
this.getdjblist()
getCurrentSelectProps(val) {
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
this.tabset(val);
} else {
this.getdjblist();
}
},
// 获取渲染登记簿列表
getdjblist(){
getdjblist() {
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
......@@ -156,32 +159,36 @@ export default {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
console.log("this.currentSelectProps.qllx",this.currentSelectProps);
this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
console.log("this.defaultNode",this.defaultNode);
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
this.defaultNode = getNode(
this.currentSelectProps.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
""
);
this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
});
}
});
setTimeout(() => {
let settree=JSON.parse(JSON.stringify(this.treedata))
this.tabdata=[...settree,...settree[1].children[0].children[0].children]
this.tabdata.forEach((item,index,arr) => {
arr[index].name=item.label;
arr[index].value=item.id
})
this.tabList=this.tabdata
this.getQllxByBdcdyid()
}, 200)
let settree = JSON.parse(JSON.stringify(this.treedata));
this.tabdata = [
...settree,
...settree[1].children[0].children[0].children,
];
this.tabdata.forEach((item, index, arr) => {
arr[index].name = item.label;
arr[index].value = item.id;
});
this.tabList = this.tabdata;
this.getQllxByBdcdyid();
}, 200);
},
tabset(val){
this.tabName = '';
tabset(val) {
this.tabName = "";
this.tabList = [
{
name:val.qllxmc+ "补录信息",
name: val.qllxmc + "补录信息",
value: "slxx",
sort: 1,
},
......@@ -198,20 +205,19 @@ export default {
];
this.$nextTick(function () {
this.tabName = 'slxx';
this.tabName = "slxx";
});
},
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
beforeLeave(activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter (tabname) {
getFromRouter(tabname) {
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
this.currentSelectTab = item;
break;
}
}
......@@ -219,19 +225,18 @@ export default {
},
// 增加补录记录
addRepairRecord(row){
console.log("this.currentSelectProps",this.currentSelectProps);
let from={
bsmQlxx:"",
bsmSlsq:this.bsmSlsq,
bsmSldy:this.currentSelectProps.bsmSldy,
operate:"C",
qllx:this.currentSelectProps.qllx
}
if(row){
from.bsmQlxx=row.bsmQlxx
from.operate="U"
from.qllx=row.qllx
addRepairRecord(row) {
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
bsmSldy: this.currentSelectProps.bsmSldy,
operate: "C",
qllx: this.currentSelectProps.qllx,
};
if (row) {
from.bsmQlxx = row.bsmQlxx;
from.operate = "U";
from.qllx = row.qllx;
}
addRepairRecord(from).then((res) => {
......@@ -240,6 +245,9 @@ export default {
});
});
},
},
};
</script>
<style scoped lang="scss">
</style>
......
......@@ -26,6 +26,10 @@
item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
]"
>
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<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>
......@@ -63,6 +67,11 @@ export default {
},
methods: {
loadData() {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getCfdjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -61,6 +65,11 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getDiyaqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -61,6 +65,11 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getDiyiqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -66,6 +70,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getJsydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -61,6 +65,11 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getFdcq2List({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......@@ -95,6 +104,62 @@ export default {
}
return name;
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
// data: row,
// })
},
// 删除
deleteDialog(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
// deleteClmx(bsmClmx).then(res => {
// if (res.code == 200) {
// that.$emit('updateList', res.result)
// that.$message({
// message: '删除成功!',
// type: 'success'
// })
// }
// })
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
}
},
};
</script>
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -66,6 +70,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getJsydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -95,6 +99,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getNydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -61,6 +65,12 @@ export default {
},
methods: {
loadData () {
// 判断是否在登记簿补录调的子页面
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getYgdjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -61,6 +61,11 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getYydjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......@@ -95,6 +100,62 @@ export default {
}
return name;
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
// data: row,
// })
},
// 删除
deleteDialog(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
// deleteClmx(bsmClmx).then(res => {
// if (res.code == 200) {
// that.$emit('updateList', res.result)
// that.$message({
// message: '删除成功!',
// type: 'success'
// })
// }
// })
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
}
},
};
</script>
......
......@@ -26,7 +26,7 @@
</tr>
<tr>
<td style="width:15%">宗地面积</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:15%">用途</td>
<td style="width:30%">{{ zdjbxx.ghytmc }}</td>
</tr>
......
......@@ -42,7 +42,7 @@
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:38
* @LastEditTime: 2023-06-19 13:15:13
-->
<template>
<div class="clxx">
......@@ -24,18 +24,17 @@
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
<clxxAddDialog v-model="isDialog" />
<!-- <clxxDetailDialog v-model="detailDialog" :data="tableData" /> -->
</div>
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-07 13:32:24
* @LastEditTime: 2023-06-19 13:16:53
*/
//流程环节操作按钮
export function getForm (tabName, djywbm) {
......@@ -42,7 +42,7 @@ export function getForm (tabName, djywbm) {
form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
break;
case "clxx":
form = require("@/views/workflow/components/clxxUnify.vue");
form = require("@/views/workflow/components/clxx/clxxUnify.vue");
break;
case "spyj":
form = require("@/views/workflow/components/spyj.vue");
......
......@@ -6,8 +6,7 @@
:model="queryForm"
ref="queryForm"
@submit.native.prevent
label-width="80px"
>
label-width="80px">
<el-row>
<el-col :span="5">
<el-form-item label="业务来源" label-width="70px">
......@@ -18,14 +17,12 @@
class="width100"
filterable
clearable
placeholder="请选择业务来源"
>
placeholder="请选择业务来源">
<el-option
v-for="item in dictData['ywly']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -39,14 +36,12 @@
class="width100"
filterable
clearable
placeholder="请选择权利类型"
>
placeholder="请选择权利类型">
<el-option
v-for="item in dictData['A8']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -60,14 +55,12 @@
class="width100"
filterable
clearable
placeholder="请选择登记类型"
>
placeholder="请选择登记类型">
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -78,17 +71,14 @@
placeholder="请输入业务号"
v-model="queryForm.ywh"
clearable
class="width200px"
>
class="width200px">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch"
>查询</el-button
>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -100,16 +90,14 @@
{{ item.name }}:{{ item.value }}
<i
class="el-icon-circle-close"
@click="handelItem(item, index)"
></i>
@click="handelItem(item, index)"></i>
</li>
</ul>
<el-button
class="clean-btn"
type="text"
v-if="searchList.length > 0"
@click.native="hanldeCleanAll"
>清除全部
@click.native="hanldeCleanAll">清除全部
</el-button>
</el-row>
</el-form>
......@@ -126,25 +114,24 @@
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
:data="tableData.data">
</lb-table>
</div>
<searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
</div>
</template>
<script>
import { mapGetters } from "vuex";
import searchMin from "../components/mixin/index";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./ybxdata";
import { searchTaskDone } from "@/api/ywbl";
import searchBox from "../components/search.vue";
export default {
import { mapGetters } from "vuex";
import searchMin from "../components/mixin/index";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./ybxdata";
import { searchTaskDone } from "@/api/ywbl";
import searchBox from "../components/search.vue";
export default {
name: "ybx",
components: { searchBox },
mixins: [table, searchMin],
mounted() {
mounted () {
window["getBpageList"] = () => {
this.queryClick();
};
......@@ -153,7 +140,7 @@ export default {
computed: {
...mapGetters(["dictData"]),
},
data() {
data () {
return {
queryForm: {
ywly: "",
......@@ -176,7 +163,7 @@ export default {
},
methods: {
// 列表渲染接口
queryClick() {
queryClick () {
this.$startLoading();
this.searchForm.ywh = this.queryForm.ywh;
this.iterationData();
......@@ -199,12 +186,12 @@ export default {
}
});
},
handleSort(val) {
handleSort (val) {
this.queryForm.sortField = val.prop;
this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
this.queryClick();
},
ywhClick(item) {
ywhClick (item) {
const { href } = this.$router.resolve(
"/workFrameView?bsmSlsq=" +
item.bsmSlsq +
......@@ -216,8 +203,8 @@ export default {
window.open(href, `urlname${item.bsmSlsq}`);
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -113,22 +113,22 @@ export default {
bsm: ''
}, '85%')
},
ywhClick (item) {
const { href } = this.$router.resolve(
"/djbworkFrame?bdcdyid=" +
item.bdcdyid+
"&bdcdyh=" +
item.bdcdyh+
"&qllx="+
item.qllx+
"&bsmQlxx="+
item.bsmQlxx+
"&viewtype=1"
);
localStorage.setItem('ywbl', JSON.stringify(item));
window.open(href, `urlname${item.bdcdyid}`);
// ywhClick (item) {
// const { href } = this.$router.resolve(
// "/djbworkFrame?bdcdyid=" +
// item.bdcdyid+
// "&bdcdyh=" +
// item.bdcdyh+
// "&qllx="+
// item.qllx+
// "&bsmQlxx="+
// item.bsmQlxx+
// "&viewtype=1"
// );
// localStorage.setItem('ywbl', JSON.stringify(item));
// window.open(href, `urlname${item.bdcdyid}`);
},
// },
}
}
</script>
......
......@@ -67,9 +67,9 @@ class data extends filter {
prop: "ywh",
label: "业务号",
width: '110',
render: (h, scope) => {
return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
}
// render: (h, scope) => {
// return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
// }
},
{
prop: "qllxmc",
......
......@@ -102,11 +102,6 @@
djlx: "",
ywh: "",
},
// pageData: {
// currentPage: 1,
// pageSize: 10,
// total: 0,
// },
tableData: {
total: 0,
columns: datas.columns(),
......@@ -122,24 +117,6 @@
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result
// let str = ''
// records.forEach(item => {
// if (item.userNameList.length != 0) {
// str = String(item.userNameList)
// item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')'
// }
// if (item.qlrmc.length != 0) {
// item.qlrmcStr = String(item.qlrmc)
// }
// if (item.ywrmc.length != 0) {
// item.ywrmcStr = String(item.ywrmc)
// }
// if (item.zlList.length != 0) {
// item.zlStr = String(item.zlList)
// }
// })
// this.pageData.total = total;
// this.tableData.data = records
this.tableData.total = total ? total : 0;
this.tableData.data = records ? records : [];
}
......@@ -148,10 +125,10 @@
handleSort (name, sort) {
console.log(name, sort);
},
moreQueryClick () { },
openDialog (item) {
const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
// window.open(href, '_blank');
window.open(href, `urlname${item.bsmSlsq}`);
window.open(href, `urlname${item.bsmSlsq}`)
}
}
}
......
......@@ -48,10 +48,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./lpcxdata";
import { getLpZrz } from "@/api/lpb.js";
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./lpcxdata";
import { getLpZrz } from "@/api/lpb.js";
export default {
name: "lpcx",
components: {},
mixins: [table],
......@@ -66,16 +66,12 @@ export default {
zddm: "",
zrzh: "",
},
pageData: {
currentPage: 1,
pageSize: 10,
total: 0,
},
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
};
}
}
},
methods: {
// 初始化数据
......@@ -84,7 +80,7 @@ export default {
getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
this.pageData.total = res.result.total;
this.tableData.total = total ? total : 0;
this.tableData.data = res.result.records;
}
});
......@@ -92,9 +88,9 @@ export default {
handleSort (name, sort) {
console.log(name, sort);
},
moreQueryClick () { },
//打开楼盘表
openlpbClick (scope) {
// var zrzbsm = scope.row.bsm;
this.$popup('楼盘表', 'lpb/index', {
width: '90%',
height: "92%",
......@@ -102,10 +98,10 @@ export default {
bsm: scope.row.bsm
}
})
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -40,22 +40,19 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
<lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
</div>
<!-- <el-dialog :visible.sync="dialogVisible" width="52%" :before-close="handleClose">
</el-dialog> -->
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zslqcx";
import { getBdcqzReceiveList } from "@/api/zhcx"
import { bdcqzPreview } from "@/api/bdcqz"
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zslqcx";
import { getBdcqzReceiveList } from "@/api/zhcx"
import { bdcqzPreview } from "@/api/bdcqz"
export default {
components: {},
mixins: [table],
mounted () {
......@@ -103,8 +100,8 @@ export default {
this.dialogVisible = false;
}
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-19 13:32:04
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -33,7 +38,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
<lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
......@@ -41,10 +46,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zxgcdycx";
import { getZjgcdyList } from "@/api/zhcx"
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zxgcdycx";
import { getZjgcdyList } from "@/api/zhcx"
export default {
components: {},
mixins: [table],
mounted () {
......@@ -72,15 +77,15 @@ export default {
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result
this.tableData.total = total;
this.tableData.total = total ? total : 0
this.tableData.data = records ? records : []
}
})
},
},
};
moreQueryClick () { }
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......