6d7f9384 by 单帅旗

Merge remote-tracking branch 'origin/dev' into dev

2 parents be281ee6 14ba91ec
......@@ -32,8 +32,6 @@
<div>
<p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
<p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
<!-- <p class="title-detail">{{ item.zl }}</p> -->
</div>
<i
class="el-icon-delete"
......@@ -106,9 +104,10 @@ export default {
};
},
mounted() {
this.loadBdcdylist();
this.getleftMenubl();
},
computed: {
// ...mapGetters(["isRefresh"]),
......@@ -130,7 +129,6 @@ export default {
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.currentSelectProps = res.result[0];
console.log("读取申请单元信息");
this.$emit("getCurrentSelectProps", this.currentSelectProps);
if(add){
this.$parent.getQllxByBdcdyid()
......@@ -143,8 +141,6 @@ export default {
getleftMenubl(row) {
leftMenubl(this.bsmSlsq).then((res) => {
this.supplementarylist = res.result;
console.log("获取右侧菜单");
this.unitClick(0)
if(row){
this.supplementarylist.forEach((item,index) => {
if(item.bsmRepair==row.bsmRepair){
......@@ -154,6 +150,11 @@ export default {
}
})
}
if(this.supplementarylist.length){
this.unitClick(0)
}else{
this.$emit("getCurrentSelectProps", this.currentSelectProps);
}
});
},
handleNodeClick(data, node, elem) {
......@@ -162,7 +163,6 @@ export default {
},
//申请单元点击事件
unitClick(index) {
console.log("申请单元点击事件");
this.currentSelectProps = this.supplementarylist[index];
this.$emit("getCurrentSelectProps", this.currentSelectProps);
},
......@@ -185,6 +185,11 @@ export default {
});
this.$nextTick(() => {
this.getleftMenubl();
this.blxxClick()
if(!this.supplementarylist.length){
getdjblist()
}
});
});
})
......@@ -197,7 +202,10 @@ export default {
},
//补录信息点击事件默认展示第一条补录记录
blxxClick() {
if(this.supplementarylist.length){
this.unitClick(0);
}
},
},
};
......@@ -269,9 +277,21 @@ export default {
}
.blxx {
.el-menu-item{
display: flex;
justify-content: space-between;
}
border: #b0d9f8 solid 1px;
.tpcolor{
color: red;
line-height: 22px;
}
.el-icon-delete{
margin-right: 3px;
// background-color: saddlebrown;
height: 27px;
float: left;
}
}
</style>
......
......@@ -13,7 +13,7 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
label-width="127px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
......@@ -93,32 +93,24 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途:">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用起始时间:">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用结束时间:">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用期限:">
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
<!-- 下拉框 -->
<el-form-item label="土地性质:">
<el-select v-model="ruleForm.fdcq2.jedw">
<el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格:">
<el-input v-model="ruleForm.fdcq2.qjjg"></el-input>
<div style="display:flex">
<el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
<el-select v-model="ruleForm.fdcq2.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -231,10 +223,9 @@
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdxxList"
@upDateQlrxxList="upDateQlrxxList"
:tableData="ruleForm.tdytqxList"
@upDateQlrxxList="upDateTdytxxList"
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div class="slxx_title title-block">
权利人信息
......@@ -332,12 +323,11 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("房地产权");
console.log("房地产权",this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
this.isShow = true;
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
......@@ -349,6 +339,12 @@ export default {
}
});
},
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
......@@ -361,6 +357,7 @@ export default {
this.key++;
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
if (this.ruleForm.qlrList.length == 0) {
this.$message({
showClose: true,
......
......@@ -13,13 +13,17 @@
append-to-body
width="60%"
>
<el-radio-group v-model="radio">
<!-- <el-radio-group v-model="radio">
<el-radio-button
v-for="(value, key) in qllxlistdata"
:key="key"
:label="value"
></el-radio-button>
</el-radio-group>
</el-radio-group> -->
<el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
:key="key"
:label="value" @click="clicksss(key)" plain>确定{{value}}</el-button>
<div class="btn">
<el-button type="primary" @click="handleSubmit">确定</el-button>
<el-button type="primary" @click="closeDialog">取消</el-button>
......@@ -42,12 +46,13 @@ export default {
closeDialog() {
this.dialogVisible = false;
},
clicksss(el){
console.log("el",el);
this.qllx=el
},
handleSubmit() {
for (const key in this.qllxlistdata) {
if (this.qllxlistdata[key] === this.radio) {
this.qllx= key;
}
}
if(this.qllx){
let qllxobj = {
qllx:this.qllx,
......@@ -61,7 +66,7 @@ export default {
message: "请选择权利类型!",
});
}
this.qllx=""
},
},
};
......@@ -74,6 +79,29 @@ export default {
// height: 100px;
padding: 30px;
}
.gettypebutton{
cursor: pointer;
line-height: 20px;
background-color: #ebebeb;
margin-top: 10px;
padding-left: 10px;
border-radius: 2px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #ebebeb;
-webkit-transition: all 0.3s;
transition: all 0.3s;
color: #000;
}
.gettypebutton:hover{
border: 1px solid #0F93F6;
color: #0F93F6;
}
.gettypebutton:focus{
background-color: #0F93F6;
border: 1px solid #0F93F6;
color: #ebebeb;
}
.btn{
margin:30px;
text-align: center;
......
......@@ -77,6 +77,7 @@ import { getStepFormInfo } from "@/api/fqsq.js"
import NoticeBar from "@/components/NoticeBar/index";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import { leftMenubl } from "@/api/djbbl.js";
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
......@@ -131,22 +132,29 @@ export default {
};
},
mounted() {
// this.getleftMenubl()
},
methods: {
stepForm (qllx) {
this.oneSelectProps.qllx=qllx
if(this.$refs.Menu.supplementarylist.length){
getStepFormInfo(this.oneSelectProps).then((res) => {
this.tabList=res.result
this.$nextTick(function () {
this.tabList=res.result
this.tabName =this.tabList[0].value;
console.log("this.tabName",this.tabName);
this.getFromRouter(this.tabName)
});
})
}
},
// 获取右侧菜单
// getleftMenubl() {
// leftMenubl(this.bsmSlsq).then((res) => {
// this.supplementarylist = res.result;
// })
// },
getQllxByBdcdyid() {
if(this.currentSelectProps.bdcdyid){
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
......@@ -162,25 +170,19 @@ export default {
},
// 获取右侧选项卡
getCurrentSelectProps(val) {
console.log("vallllllllllllllllll",val);
if(val.bdcdyid){
this.oneSelectProps = val;
}
console.log("this.oneSelectProps",this.oneSelectProps);
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
console.log("进入补录");
this.tabset(val);
this.stepForm (this.currentSelectProps.qllx)
} else if(!this.oneget){
console.log("进入登记簿");
this.getdjblist();
}
if(this.oneget){
console.log("进入补录");
this.oneget=false
this.tabset(val);
this.stepForm (this.currentSelectProps.qllx)
}
......@@ -197,14 +199,9 @@ export default {
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,
......@@ -215,66 +212,15 @@ export default {
arr[index].value = item.id;
});
this.tabList = this.tabdata;
}, 200);
},
tabset(val) {
console.log("valsweqweqrfwqerqweq",val);
// console.log("this.currentSelectProps2222222222222",this.currentSelectProps);
this.stepForm (this.currentSelectProps.qllx)
// this.tabList = [
// {
// name: val.qllxmc + "补录信息",
// value: "slxx",
// sort: 1,
// },
// {
// name: "审批意见",
// value: "spyj",
// sort: 2,
// },
// {
// name: "材料信息",
// value: "clxx",
// sort: 2,
// },
// ];
}
});
},
// tabset(val) {
// this.tabName = "";
// this.tabList = [
// {
// name: val.qllxmc + "补录信息",
// value: "slxx",
// sort: 1,
// },
// {
// name: "审批意见",
// value: "spyj",
// sort: 2,
// },
// {
// name: "材料信息",
// value: "clxx",
// sort: 2,
// },
// ];
// this.$nextTick(function () {
// this.tabName = "slxx";
// });
// },
//右侧表单选项卡事件
beforeLeave(activeName, oldActiveName) {
console.log("右侧表单选项卡事件",activeName);
beforeLeave(activeName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabnameaaaaaaaaaaaaaaaaaaaa",tabname);
this.componentTag = getForm(tabname);
},
......@@ -314,7 +260,7 @@ export default {
}
}).catch((res) => {
console.log("错i了哦",res);
console.log("错",res);
});;
},
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:39:47
-->
<template>
<dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
@closeDialog="closeDialog" :isButton="showButton">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
<el-row>
<el-col :span="12">
<el-form-item label="土地用途" prop="tdyt">
<el-input v-model="ruleForm.tdyt"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="土地使用权限" prop="syqx">
<el-input v-model="ruleForm.syqx"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="土地使用结束时间" prop="jssj">
<el-date-picker
v-model="ruleForm.jssj"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="土地使用起止时间" prop="qzsj">
<el-date-picker
v-model="ruleForm.qzsj"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</dialogBox>
</template>z x addTdyt
<script>
import { mapGetters } from "vuex";
export default {
props: {
value: { type: Boolean, default: false },
details: { type: Object, default: {} },
showButton: { type: Boolean, default: false }
},
data () {
return {
myValue: this.value,
ruleForm: {
tdyt:"",
syqx:"",
jssj:"",
qzsj:""
},
rules: {
tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
},
};
},
watch: {
value (val) {
console.log("val",val);
this.myValue = _.cloneDeep(val);
},
details: {
handler: function (val, oldVal) {
console.log("val2",val);
this.ruleForm = val;
},
deep: true,
},
},
methods: {
closeDialog () {
this.$emit("input", false);
this.$refs["ruleForm"].resetFields();
},
submitForm () {
console.log("this.ruleForm",this.ruleForm);
this.$refs.ruleForm.validate((valid) => {
if (valid) {
this.$emit("input", false);
this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
} else {
return false;
}
});
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/dialogBoxheader.scss";
.submit-button {
text-align: center;
height: 52px;
padding-top: 10px;
background-color: #fff;
}
</style>
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:09
* @LastEditTime: 2023-06-25 11:13:07
-->
<template>
<div>
<div class="zsdy-content loadingtext">
<div class="zsdy-content" v-Loading="loading">
<el-form
:model="ruleForm"
:rules="rules"
......@@ -22,7 +22,9 @@
</el-select>
</el-form-item>
</el-form>
<img :src="previewImage" style="width: 100%">
<div class="zs-content">
<canvas ref="zs" width="1000" class="zsyl" height="700"></canvas>
</div>
</div>
<div class="text-center pt-10">
<el-button @click="$popupCacel">取消</el-button>
......@@ -34,7 +36,7 @@
<script>
import store from '@/store/index.js'
import { datas } from "../../javascript/zsyl.js";
import { readYsxlh, certificate, bdcqzPreview } from "@/api/bdcqz.js";
import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js";
export default {
props: {
formData: {
......@@ -46,10 +48,12 @@
},
data () {
return {
// 不动产证书图片地址
imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
loading: false,
bdcqz: [],
//印刷序列号集合
ysxlh: [],
//证书预览图片
previewImage: '',
//列名称对象
columns: [],
ruleForm: {
......@@ -70,7 +74,7 @@
store.dispatch('user/refreshPage', false)
this.columns = datas.columns()
this.ysxlhList()
this.getBdcqzPreview()
this.getHeadTabBdcqz()
},
methods: {
//获取印刷序列号列表
......@@ -81,22 +85,69 @@
}
})
},
handleSubmit () {
this.savePrintRecord()
},
//获取证书内容
getRowValue (code) {
var value = this.bdcqz[code];
return value;
//获取受理申请下全部不动产权证
getHeadTabBdcqz () {
this.loading = true
getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
if (res.code == 200) {
if (res.result && res.result.length > 0) {
this.bdcqz = res.result[0]
this.drawTextOnImage()
}
}
this.loading = false
})
},
getBdcqzPreview () {
this.$startLoading()
bdcqzPreview(this.formData.bdcqz).then(res => {
this.$endLoading()
let blob = new Blob([res]);
let url = window.URL.createObjectURL(blob);
this.previewImage = url;
// 不动产证书
drawTextOnImage () {
const canvas = this.$refs.zs;
const context = canvas.getContext('2d');
const image = new Image();
image.onload = () => {
context.drawImage(image, 0, 0);
context.font = '18px 楷体';
context.fillStyle = '#000000';
context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 180, 56);
context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 370, 56);
context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 138, 97);
context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 138, 138);
context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 138, 180);
context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 138, 223);
context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 138, 263);
context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 138, 303);
context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346);
context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 138, 386);
context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429);
// qlqtzk
const maxWidth = 280; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
lines.forEach((line, index) => {
const y = 469 + (index * 37); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= maxWidth) {
currentLine = testLine;
} else {
arr.push(currentLine);
currentLine = word;
}
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 138, y + (index * 20)); // 调整行高
})
})
context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 580, 100);
}
image.src = this.imgSrc
},
handleSubmit () {
this.savePrintRecord()
},
//保存打印记录
savePrintRecord () {
......@@ -108,14 +159,14 @@
this.$popupCacel()
this.$message.success("提交成功")
//刷新列表
store.dispatch('user/refreshPage', true);
store.dispatch('user/refreshPage', true)
} else {
this.$message.error(res.message)
}
});
},
},
};
})
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
......@@ -123,125 +174,7 @@
height: 80vh;
overflow-y: scroll;
}
.aaaa {
width: 1024px;
height: 739px;
font-family: KaiTi;
font-weight: 700;
}
.bdcdjzm {
width: 1123px;
height: 794px;
font-family: KaiTi;
font-weight: 700;
}
.zmyl-box {
//position: relative;
position: absolute;
height: 600px;
width: 280px;
margin-left: 775px;
font-size: 16px;
justify-content: space-between;
}
.bdcqzh {
height: 70px;
left: 0;
bottom: 0;
font-size: 18px;
}
.zsyl-box {
display: flex;
justify-content: space-between;
// padding: 20px;
font-size: 16px;
height: 100%;
$left: 131px;
.zsyl-left {
width: 460px;
position: relative;
.qlr {
position: absolute;
top: 40px;
left: $left;
}
.gyqk {
position: absolute;
top: 80px;
left: $left;
}
.zl {
position: absolute;
top: 120px;
left: $left;
}
.bdcdyh {
position: absolute;
top: 160px;
left: $left;
}
.qllx {
position: absolute;
top: 205px;
left: $left;
}
.qlxz {
position: absolute;
top: 250px;
left: $left;
}
.yt {
position: absolute;
top: 290px;
left: $left;
}
.mj {
position: absolute;
top: 330px;
left: $left;
}
.syqx {
position: absolute;
top: 370px;
left: $left;
}
.qt {
position: absolute;
top: 420px;
left: $left;
}
}
.zsyl-right {
flex: 1;
text-align: left;
position: relative;
.fj {
position: absolute;
left: 115px;
top: 5px;
}
}
.zsyl-title {
margin-bottom: 12px;
}
/deep/.el-table__row {
background: #fafbe5 !important;
}
}
.middle_padding {
padding-bottom: 10px;
}
.zsyl-button {
.zs-content {
text-align: center;
margin-top: 20px;
.operation_button {
width: 100px;
border: 1px solid rgb(0, 121, 254);
}
.dy-button {
color: white;
background-color: rgb(0, 121, 254);
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-20 16:09:31
* @LastEditTime: 2023-06-25 10:33:16
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -11,14 +11,14 @@
v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
</el-tabs>
<div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
<canvas ref="zs" width="1000" v-if="activeName==1" height="700"></canvas>
<canvas ref="zm" width="1180" v-else height="780"></canvas>
<canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas>
<canvas ref="zm" width="1180" v-show="activeName!='1'" height="780"></canvas>
</div>
</template>
<script>
import { datas } from "../../javascript/zsyl.js";
import { getSlsqBdcqzList, bdcqzPreview } from "@/api/bdcqz.js"
import { getSlsqBdcqzList } from "@/api/bdcqz.js"
export default {
name: "zsyl",
props: {
......@@ -94,7 +94,7 @@
handleClick (e) {
this.bdcqz = this.headTabBdcqz[e.index - 0]
this.activeName = this.headTabBdcqz.bdcqzlx
if (this.activeName == 1) {
if (this.activeName == '1') {
this.drawTextOnImage()
} else {
this.drawTextzmImage()
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:41:49
* @LastEditTime: 2023-06-25 11:15:01
-->
<template>
<div class="szxx">
......@@ -119,9 +119,9 @@
openZsylDialog (item, type) {
if (type == 1) {
//证书预览
this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item }, "70%", true);
this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
} else {
this.$popupDialog("不动产权证书", "workflow/components/dialog/zsdy", { bdcqz: item }, "70%", true);
this.$popupDialog("不动产权证书", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
}
},
//再次打印
......
......@@ -5,19 +5,19 @@
-->
<template>
<div>
<lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
<lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
:data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
<addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { getIdCardInfo } from '@/utils/operation.js'
import addQlr from './dialog/addQlr.vue'
import addTdyt from './dialog/addTdyt.vue'
export default {
components: {
addQlr
addTdyt
},
computed: {
...mapGetters(["dictData"]),
......@@ -29,10 +29,6 @@
return []
}
},
gyfs: {
type: String,
default: '1'
}
},
data () {
return {
......@@ -67,37 +63,60 @@
label: '土地用途',
align: 'center',
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return (
<el-select value={scope.row.yt}
onChange={(val) => { scope.row.yt = val }} clearable>
{
this.dictData['tdyt'].map(option => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
</el-select>
)
}
},
{
prop: "sqrmc",
label: "土地使用起始时间",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return (
<el-date-picker
v-model={scope.row.qssj}
type="date"
placeholder="选择日期"
></el-date-picker>
);
}
},
{
prop: "zjzl",
label: "土地使用结束时间",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return (
<el-date-picker
v-model={scope.row.jssj}
type="date"
placeholder="选择日期"
></el-date-picker>
);
}
},
{
prop: "zjh",
label: "土地使用期限",
render: (h, scope) => {
return <el-input v-model={scope.row.zjzl} ></el-input>
return <el-input v-model={scope.row.syqx} ></el-input>
}
}
],
column: []
}
},
watch: {
tableData: {
handler: function (val, oldVal) {
console.log("什么事件111",val);
let that = this
this.$nextTick(() => {
if (val.length == 0 || !val) {
......@@ -115,29 +134,28 @@
immediate: true,
deep: true
},
gyfs: {
handler (newVal, oldValue) {
let dataList = _.cloneDeep(this.InformationTable)
if (newVal == 0) {
// this.column = _.cloneDeep(dataList).slice(1, dataList.length)
this.column = _.cloneDeep(dataList)
// gyfs: {
// handler (newVal, oldValue) {
// console.log("什么事件222",newVal);
// let dataList = _.cloneDeep(this.InformationTable)
// let dataList = _.cloneDeep(this.InformationTable)
// if (newVal == 0) {
// // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
// this.column = _.cloneDeep(dataList)
} else if ((newVal == '1' || newVal == '3')) {
this.column = dataList
} else {
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
label: "份数"
})
}
},
immediate: true
}
// } else if ((newVal == '1' || newVal == '3')) {
// this.column = dataList
// } else {
// this.column = _.cloneDeep(dataList)
// }
// },
// immediate: true
// }
},
methods: {
// 新增提交事件
handleupdateDetail (value) {
console.log("什么事件33",this.tableData);
if (this.isaddupdate) {
if (!_.isEqual(value, this.tableData)) {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
......@@ -154,7 +172,7 @@
// 新增
addClick () {
if (this.gyfs == '0' && this.tableDataList.length > 0) {
this.$message.warning("当前共有方式为单独所有,无法添加多个权利人")
this.$message.warning("1")
} else {
this.dialog = true
this.isaddupdate = true
......@@ -172,36 +190,12 @@
}).catch(() => {
});
},
// 身份证读取
readClick (row) {
getIdCardInfo().then(res => {
if (res.data.code == 0) {
let data = res.data.IDCardInfo
row.sqrmc = data.name
row.zjzl = '1'
row.zjh = data.cardID
row.xb = data.sexCode
row.txdz = data.address
row.fzjg = data.issueOrgan
this.$message({
message: '读取成功!',
type: 'success'
})
} else {
this.$message({
message: res.data.message,
type: 'warning'
})
}
})
},
// 修改
editClick (index, row) {
// popupDialog("申请人信息", "workflow/components/addQlr", {
// showButton: this.$route.query.viewtype ? false : true,
// dataIndex :index,
// details :row,
// details :row,/[^\d]/g
// isaddupdate :false
// });
this.dataIndex = index
......