719317b8 by xiaomiao

--no commit message

1 parent 14ba91ec
......@@ -224,8 +224,7 @@
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateQlrxxList="upDateTdytxxList"
:viewtype="$route.query.viewtype"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
......@@ -263,7 +262,7 @@
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:viewtype="$route.query.viewtype"
......@@ -341,14 +340,14 @@ export default {
},
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
console.log("VALlllll",val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrData;
this.key++;
},
// 更新义务人信息
......@@ -358,7 +357,7 @@ export default {
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
if (this.ruleForm.qlrList.length == 0) {
if (this.ruleForm.qlrData.length == 0) {
this.$message({
showClose: true,
message: "请确认权利人信息",
......@@ -368,7 +367,7 @@ export default {
}
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrList.length > 1) {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
message: "共有方式:单独所有,权利人只能是一个人",
......@@ -376,17 +375,17 @@ export default {
});
return false;
}
this.ruleForm.qlrList[0].sfczr = "1";
this.ruleForm.qlrData[0].sfczr = "1";
}
if (this.ruleForm.qlxx.gyfs == "1") {
//是否分别持证
if (this.ruleForm.qlxx.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrData.forEach((item, index) => {
item.sfczr = "1";
});
} else {
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrData.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
item.sfczr = "1";
} else {
......
<!--
* @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>
......@@ -5,20 +5,20 @@
-->
<template>
<div>
<lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
:data="tableDataList">
<lb-table
:column="InformationTable"
:pagination="false"
:key="key"
:heightNumSetting="true"
:minHeight="150"
:data="tableDataList"
>
</lb-table>
<addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { getIdCardInfo } from '@/utils/operation.js'
import addTdyt from './dialog/addTdyt.vue'
export default {
components: {
addTdyt
},
import { mapGetters } from "vuex";
export default {
computed: {
...mapGetters(["dictData"]),
},
......@@ -26,59 +26,85 @@
tableData: {
type: Array,
default: function () {
return []
}
return [];
},
},
data () {
},
data() {
return {
key: 0,
dataIndex: 0,
dialog: false,
isaddupdate: false,
showButton: this.$route.query.viewtype ? false : true,
details: {},
newdata: {
yt: "",
qssj: "",
jssj: "",
syqx: "",
},
tableDataList: [],
InformationTable: [
{
width: '50',
width: "50",
renderHeader: (h, scope) => {
return <div> {
this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
}
return (
<div>
{" "}
{this.$route.query.viewtype == 1 ? (
"序号"
) : (
<i
class="el-icon-plus pointer"
onClick={() => {
this.addClick();
}}
></i>
)}
</div>
);
},
render: (h, scope) => {
return (
<div>
{
this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
<i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
}
{this.$route.query.viewtype == 1 ? (
<span>{scope.$index + 1}</span>
) : (
<i
class="el-icon-minus pointer"
onClick={() => {
this.deleClick(scope.$index, scope.row);
}}
></i>
)}
</div>
)
}
);
},
},
{
label: '土地用途',
align: 'center',
label: "土地用途",
align: "center",
render: (h, scope) => {
return (
<el-select value={scope.row.yt}
onChange={(val) => { scope.row.yt = val }} clearable>
{
this.dictData['tdyt'].map(option => {
<el-select
value={scope.row.yt}
onChange={(val) => {
scope.row.yt = val;
}}
clearable
onblur={() => {
this.addrow(scope);
}}
>
{this.dictData["tdyt"].map((option) => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
)
}
);
},
},
{
prop: "sqrmc",
label: "土地使用起始时间",
render: (h, scope) => {
return (
......@@ -86,12 +112,15 @@
v-model={scope.row.qssj}
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
onblur={() => {
this.addrow(scope.row);
}}
></el-date-picker>
);
}
},
},
{
prop: "zjzl",
label: "土地使用结束时间",
render: (h, scope) => {
return (
......@@ -99,120 +128,80 @@
v-model={scope.row.jssj}
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
onblur={() => {
this.addrow(scope.row);
}}
></el-date-picker>
);
}
},
},
{
prop: "zjh",
label: "土地使用期限",
render: (h, scope) => {
return <el-input v-model={scope.row.syqx} ></el-input>
}
}
return (
<el-input
v-model={scope.row.syqx}
onblur={() => {
this.addrow(scope.row);
}}
></el-input>
);
},
},
],
}
};
},
watch: {
tableData: {
handler: function (val, oldVal) {
console.log("什么事件111",val);
let that = this
console.log("什么事件111", val);
let that = this;
this.$nextTick(() => {
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
}])
that.tableDataList = _.cloneDeep([
{
yt: "",
qssj: "",
jssj: "",
syqx: "",
},
]);
} else {
that.tableDataList = _.cloneDeep(val)
that.tableDataList = _.cloneDeep(val);
}
})
});
},
immediate: true,
deep: true
},
// 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)
// }
// },
// immediate: true
// }
deep: true,
},
},
methods: {
// 新增提交事件
handleupdateDetail (value) {
console.log("什么事件33",this.tableData);
if (this.isaddupdate) {
if (!_.isEqual(value, this.tableData)) {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
this.$emit('upDateQlrxxList', this.tableDataList)
}
} else {
if (!_.isEqual(value, this.tableData)) {
this.tableDataList[this.dataIndex] = _.cloneDeep(value);
this.$emit('upDateQlrxxList', this.tableDataList)
}
}
this.key++
// 修改事件
addrow() {
this.$emit("upDateTdytxxList", this.tableDataList);
},
// 新增
addClick () {
if (this.gyfs == '0' && this.tableDataList.length > 0) {
this.$message.warning("1")
} else {
this.dialog = true
this.isaddupdate = true
}
addClick() {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
this.$emit("upDateTdytxxList", this.tableDataList);
},
// 删除
deleClick (index, row) {
this.$confirm('确定要删除吗, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.tableData.splice(index, 1)
}).catch(() => {
});
deleClick(index, row) {
console.log("删除");
this.$confirm("确定要删除吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.tableData.splice(index, 1);
})
.catch(() => {});
},
// 修改
editClick (index, row) {
// popupDialog("申请人信息", "workflow/components/addQlr", {
// showButton: this.$route.query.viewtype ? false : true,
// dataIndex :index,
// details :row,/[^\d]/g
// isaddupdate :false
// });
this.dataIndex = index
this.dialog = true
this.details = row
this.isaddupdate = false
},
queryViewClick (index, row) {
// popupDialog("申请人信息", "workflow/components/addQlr", {
// showButton: this.$route.query.viewtype ? false : true,
// details: row,
// });
this.dialog = true
this.details = row
}
}
}
},
};
</script>
<style scoped lang="scss">
.el-input {
......