xiaoy
/
wxjt-asset-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

租赁资产选择

Browse Source
master
xy 1 year ago
parent 6f10389e85
commit 0cc1d3f881
3 changed files with 185 additions and 51 deletions
Show Stats Download Patch File Download Diff File

196
src/views/lease/component/addLet.vue
Unescape View File

@ -40,6 +40,26 @@ export default {
<p style="font-weight: 700;line-height: 2;">资产信息</p> <p style="font-weight: 700;line-height: 2;">资产信息</p>
<div style="margin-left: auto;"> <div style="margin-left: auto;">
<Button
type="primary"
shape="circle"
on={{
["click"]: (_) => {
this.nowAssets.push({
id: "",
_name: "",
_zuoluo: "",
_biaodileixing: "",
_xiangxiweizhi: "",
_shijimianji: 0,
_chuzumianji: 0,
_relation_id: "",
});
},
}}
>
新增记录
</Button>
<Button type="primary" <Button type="primary"
shape="circle" shape="circle"
on={{ on={{
@ -71,41 +91,77 @@ export default {
table-item={ table-item={
[ [
{ {
"prop": "name", prop: "name",
"label": "资产名称", label: "资产名称",
"width": 0, width: 180,
"fixed": "left", fixed: "left",
"align": "left" align: "left",
customFn: row => (
row.id ?
(<span>{ row.name }</span>) :
(<el-input vModel={row._name} size="small"></el-input>)
)
}, },
{ {
prop: "type", prop: "type",
label: "分类", label: "分类",
width: 100,
"fixed": "left", "fixed": "left",
customFn: row => ( customFn: row => (
<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span> row.id ?
(<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span>) :
(<el-input vModel={row._biaodileixing} size="small"></el-input>)
) )
}, },
{ {
"prop": "zuoluo", prop: "zuoluo",
"label": "坐落", label: "坐落",
"width": 0, width: 160,
"align": "left" align: "left",
customFn: row => (
row.id ?
(<span>{ row.zuoluo }</span>) :
(<el-input vModel={row._zuoluo} size="small"></el-input>)
)
}, },
{ {
"prop": "shijimianji", prop: "xiangxiweizhi",
"label": "实际面积（m²）", label: "详细位置",
"width": 0, width: 180,
"align": "right" customFn: (row) => {
return (
<el-input
vModel={row._xiangxiweizhi}
size="small"
></el-input>
);
},
}, },
{ {
"prop": "_chuzumianji", prop: "shijimianji",
"label": "出租面积（m²）", label: "实际面积（m²）",
"width": 160, width: 160,
customFn: row => { align: "center",
customFn: row => (
row.id ?
(<span>{ row.shijimianji }</span>) :
(<el-input-number precision={2} controls={false} vModel={row._shijimianji} size="small"></el-input-number>)
)
},
{
prop: "_chuzumianji",
label: "出租面积（m²）",
width: 160,
customFn: (row) => {
return ( return (
<el-input-number controls={false} precision={2} vModel={row._chuzumianji} size="small"></el-input-number> <el-input-number
) controls={false}
} precision={2}
vModel={row._chuzumianji}
size="small"
></el-input-number>
);
},
}, },
{ {
prop: "operate", prop: "operate",
@ -179,12 +235,42 @@ export default {
table-item={ table-item={
[ [
{ {
type: "selection", prop: "selection",
width: 56, label: "选择",
align: "center", width: 80,
reserveSelection: true,
fixed: "left", fixed: "left",
customFn: row => {
return (
<Button size="small"
type="primary"
on={{
'click': _ => {
this.nowAssets.push({
id: row.id,
name: row.name,
zuoluo: row.zuoluo,
zichanweizhi: row.zichanweizhi,
shijimianji: row.shijimianji,
_name: row.name,
_zuoluo: row.zuoluo,
_shijimianji: row.shijimianji,
_xiangxiweizhi: "",
_chuzumianji: 0,
_relation_id: "",
ORIGINAL_DATA: row,
});
}
}}>新增</Button>
)
}
}, },
// {
// type: "selection",
// width: 56,
// align: "center",
// reserveSelection: true,
// fixed: "left",
// },
{ {
"prop": "id", "prop": "id",
"width": 60, "width": 60,
@ -243,11 +329,11 @@ export default {
req-opt={this.landSelect} req-opt={this.landSelect}
on={{ on={{
['loaded']: _ => { ['loaded']: _ => {
this.$nextTick(() => { // 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'].getListData()?.filter(item => this.nowAssets?.find(j => j.id === item.id && !j.hasOwnProperty('land_id')))?.forEach(item => {
this.$refs['landLinkTable'].toggleRowSelection(item, true) // this.$refs['landLinkTable'].toggleRowSelection(item, true)
}) // })
}) // })
}, },
['select']: (selection, row) => { ['select']: (selection, row) => {
if (selection.find(i => i.id === row.id)) { if (selection.find(i => i.id === row.id)) {
@ -300,12 +386,43 @@ export default {
ref="houseLinkTable" ref="houseLinkTable"
table-item={ table-item={
[ [
// {
// type: "selection",
// width: 56,
// align: "center",
// reserveSelection: true,
// fixed: "left"
// },
{ {
type: "selection", prop: "selection",
width: 56, label: "选择",
align: "center", width: 80,
reserveSelection: true, fixed: "left",
fixed: "left" customFn: row => {
return (
<Button size="small"
type="primary"
on={{
'click': _ => {
this.nowAssets.push({
id: row.id,
name: row.name,
zuoluo: row.zuoluo,
zichanweizhi: row.zichanweizhi,
shijimianji: row.shijimianji,
_name: row.name,
_zuoluo: row.zuoluo,
_shijimianji: row.shijimianji,
_xiangxiweizhi: "",
land_id: row.land_id,
_chuzumianji: 0,
_relation_id: "",
ORIGINAL_DATA: row,
});
}
}}>新增</Button>
)
}
}, },
{ {
"prop": "id", "prop": "id",
@ -554,12 +671,17 @@ export default {
table_name: "lets_to_assets" table_name: "lets_to_assets"
},false))) },false)))
} }
let leaseToAssetsData = this.nowAssets.map(item => ({ let leaseToAssetsData = this.nowAssets.map((item) => ({
id: item._relation_id, id: item._relation_id,
land_id: !item.hasOwnProperty("land_id") ? item.id : "", land_id: !item.hasOwnProperty("land_id") ? item.id : "",
house_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, chuzumianji: item._chuzumianji,
let_id: res.id let_id: res.id,
})); }));
if (leaseToAssetsData && leaseToAssetsData.length > 0) { if (leaseToAssetsData && leaseToAssetsData.length > 0) {
imports({ imports({

19
src/views/lease/detailLet.vue
Unescape View File

@ -129,33 +129,38 @@ export default {
"fixed": "left", "fixed": "left",
"align": "left", "align": "left",
customFn: row => { customFn: row => {
return (<span>{ row.land_id ? row.lands.name : row.house.name }</span>) return (<span>{ (row.land_id || row.house_id) ? (row.land_id ? row.lands.name : row.house.name) : row.name }</span>)
} }
}, },
{ {
prop: "type", prop: "type",
label: "分类", label: "分类",
"fixed": "left", width: 160,
customFn: row => ( customFn: row => (
<span>{ row.land_id ? '房产' : '土地' }</span> <span>{ (row.land_id || row.house_id) ? (row.land_id ? '房产' : '土地'): row.biaodileixing }</span>
) )
}, },
{ {
"prop": "zuoluo", "prop": "zuoluo",
"label": "坐落", "label": "坐落",
"width": 0, "width": 160,
"align": "left", "align": "left",
customFn: row => { customFn: row => {
return (<span>{ row.land_id ? row.lands.zuoluo : row.house.zuoluo }</span>) return (<span>{ (row.land_id || row.house_id) ? (row.land_id ? row.lands.zuoluo : row.house.zuoluo) : row.zuoluo }</span>)
} }
}, },
{
prop: "xiangxiweizhi",
label: "详细位置",
width: 180
},
{ {
"prop": "shijimianji", "prop": "shijimianji",
"label": "实际面积（m²）", "label": "实际面积（m²）",
"width": 0, "width": 160,
"align": "center", "align": "center",
customFn: row => { customFn: row => {
return (<span>{ row.land_id ? row.lands.shijimianji : row.house.shijimianji }</span>) return (<span>{ (row.land_id || row.house_id) ? (row.land_id ? row.lands.shijimianji : row.house.shijimianji) : row.shijimianji }</span>)
} }
}, },
{ {

21
src/views/lease/sign.vue
Unescape View File

@ -1169,10 +1169,15 @@ export default {
id: row.id, id: row.id,
name: row.name, name: row.name,
zuoluo: row.zuoluo, zuoluo: row.zuoluo,
zichanweizhi: row.zichanweizhi,
shijimianji: row.shijimianji, shijimianji: row.shijimianji,
_name: row.name,
_zuoluo: row.zuoluo,
_shijimianji: row.shijimianji,
_xiangxiweizhi: "",
land_id: row.land_id,
_chuzumianji: 0, _chuzumianji: 0,
_relation_id: "", _relation_id: "",
land_id: row.land_id,
ORIGINAL_DATA: row, ORIGINAL_DATA: row,
}); });
} }
@ -1678,7 +1683,7 @@ export default {
_name: land.name, _name: land.name,
_zuoluo: land.zuoluo, _zuoluo: land.zuoluo,
_shijimianji: land._shijimianji, _shijimianji: land._shijimianji,
_xiangxiweizhi: '', _xiangxiweizhi: item.xiangxiweizhi,
_chuzumianji: item.chuzumianji || 0, _chuzumianji: item.chuzumianji || 0,
ORIGINAL_DATA: land, ORIGINAL_DATA: land,
_relation_id: item.id, _relation_id: item.id,
@ -1696,7 +1701,7 @@ export default {
_name: house.name, _name: house.name,
_zuoluo: house.zuoluo, _zuoluo: house.zuoluo,
_shijimianji: house._shijimianji, _shijimianji: house._shijimianji,
_xiangxiweizhi: '', _xiangxiweizhi: item.xiangxiweizhi,
_chuzumianji: item.chuzumianji || 0, _chuzumianji: item.chuzumianji || 0,
_relation_id: item.id, _relation_id: item.id,
ORIGINAL_DATA: house, ORIGINAL_DATA: house,
@ -1706,14 +1711,16 @@ export default {
} else { } else {
this.nowAssets.push({ this.nowAssets.push({
id: "", id: "",
biaodileixing: item.biaodileixing,
name: item.name, name: item.name,
zuoluo: item.zuoluo, zuoluo: item.zuoluo,
zichanweizhi: item.zichanweizhi, zichanweizhi: item.zichanweizhi,
shijimianji: item.shijimianji, shijimianji: item.shijimianji,
_name: "", _name: item.name,
_zuoluo: "", _zuoluo: item.zuoluo,
_shijimianji: "", _biaodileixing: item.biaodileixing,
_xiangxiweizhi: '', _shijimianji: item.shijimianji,
_xiangxiweizhi: item.xiangxiweizhi,
_chuzumianji: item.chuzumianji || 0, _chuzumianji: item.chuzumianji || 0,
_relation_id: item.id, _relation_id: item.id,
}); });

Write Preview
Loading…
Cancel
Save