diff --git a/public/租赁模版.xlsx b/public/租赁模版.xlsx new file mode 100644 index 0000000..2073c1f Binary files /dev/null and b/public/租赁模版.xlsx differ diff --git a/src/views/lease/component/addLet.vue b/src/views/lease/component/addLet.vue index f704d22..0401f15 100644 --- a/src/views/lease/component/addLet.vue +++ b/src/views/lease/component/addLet.vue @@ -236,112 +236,6 @@ export default { "label": "证载“权利人”", "width": 0, "align": "left" - }, - { - "prop": "gongyouqingkuang", - "label": "共有情况", - "width": 0, - "align": "center" - }, - { - "prop": "shiyongnianxian", - "label": "使用年限(年)", - "width": 0, - "align": "center" - }, - { - "prop": "xianzhuang", - "label": "现状", - "width": 0, - "align": "center" - }, - { - "prop": "yongtu", - "label": "用途", - "width": 0, - "align": "left" - }, - { - "prop": "shiyongquanleixing", - "label": "使用权类型", - "width": 0, - "align": "center" - }, - { - "prop": "lingzhengriqi", - "label": "领证日期", - "width": 0, - "align": "center" - }, - { - "prop": "zhongzhiriqi", - "label": "终止日期", - "width": 0, - "align": "center" - }, - { - "prop": "dengjimianji", - "label": "登记面积(m²)", - "width": 0, - "align": "center" - }, - { - "prop": "shijimianji", - "label": "实际面积(m²)", - "width": 0, - "align": "center" - }, - { - "label": "不符情况", - "width": 0 - }, - { - "prop": "bufuyuanyin", - "label": "不符原因", - "width": 0, - "align": "center" - }, - { - "prop": "ruzhangshijian", - "label": "入账时间", - "width": 0, - "align": "center" - }, - { - "prop": "zhangmianyuanzhi", - "label": "账面原值", - "width": 0, - "align": "center" - }, - { - "prop": "tudidengji", - "label": "土地等级", - "width": 0, - "align": "center" - }, - { - "prop": "tudishuidanjia", - "label": "土地税单价", - "width": 0, - "align": "center" - }, - { - "prop": "tudishui", - "label": "土地税", - "width": 0, - "align": "center" - }, - { - "prop": "tudishuijiaonazhuti", - "label": "土地税缴纳主体", - "width": 0, - "align": "center" - }, - { - "prop": "jiaoshuijine", - "label": "缴税金额", - "width": 0, - "align": "center" } ] } @@ -464,66 +358,6 @@ export default { "label": "证载“权利人”", "width": 0, "align": "center" - }, - { - "prop": "yongtu", - "label": "用途", - "width": 0, - "align": "left" - }, - { - "prop": "zhuangtai", - "label": "现状", - "width": 0, - "align": "left" - }, - { - "prop": "dengjishijian", - "label": "登记时间", - "width": 0, - "align": "center" - }, - { - "prop": "dengjimianji", - "label": "登记面积(m²)", - "width": 0, - "align": "center" - }, - { - "prop": "shijimianji", - "label": "实际面积(m²)", - "width": 0, - "align": "center" - }, - { - "prop": "bufuyuanyin", - "label": "不符情况", - "width": 0, - "align": "center" - }, - { - "prop": "ruzhangshijian", - "label": "入账时间", - "width": 0, - "align": "center" - }, - { - "prop": "zhangmianyuanzhi", - "label": "账面原值", - "width": 0, - "align": "center" - }, - { - "prop": "guanliantudizhengquanzheng", - "label": "关联土地证权证", - "width": 0, - "align": "center" - }, - { - "prop": "shiyongzhuangtai", - "label": "使用状态", - "width": 0, - "align": "center" } ] } @@ -584,12 +418,12 @@ export default { landDialog: false, leasePlans: [], landSelect: { - is_auth: 1, + is_auth_more: 1, table_name: "lands", keyword: "" }, houseSelect: { - is_auth: 1, + is_auth_more: 1, table_name: "houses", keyword: "" }, diff --git a/src/views/lease/component/imports.vue b/src/views/lease/component/imports.vue new file mode 100644 index 0000000..34ec387 --- /dev/null +++ b/src/views/lease/component/imports.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/lease/component/payList.vue b/src/views/lease/component/payList.vue index 279b72c..7256244 100644 --- a/src/views/lease/component/payList.vue +++ b/src/views/lease/component/payList.vue @@ -2,6 +2,7 @@
+ { return ( - {row.land_id + {(row.land_id || row.house_id) ? (row.land_id ? this.detail?.land?.find((i) => i.id === row.land_id)?.name : this.detail?.houses?.find((i) => i.id === row.house_id) - ?.name} + ?.name) : row.name} ); }, }, + { + prop: 'biaodileixing', + label: '标的类型', + width: 160 + }, { prop: "zuoluo", label: "坐落", - width: 0, + width: 160, align: "left", customFn: (row) => { return ( - {row.land_id + {(row.land_id || row.house_id) ? (row.land_id ? this.detail?.land?.find((i) => i.id === row.land_id)?.zuoluo : this.detail?.houses?.find((i) => i.id === row.house_id) - ?.zuoluo} + ?.zuoluo) : row.zuoluo} ); }, }, + { + prop: 'xiangxiweizhi', + label: '详细位置', + width: 180, + align: 'left' + }, { prop: "shijimianji", label: "实际面积(m²)", @@ -233,11 +244,11 @@ export default { customFn: (row) => { return ( - {parseFloat((row.land_id + {(row.land_id || row.house_id) ? (parseFloat((row.land_id ? this.detail?.land?.find((i) => i.id === row.land_id) ?.shijimianji : this.detail?.houses?.find((i) => i.id === row.house_id) - ?.shijimianji)??0).toFixed(2)} + ?.shijimianji)??0).toFixed(2)) : row.shijimianji} ); }, diff --git a/src/views/lease/index.vue b/src/views/lease/index.vue index d30fbc1..056fa67 100644 --- a/src/views/lease/index.vue +++ b/src/views/lease/index.vue @@ -313,7 +313,7 @@ import { saveAs } from "file-saver"; import { listdept } from "@/api/system/department" import add from "./component/addLease.vue"; -import imports from "@/views/component/imports.vue" +import imports from "./component/imports.vue" import LxHeader from "@/components/LxHeader/index.vue"; import headerContent from "@/components/LxHeader/XyContent.vue"; import addPay from "@/views/lease/component/addPay.vue"; diff --git a/src/views/lease/sign.vue b/src/views/lease/sign.vue index 4e381d9..3e150ac 100644 --- a/src/views/lease/sign.vue +++ b/src/views/lease/sign.vue @@ -192,13 +192,14 @@ export default { { prop: "name", label: "资产名称", - width: 0, + width: 180, fixed: "left", align: "left", }, { prop: "type", label: "分类", + width: 100, "fixed": "left", customFn: row => ( { row.hasOwnProperty('land_id') ? '房产' : '土地' } @@ -207,13 +208,19 @@ export default { { prop: "zuoluo", label: "坐落", - width: 0, + width: 160, + align: "left", + }, + { + prop: "xiangxiweizhi", + label: "详细位置", + width: 180, align: "left", }, { prop: "shijimianji", label: "实际面积(m²)", - width: 0, + width: 160, align: "center", }, { @@ -318,6 +325,26 @@ export default {

资产信息

+ + ) + } }, + // { + // prop: "selection", + // label: "选择", + // type: "selection", + // width: 56, + // align: "center", + // reserveSelection: true, + // fixed: "left", + // }, { prop: "id", width: 60, @@ -959,134 +1056,28 @@ export default { label: "证载“权利人”", width: 0, align: "left", - }, - { - prop: "gongyouqingkuang", - label: "共有情况", - width: 0, - align: "center", - }, - { - prop: "shiyongnianxian", - label: "使用年限(年)", - width: 0, - align: "center", - }, - { - prop: "xianzhuang", - label: "现状", - width: 0, - align: "center", - }, - { - prop: "yongtu", - label: "用途", - width: 0, - align: "left", - }, - { - prop: "shiyongquanleixing", - label: "使用权类型", - width: 0, - align: "center", - }, - { - prop: "lingzhengriqi", - label: "领证日期", - width: 0, - align: "center", - }, - { - prop: "zhongzhiriqi", - label: "终止日期", - width: 0, - align: "center", - }, - { - prop: "dengjimianji", - label: "登记面积(m²)", - width: 0, - align: "right", - }, - { - prop: "shijimianji", - label: "实际面积(m²)", - width: 0, - align: "center", - }, - { - label: "不符情况", - width: 0, - }, - { - prop: "bufuyuanyin", - label: "不符原因", - width: 0, - align: "center", - }, - { - prop: "ruzhangshijian", - label: "入账时间", - width: 0, - align: "center", - }, - { - prop: "zhangmianyuanzhi", - label: "账面原值", - width: 0, - align: "center", - }, - { - prop: "tudidengji", - label: "土地等级", - width: 0, - align: "center", - }, - { - prop: "tudishuidanjia", - label: "土地税单价", - width: 0, - align: "center", - }, - { - prop: "tudishui", - label: "土地税", - width: 0, - align: "center", - }, - { - prop: "tudishuijiaonazhuti", - label: "土地税缴纳主体", - width: 0, - align: "center", - }, - { - prop: "jiaoshuijine", - label: "缴税金额", - width: 0, - align: "center", - }, + } ]} action={this.index} req-opt={this.landSelect} on={{ ["loaded"]: (_) => { - this.$nextTick(() => { - this.$refs["landLinkTable"] - .getListData() - ?.filter((item) => - this.nowAssets?.find( - (j) => - j.id === item.id && !j.hasOwnProperty("land_id") - ) - ) - ?.forEach((item) => { - this.$refs["landLinkTable"].toggleRowSelection( - item, - true - ); - }); - }); + // this.$nextTick(() => { + // this.$refs["landLinkTable"] + // .getListData() + // ?.filter((item) => + // this.nowAssets?.find( + // (j) => + // j.id === item.id && !j.hasOwnProperty("land_id") + // ) + // ) + // ?.forEach((item) => { + // this.$refs["landLinkTable"].toggleRowSelection( + // item, + // true + // ); + // }); + // }); }, ["select"]: (selection, row) => { if (selection.find((i) => i.id === row.id)) { @@ -1154,14 +1145,40 @@ export default { height="600" ref="houseLinkTable" table-item={[ + // { + // prop: "selection", + // label: "选择", + // type: "selection", + // width: 56, + // align: "center", + // reserveSelection: true, + // fixed: "left", + // }, { prop: "selection", label: "选择", - type: "selection", - width: 56, - align: "center", - reserveSelection: true, + width: 80, fixed: "left", + customFn: row => { + return ( + + ) + } }, { prop: "id", @@ -1214,87 +1231,27 @@ export default { label: "证载“权利人”", width: 0, align: "center", - }, - { - prop: "yongtu", - label: "用途", - width: 0, - align: "left", - }, - { - prop: "zhuangtai", - label: "现状", - width: 0, - align: "left", - }, - { - prop: "dengjishijian", - label: "登记时间", - width: 0, - align: "center", - }, - { - prop: "dengjimianji", - label: "登记面积(m²)", - width: 0, - align: "right", - }, - { - prop: "shijimianji", - label: "实际面积(m²)", - width: 0, - align: "center", - }, - { - prop: "bufuyuanyin", - label: "不符情况", - width: 0, - align: "center", - }, - { - prop: "ruzhangshijian", - label: "入账时间", - width: 0, - align: "center", - }, - { - prop: "zhangmianyuanzhi", - label: "账面原值", - width: 0, - align: "center", - }, - { - prop: "guanliantudizhengquanzheng", - label: "关联土地证权证", - width: 0, - align: "center", - }, - { - prop: "shiyongzhuangtai", - label: "使用状态", - width: 0, - align: "center", - }, + } ]} action={this.index} req-opt={this.houseSelect} on={{ ["loaded"]: (_) => { - this.$nextTick(() => { - this.$refs["houseLinkTable"] - .getListData() - ?.filter((item) => - this.nowAssets?.find( - (j) => j.id === item.id && j.hasOwnProperty("land_id") - ) - ) - ?.forEach((item) => { - this.$refs["houseLinkTable"].toggleRowSelection( - item, - true - ); - }); - }); + // this.$nextTick(() => { + // this.$refs["houseLinkTable"] + // .getListData() + // ?.filter((item) => + // this.nowAssets?.find( + // (j) => j.id === item.id && j.hasOwnProperty("land_id") + // ) + // ) + // ?.forEach((item) => { + // this.$refs["houseLinkTable"].toggleRowSelection( + // item, + // true + // ); + // }); + // }); }, ["select"]: (selection, row) => { if (selection.find((i) => i.id === row.id)) { @@ -1352,12 +1309,12 @@ export default { leasePlans: [], oldLeasePlans: [], landSelect: { - is_auth: 1, + is_auth_more: 1, table_name: "lands", keyword: "", }, houseSelect: { - is_auth: 1, + is_auth_more: 1, table_name: "houses", keyword: "", }, @@ -1480,13 +1437,17 @@ export default { id: land.id, name: land.name, zuoluo: land.zuoluo, - zichanweizhi: land.zichanweizhi, shijimianji: land.shijimianji, _chuzumianji: item.chuzumianji, + _name: item.name, + _biaodileixing: item.biaodileixing, + _zuoluo: item.zuoluo, + _shijimianji: item.shijimianji, + _xiangxiweizhi: item.xiangxiweizhi, _relation_id: item.id, }); } - } else { + } else if (item.house_id) { let house = this.originalForm.houses?.find( (house) => house.id === item.house_id ); @@ -1495,14 +1456,31 @@ export default { id: house.id, name: house.name, zuoluo: house.zuoluo, - zichanweizhi: house.zichanweizhi, shijimianji: house.shijimianji, + _name: item.name, + _zuoluo: item.zuoluo, + _biaodileixing: item.biaodileixing, + _shijimianji: item.shijimianji, + _xiangxiweizhi: item.xiangxiweizhi, _chuzumianji: item.chuzumianji, _relation_id: item.id, - _TAG_: "house", land_id: house.land_id, }); } + } else { + this.nowAssets.push({ + id: "", + name: item.name, + zuoluo: item.zuoluo, + shijimianji: item.shijimianji, + _name: item.name, + _zuoluo: item.zuoluo, + _biaodileixing: item.biaodileixing, + _shijimianji: item.shijimianji, + _xiangxiweizhi: item.xiangxiweizhi, + _chuzumianji: item.chuzumianji, + _relation_id: item.id, + }); } } ); @@ -1557,6 +1535,11 @@ export default { id: item._relation_id, land_id: !item.hasOwnProperty("land_id") ? item.id : "", house_id: item.hasOwnProperty("land_id") ? item.id : "", + name: item._name, + zuoluo: item._zuoluo, + xiangxiweizhi: item._xiangxiweizhi, + biaodileixing: item._relation_i ? (item.hasOwnProperty("land_id") ? '房产' : '土地') : item._biaodileixing, + shijimianji: item._shijimianji, chuzumianji: item._chuzumianji, lease_id: res.id, })); @@ -1692,12 +1675,16 @@ export default { zuoluo: land.zuoluo, zichanweizhi: land.zichanweizhi, shijimianji: land.shijimianji, + _name: land.name, + _zuoluo: land.zuoluo, + _shijimianji: land._shijimianji, + _xiangxiweizhi: '', _chuzumianji: item.chuzumianji || 0, ORIGINAL_DATA: land, _relation_id: item.id, }); } - } else { + } else if (item.house_id) { let house = item.house; if (house) { this.nowAssets.push({ @@ -1706,12 +1693,30 @@ export default { zuoluo: house.zuoluo, zichanweizhi: house.zichanweizhi, shijimianji: house.shijimianji, + _name: house.name, + _zuoluo: house.zuoluo, + _shijimianji: house._shijimianji, + _xiangxiweizhi: '', _chuzumianji: item.chuzumianji || 0, _relation_id: item.id, ORIGINAL_DATA: house, land_id: house.land_id, }); } + } else { + this.nowAssets.push({ + id: "", + name: item.name, + zuoluo: item.zuoluo, + zichanweizhi: item.zichanweizhi, + shijimianji: item.shijimianji, + _name: "", + _zuoluo: "", + _shijimianji: "", + _xiangxiweizhi: '', + _chuzumianji: item.chuzumianji || 0, + _relation_id: item.id, + }); } }); }