地块改为资产、加分类

master
xy 2 years ago
parent 90dab8af1e
commit 68856df8fd

@ -43,10 +43,11 @@ export function checkSms (params) {
})
}
export function getFiles (params) {
export function getFiles (params,isLoading) {
return request({
url: "/api/admin/other/files",
method: "get",
params
params,
isLoading: false,
})
}

@ -42,12 +42,26 @@ const actions = {
index({
table_name: "houses",
page: 1,
page_size: 999
page_size: 999,
filter: [
{
key: "fenlei",
op: "neq",
value: 1
}
]
},false),
index({
table_name: "lands",
page: 1,
page_size: 999
page_size: 999,
filter: [
{
key: "fenlei",
op: "neq",
value: 1
}
]
})
]).then(res => {
const [houses,lands] = res;

@ -310,7 +310,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"
@ -497,7 +497,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"

@ -70,9 +70,17 @@ export default {
is-page={false}
table-item={
[
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span>
)
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"
@ -92,13 +100,21 @@ export default {
{
"prop": "_zichanshengyumianji",
"label": "资产剩余面积",
"width": 160,
"width": 170,
customFn: row => {
return (
<el-input-number controls={false} precision={2} vModel={row._zichanshengyumianji} size="small"></el-input-number>
)
}
},
{
prop: "remark",
label: "备注",
width: 200,
customFn: row => (
<el-input size="small"></el-input>
)
},
{
prop: "operate",
label: "操作",
@ -197,7 +213,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"
@ -424,7 +440,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"

@ -102,7 +102,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"

@ -285,7 +285,7 @@
</el-card>
</el-col>
<el-col :span="3">
<Anchor show-ink :offset-top="64">
<Anchor class="myanchor" show-ink :offset-top="64" @on-select="anchorSelect">
<AnchorLink href="#detail-pictures" title="资产图集" v-if="
(detail.id_assets_atlas_files_house_id_relation &&
detail.id_assets_atlas_files_house_id_relation.length > 0) ||
@ -414,7 +414,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"
@ -549,7 +549,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"minWidth": 200,
"fixed": "left",
"align": "left"
@ -688,7 +688,7 @@ export default {
width: 46,
},
{
label: '地块名称',
label: '资产名称',
prop: 'assets',
width: 180,
fixed: 'left',
@ -853,6 +853,34 @@ export default {
};
},
methods: {
anchorSelect (href) {
const cubic = value => Math.pow(value, 3);
const easeInOutCubic = value => value < 0.5
? cubic(value * 2) / 2
: 1 - cubic((1 - value) * 2) / 2;
const { y } = document.querySelector(href)?.getBoundingClientRect()
let scrollTop = y - 70
const el = document.querySelector(".app-main-scroll");
el.scrollTo({
left: 0,
top: scrollTop,
behavior: "smooth"
})
// const beginTime = Date.now();
// const beginValue = el.scrollTop;
// const rAF = window.requestAnimationFrame || (func => setTimeout(func, 16));
// const frameFunc = () => {
// const progress = (Date.now() - beginTime) / 500;
// if (progress < 1) {
// el.scrollTop = beginValue * (1 - easeInOutCubic(progress));
// rAF(frameFunc);
// } else {
// el.scrollTop = 0;
// }
// };
// rAF(frameFunc);
},
copyLocation () {
const input = document.createElement("input");
input.setAttribute("readonly", "readonly"); // , ios
@ -1321,6 +1349,10 @@ a:hover {
}
}
}
.myanchor {
position: fixed;
}
</style>
<style lang="scss">
.map-marker {

@ -113,27 +113,22 @@ export default {
minWidth: 200
},
{
prop: "asset",
label: "所属资产",
width: 180,
align: "left",
prop: "type",
label: "分类",
width: 120,
customFn: row => {
return (<span>{ row.land?.name ? `[土地]${row.land?.name||''}` : (row.house?.name ? `[房产]${row.house?.name||''}` : '暂无') }</span>)
return (<span>{ row.land?.name ? '土地' : (row.house?.name ? '房产' : '暂无') }</span>)
}
},
{
prop: "area",
label: "资产地区",
width: 140,
prop: "asset",
label: "资产名称",
width: 180,
align: "left",
customFn: row => {
return (<span>{ row.land?.area? this.wxAreas[row.land?.area-1] : this.wxAreas[row.house?.area-1] }</span>)
return (<span>{ row.land?.name ? `${row.land?.name||''}` : (row.house?.name ? `${row.house?.name||''}` : '暂无') }</span>)
}
},
{
prop: "created_at",
label: "创建时间",
width: 160
},
{
prop: "operate",
label: "操作",

@ -575,14 +575,14 @@ export default {
align: 'left',
customFn: row => {
let tags = row.asset_handles_to_assets?.map(i => (
<Tag color="success" style="background: rgb(65, 100, 227) !important;">{i.lands?.name || i.house?.name}</Tag>
<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(i.lands?.name || i.house?.name)}</Tag>
))
return (
<div>
{
tags.slice(0, 1)
}
<el-popover title="地块名称" width={200}>
<el-popover title="资产名称" width={200}>
<el-link slot="reference"
type="primary"
style={{

@ -95,9 +95,19 @@ export default {
allTables: [],
linkTableList: [],
assetTable: [
{
"prop": "type",
"label": "分类",
"width": 0,
"fixed": "left",
"align": "left",
customFn: row => {
return (<span>{ row.land_id ? '土地' : '房产' }</span>)
}
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left",
@ -115,18 +125,18 @@ export default {
}
},
{
"prop": "dengjimianji",
"label": "登记面积",
"prop": "shijimianji",
"label": "实际面积",
"width": 0,
"align": "center",
customFn: row => {
return (<span>{ row.land_id ? row.lands.dengjimianji : row.house.dengjimianji }</span>)
return (<span>{ row.land_id ? row.lands.shijimianji : row.house.shijimianji }</span>)
}
},
{
"prop": "zichanshengyumianji",
"label": "资产剩余面积",
"width": 160,
"width": 172,
},
]
};

@ -110,11 +110,21 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
},
{
"prop": "type",
"label": "分类",
"width": 0,
"fixed": "left",
"align": "left",
customFn: row => {
return (<span>{ row.land_id ? '土地' : '房产' }</span>)
}
},
{
prop: "zuoluo",
label: "坐落",
@ -250,7 +260,7 @@ export default {
},
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
align: "left",
fixed: "left",
@ -484,7 +494,7 @@ export default {
},
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
@ -779,6 +789,14 @@ export default {
zichanshengyumianji: item._zichanshengyumianji,
handle_sign_id: res.id
}));
let hisEvolutionsAssetsData = this.nowAssets.map(item => ({
table_name: "his_evolutions",
land_id: !item.hasOwnProperty("land_id") ? item.id : "",
house_id: item.hasOwnProperty("land_id") ? item.id : "",
fashengshijian: this.$moment().format('YYYY-MM-DD'),
mianjitiaozheng: `资产面积由${item.shijimianji||0}m²调整为${item._zichanshengyumianji||0}`,
qitashuoming: `${this.form.chuzhifangshi}`
}));
if (handleToAssetsData && handleToAssetsData.length > 0) {
imports(
{
@ -796,6 +814,7 @@ export default {
shijimianji: item._zichanshengyumianji,
fenlei: 1
})))
Promise.all(hisEvolutionsAssetsData.map(i => save(i)))
//
// if (this.type === "change") {
// let content = "";

@ -141,7 +141,7 @@ export default {
assetTable: [
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",

@ -100,7 +100,7 @@
<Button size="small" type="success" :ghost="hasHouse !== 1" @click="hasHouse = 1,getList(1)">土地</Button>
<Button size="small" type="primary" :ghost="hasHouse !== 2" @click="hasHouse = 2,getList(2)">房产</Button>
<Button size="small" type="info" :ghost="hasHouse !== 3" @click="hasHouse = 3,getList(3)">全部</Button>
<el-input size="mini" style="margin-top: 4px;" placeholder="请输入地块名称" v-model="select.filter[1].value" clearable>
<el-input size="mini" style="margin-top: 4px;" placeholder="请输入资产名称" v-model="select.filter[1].value" clearable>
<el-button type="primary" slot="append" icon="el-icon-search" @click="areaPick"></el-button>
</el-input>
<!-- <RadioGroup v-model="select.filter[5].value" type="button" button-style="solid">-->

@ -47,7 +47,7 @@ export default {
'id_system_file_files_system_id_relation': '附件'
},
t3: {
dikuaimingcheng: "地块名称",
dikuaimingcheng: "资产名称",
chengzufang: "承租方",
chuzufang: "出租方",
hetongjiaozukaishishijian: "合同交租开始时间",

@ -296,7 +296,7 @@ export default {
},
},
{
title: "地块名称",
title: "资产名称",
key: "dikuaimingcheng",
width: 200,
fixed: "left",
@ -340,7 +340,7 @@ export default {
"el-popover",
{
props: {
title: "地块名称",
title: "资产名称",
width: 200,
trigger: "hover",
},
@ -443,7 +443,7 @@ export default {
},
},
{
title: "地块名称",
title: "资产名称",
key: "dikuaimingcheng",
width: 200,
fixed: "left",
@ -487,7 +487,7 @@ export default {
"el-popover",
{
props: {
title: "地块名称",
title: "资产名称",
width: 200,
trigger: "hover",
},

@ -5,7 +5,7 @@
<div class="info-window" ref="leaseInfoWindow" v-show="isShowWindow">
<el-descriptions border :column="2">
<el-descriptions-item label="地块名称">
<el-descriptions-item label="资产名称">
{{ row._asset ? row._asset.name : '' }}
</el-descriptions-item>
<el-descriptions-item label="出租方">

@ -93,7 +93,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"
@ -286,7 +286,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"

@ -72,11 +72,19 @@ export default {
[
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span>
)
},
{
"prop": "zuoluo",
"label": "坐落",
@ -197,7 +205,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"align": "left",
"fixed": "left"
@ -424,7 +432,7 @@ export default {
},
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left"

@ -194,7 +194,7 @@ export default {
assetTable: [
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",

@ -124,7 +124,7 @@ export default {
assetTable: [
{
"prop": "name",
"label": "地块名称",
"label": "资产名称",
"width": 0,
"fixed": "left",
"align": "left",
@ -132,6 +132,14 @@ export default {
return (<span>{ row.land_id ? row.lands.name : row.house.name }</span>)
}
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.land_id ? '房产' : '土地' }</span>
)
},
{
"prop": "zuoluo",
"label": "坐落",

@ -143,7 +143,7 @@ export default {
assetTable: [
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",

@ -115,7 +115,7 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
@ -131,6 +131,14 @@ export default {
</span>
)
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.land_id ? '土地' : '房产' }</span>
)
},
{
prop: "zuoluo",
label: "坐落",
@ -264,7 +272,7 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
@ -280,6 +288,14 @@ export default {
</span>
)
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.land_id ? '土地' : '房产' }</span>
)
},
{
prop: "zuoluo",
label: "坐落",

@ -614,7 +614,7 @@ export default {
{
tags.slice(0, 1)
}
<el-popover title="地块名称" width={200}>
<el-popover title="资产名称" width={200}>
<el-link slot="reference"
type="primary"
style={{

@ -138,11 +138,19 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span>
)
},
{
prop: "zuoluo",
label: "坐落",
@ -297,11 +305,19 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.hasOwnProperty('land_id') ? '房产' : '土地' }</span>
)
},
{
prop: "zuoluo",
label: "坐落",
@ -519,7 +535,7 @@ export default {
table-item={[
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",
@ -531,6 +547,14 @@ export default {
)
}
},
{
prop: "type",
label: "分类",
"fixed": "left",
customFn: row => (
<span>{ row.land_id ? '土地' : '房产' }</span>
)
},
{
prop: "zuoluo",
label: "坐落",
@ -716,7 +740,7 @@ export default {
},
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
align: "left",
fixed: "left",
@ -967,7 +991,7 @@ export default {
},
{
prop: "name",
label: "地块名称",
label: "资产名称",
width: 0,
fixed: "left",
align: "left",

Loading…
Cancel
Save