合同签订,租金付款

master
xy 1 year ago
parent 53ea699a8e
commit 9f16854273

@ -33,11 +33,12 @@ export function show(params, isLoading = true) {
})
}
export function save(data) {
export function save(data, isLoading = true) {
return request({
method: "post",
url: "/api/admin/base-form/save",
data
data,
isLoading
})
}
@ -49,10 +50,11 @@ export function destroy(params) {
})
}
export function imports(data) {
export function imports(data,isLoading = true) {
return request({
method: "post",
url: "/api/admin/base-form/import",
data
data,
isLoading
})
}

@ -174,7 +174,7 @@ export class CreateDialog {
: false,
},
},
replace && replace.render
(replace && replace.render)
? [replace.render]
: [
h(

@ -200,7 +200,7 @@
租赁合同
</div>
<xy-table :is-page="false" :height="300" :list="/\/land/g.test(this.$route.path) ? detail.id_leases_land_id_relation : detail.id_leases_house_id_relation" :table-item="leaseTable" style="margin-top: 20px" size="mini" stripe ref="table1" :auths="[]" ></xy-table>
<xy-table :is-page="false" :height="300" :list="leases" :table-item="leaseTable" style="margin-top: 20px" size="mini" stripe ref="table1" :auths="[]" ></xy-table>
</el-card>
<el-card id="detail-repair">
@ -378,6 +378,7 @@ export default {
},
histories: [],
leases: [],
inspections: [],
keeps: [],
units: new Map([
@ -437,15 +438,26 @@ export default {
},
{
label: '地块名称',
prop: 'dikuaimingcheng',
prop: 'assets',
width: 180,
fixed: 'left',
align: 'left'
},
{
label: '出租房',
prop: 'chuzufang',
width: 150
align: 'left',
customFn: row => {
return (
<div>
{
row.land?.map(i => (
<Tag color="green">{ i.name }</Tag>
))
}
{
row.house?.map(i => (
<Tag color="blue">{ i.name }</Tag>
))
}
</div>
)
}
},
{
label: '承租方',
@ -466,32 +478,30 @@ export default {
}
},
{
label: '应收租金',
prop: 'yingshouzujin',
align: 'right',
width: 120
label: '合同交租期限',
width: 190,
customFn:row => {
return (
<div>
<span>{ this.$moment(new Date(row.hetongjiaozukaishishijian)).format('YYYY.MM.DD') }</span>
<span> - </span>
<span>{ this.$moment(new Date(row.hetongjiaozujieshushijian)).format('YYYY.MM.DD') }</span>
</div>
)
}
},
{
label: '实收租金',
prop: 'shishouzujin',
label: '年租金单价',
prop: 'nianzujindanjia',
align: 'right',
width: 120
},
{
label: '保证金',
prop: 'baozhengjin',
width: 120,
customFn:row => {
return (
<div style={{'text-align': row.baozhengjin === '无' ? 'center' : 'right' }}>{ row.baozhengjin }</div>
)
}
label: '签订年月',
prop: 'qiandingnianyue',
align: 'right',
width: 120
},
{
label: '未到位原因',
prop: 'weidaoweiyuanyin',
minWidth: 140
}
],
@ -683,6 +693,26 @@ export default {
})
},
async getLeases () {
const res = await index({
table_name: 'leases',
page: 1,
page_size: 999,
filter:[
{
key: "id",
op: 'range',
value: this.detail.leases.map(i => i.id).toString()
}
]
})
this.leases = res.data;
res.data.forEach(i => {
this.myFiles.push(...i.fujian_detail)
})
},
async getKeeps () {
const res = await index({
table_name: 'asset_safety_keeps',
@ -828,6 +858,7 @@ export default {
this.getFields().then(res => {
this.getHistories()
this.getKeeps()
this.getLeases()
// this.getInspections()
})
},

@ -436,7 +436,7 @@ export default {
this.dialogVisible = false;
},
setType(type = "add") {
let types = ["add", "editor"];
let types = ["add", "editor", "renew"];
if (types.includes(type)) {
this.type = type;
} else {
@ -493,7 +493,7 @@ export default {
submit() {
let promiseAll = [];
if (this.type === "add") {
if (this.type === "add" || this.type === "renew") {
if (this.form.hasOwnProperty("id")) {
delete this.form.id;
}
@ -600,7 +600,7 @@ export default {
);
Promise.all(promiseAll).then((res) => {
this.$Message.success({
content: `${this.type === "add" ? "新增" : "编辑"}成功`,
content: `${(this.type === "add" || this.type === "renew") ? "新增" : "编辑"}成功`,
});
this.$emit("refresh");
this.hidden();
@ -665,7 +665,7 @@ export default {
},
dialogVisible(val) {
if (val) {
if (this.type === "editor") {
if (this.type === "editor" || this.type === "renew") {
this.$nextTick(() => this.getDetail());
}
} else {

@ -0,0 +1,154 @@
<script>
import { CreateDialog } from "@/utils/createDialog";
import { resolveFormInfo } from '@/utils/createTable'
import { save } from '@/api/system/baseForm'
export default {
data() {
return {
leaseId: "",
columns: 1,
row: {},
formInfo: [],
id: "",
type: "add",
form: {},
originalForm: {},
rules: {},
file: {},
dialogVisible: false,
}
},
methods: {
show () {
this.dialogVisible = true;
},
hidden () {
this.dialogVisible = false;
},
init() {
for (let key in this.form) {
if (this.form[key] instanceof Array) {
this.form[key] = [];
} else {
this.form[key] = "";
}
}
this.$refs["elForm"].clearValidate();
},
setLeaseId(id) {
this.leaseId = id;
},
submit() {
if (this.type === "add") {
if (this.form.hasOwnProperty("id")) {
delete this.form.id;
}
}
if (this.type === "editor") {
Object.defineProperty(this.form, "id", {
value: this.id,
enumerable: true,
configurable: true,
writable: true,
});
}
this.form.lease_id = this.leaseId;
save(Object.assign(this.form, { table_name: 'lease_pays' })).then(res => {
this.$Message.success({
content: `${this.type === "add" ? "新增" : "编辑"}成功`,
});
this.$emit("refresh");
this.hidden();
})
},
},
computed: {},
watch: {
formInfo: {
handler: function (newVal) {
this.form = {};
this.rules = {};
this.file = {};
newVal.forEach((i) => {
if (i.field) {
this.form[i.field] = "";
if (
i.validation instanceof Array &&
i.validation.length > 0 &&
!!i.validation.find((i) => i === "required")
) {
this.rules[i.field] = [
{ required: true, message: `请填写${i.name}` },
];
}
if (i.edit_input === "files") {
this.form[i.field] = [];
}
if (i.edit_input === "files" || i.edit_input === "file") {
this.file[i.field] = [];
}
if (i.edit_input === "checkbox") {
this.form[i.field] = [];
}
if (i._relations) {
this.form[i._relations?.link_with_name] = [];
}
}
});
this.columns = newVal.length > 11 ? '2' : '1'
},
//immediate: true,
},
dialogVisible(val) {
if (val) {
document.documentElement.style.setProperty(
"--column-num",
this.columns
);
if (this.type === "editor" || this.type === "show") {
this.$nextTick(() => this.getDetail());
}
} else {
this.id = "";
this.type = "";
this.init();
this.$refs["elForm"].clearValidate();
delete this.form.id;
for (let key in this.file) {
this.file[key] = [];
}
}
},
},
created() {
resolveFormInfo(34).then(res => {
this.formInfo = res;
})
},
render(h) {
let formRender = new CreateDialog(this, [],{}, false)
return (
<el-drawer visible={this.dialogVisible}
title="租金收取"
size="64%"
on={{
['update:visible']:e => {
this.dialogVisible = e;
}
}}>
<div style="padding: 0 20px;">
{ formRender.render() }
</div>
</el-drawer>
)
}
}
</script>
<style scoped lang="scss">
</style>

@ -262,10 +262,14 @@
@loaded="adjustAlignment"
>
<template #rentCollection="{ row }">
<Button size="small" type="primary">租金收取</Button>
<template v-if="$moment().isBetween($moment(row.zulinkaishiqixian),$moment(row.zulinjieshuqixian))">
<Button size="small" type="primary" @click="$refs['addPay'].setLeaseId(row.id),$refs['addPay'].show()"></Button>
</template>
</template>
<template #expiredLet="{ row }">
<Button size="small" type="primary">到期招租</Button>
<template v-if="$moment().valueOf() > $moment(row.zulinjieshuqixian).valueOf()">
<Button size="small" type="primary" @click="$router.push('/let'+'?renewId='+row.let_id)"></Button>
</template>
</template>
<template #contractChange="{ row }">
<Button size="small" type="primary" @click="$router.push('/sign/'+row.let_id+'?type=change&leaseId='+row.id)"></Button>
@ -278,17 +282,7 @@
@refresh="$refs['xyTable'].getTableData()"
>
</add>
<drawer
:table-name="customForm.tableName"
:form-info="form"
ref="drawer"
></drawer>
<imports
:table-name="customForm.tableName"
:form-info="form"
ref="imports"
@refresh="$refs['xyTable'].getTableData()"
></imports>
<addPay ref="addPay"></addPay>
</div>
</template>
@ -307,16 +301,14 @@ import { listdept } from "@/api/system/department"
import add from "./component/addLease.vue";
import LxHeader from "@/components/LxHeader/index.vue";
import headerContent from "@/components/LxHeader/XyContent.vue";
import drawer from "@/views/component/drawer.vue";
import imports from "@/views/component/imports.vue";
import addPay from "@/views/lease/component/addPay.vue";
export default {
name: 'tableList',
components: {
LxHeader,
add,
headerContent,
drawer,
imports,
addPay
},
mixins: [authMixin],
provide: {
@ -503,10 +495,10 @@ export default {
linkOb.customFn = (row) => {
let paramMap = new Map();
keys.forEach((key) => {
paramMap.set(i.select_item[key], key);
paramMap.set(/^\d*$/.test(i.select_item[key]) ? Number(i.select_item[key]) : i.select_item[key], key);
});
return <span>{ paramMap.get(row[i.field]) ? paramMap.get(row[i.field].toString()) : row[i.field] }</span>;
return <span>{ paramMap.get(row[i.field]) ? paramMap.get(row[i.field]) : row[i.field] }</span>;
};
}
if (i._relations) {
@ -611,7 +603,6 @@ export default {
}
})
} catch (err) {
console.error(err);
}
this.$nextTick(() => {
this.$refs['xyTable'].doLayout();

@ -640,7 +640,15 @@ export default {
}
},
created() {
this.getFormDetail();
this.getFormDetail().then(res => {
this.$nextTick(() => {
if (this.$route.query.renewId && !isNaN(Number(this.$route.query.renewId))) {
this.$refs['dialog'].setId(Number(this.$route.query.renewId));
this.$refs['dialog'].setType('renew');
this.$refs['dialog'].show();
}
})
})
},
};
</script>

@ -0,0 +1,673 @@
<template>
<div>
<!-- 查询配置 -->
<div>
<div ref="lxHeader">
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>
<header-content :auths="auths_auth_mixin">
<template #search>
<div style="display: flex">
<Select
v-model="select.filter[0].key"
style="width: 100px"
placeholder="搜索条目"
>
<Option
v-for="item in form"
:key="item.id"
:value="item.field"
>{{ item.name }}</Option
>
</Select>
<Select
v-model="select.filter[0].op"
style="width: 100px; margin-left: 10px"
placeholder="搜索条件"
>
<Option
v-for="item in op"
:key="item.value"
:value="item.value"
>{{ item.label }}</Option
>
</Select>
<template
v-if="
select.filter[0].op !== 'range' &&
!columnArrTest(select.filter[0].key)
"
>
<Input
v-model="select.filter[0].value"
style="width: 150px; margin-left: 10px"
placeholder="请填写关键词"
/>
</template>
<template
v-else-if="
select.filter[0].op !== 'range' &&
columnArrTest(select.filter[0].key)
"
>
<Select
v-model="select.filter[0].value"
style="width: 150px; margin-left: 10px"
placeholder="请选择关键词"
>
<Option
v-for="item in getColumnParams(select.filter[0].key)"
:key="item.id"
:value="getColumnField(select.filter[0].key)._relations ? item[getColumnField(select.filter[0].key)._relations.foreign_key] : item.value"
>{{
item.key || item.value || item.name || item.no || item.mingcheng || item.id
}}</Option
>
</Select>
</template>
<template v-else>
<Input
:value="select.filter[0].value.split(',')[0]"
style="width: 150px; margin-left: 10px"
placeholder="范围开始关键词"
@input="(e) => inputStartHandler(e, select.filter[0])"
/>
<span
style="
margin-left: 10px;
display: flex;
align-items: center;
"
></span
>
<Input
:value="select.filter[0].value.split(',')[1]"
style="width: 150px; margin-left: 10px"
placeholder="范围结束关键词"
@input="(e) => inputEndHandler(e, select.filter[0])"
/>
</template>
<Button
style="margin-left: 10px"
type="primary"
@click="$refs['xyTable'].getTableData(true)"
>查询</Button
>
<xy-selectors
style="margin-left: 10px"
@reset="reset"
@search="$refs['xyTable'].getTableData(true)"
>
<template>
<div class="select">
<div
class="select__item"
v-for="(item, index) in select.filter"
:key="`${item.value}-${index}`"
>
<p>条件{{ index + 1 }}</p>
<Select
v-model="item.key"
style="width: 100px"
placeholder="搜索条目"
>
<Option
v-for="item in form"
:key="item.id"
:value="item.field"
>{{ item.name }}</Option
>
</Select>
<Select
v-model="item.op"
style="width: 100px; margin-left: 10px"
placeholder="搜索条件"
>
<Option
v-for="item in op"
:key="item.value"
:value="item.value"
>{{ item.label }}</Option
>
</Select>
<template
v-if="
item.op !== 'range' && !columnArrTest(item.key)
"
>
<Input
v-model="item.value"
style="width: 150px; margin-left: 10px"
placeholder="请填写关键词"
/>
</template>
<template
v-else-if="
item.op !== 'range' && columnArrTest(item.key)
"
>
<Select
v-model="item.value"
style="width: 150px; margin-left: 10px"
placeholder="请选择关键词"
>
<Option
v-for="item in getColumnParams(item.key)"
:key="item.id"
:value="getColumnField(item.key)._relations ? item[getColumnField(item.key)._relations.foreign_key] : item.value"
>{{
item.key || item.value || item.name || item.no || item.mingcheng || item.id
}}</Option
>
</Select>
</template>
<template v-else>
<Input
:value="item.value.split(',')[0]"
style="width: 150px; margin-left: 10px"
placeholder="范围开始关键词"
@input="(e) => inputStartHandler(e, item)"
/>
<span style="margin-left: 10px"></span>
<Input
:value="item.value.split(',')[1]"
style="width: 150px; margin-left: 10px"
placeholder="范围结束关键词"
@input="(e) => inputEndHandler(e, item)"
/>
</template>
<el-button
v-if="index !== 0"
size="small"
type="danger"
icon="el-icon-delete"
circle
style="margin-left: 10px"
@click="select.filter.splice(index, 1)"
></el-button>
</div>
</div>
<div class="add-btn">
<el-button
size="small"
type="primary"
icon="el-icon-plus"
circle
@click="
select.filter.push({ key: '', op: '', value: '' })
"
></el-button>
<span>新增一条</span>
</div>
</template>
</xy-selectors>
</div>
</template>
<template #create>
<Button
type="primary"
@click="
$refs['dialog'].setType('add'), $refs['dialog'].show()
"
>新增</Button
>
</template>
<template #import>
<Button type="primary" @click="$refs['imports'].show()"
>导入</Button
>
</template>
<template #export>
<Button
type="primary"
@click="exportExcel(new Date().getTime().toString())"
>导出</Button
>
</template>
</header-content>
</slot>
</LxHeader>
</div>
</div>
<xy-table
:btn-width="300"
:auths="auths_auth_mixin"
:delay-req="true"
:destroy-action="destroy"
ref="xyTable"
:border="true"
:action="index"
:req-opt="select"
:destroy-req-opt="select"
:table-item="table"
@editor="
(row) => {
$refs['dialog'].setId(row.id);
$refs['dialog'].setType('editor');
$refs['dialog'].show();
}
"
@loaded="adjustAlignment"
>
</xy-table>
<dialoger
:table-name="customForm.tableName"
:form-info="form"
ref="dialog"
@refresh="$refs['xyTable'].getTableData()"
>
</dialoger>
<drawer
:table-name="customForm.tableName"
:form-info="form"
ref="drawer"
></drawer>
<imports
:table-name="customForm.tableName"
:form-info="form"
ref="imports"
@refresh="$refs['xyTable'].getTableData()"
></imports>
</div>
</template>
<script>
import { index as fieldIndex } from "@/api/system/customFormField";
import { authMixin } from "@/mixin/authMixin";
import { index, destroy } from "@/api/system/baseForm";
import { op } from "@/const/op";
import { download } from "@/utils/downloadRequest";
import { getparameter } from "@/api/system/dictionary";
import { show } from "@/api/system/customForm";
import * as XLSX from "xlsx";
import { saveAs } from "file-saver";
import { listdept } from "@/api/system/department"
import dialoger from "@/views/component/dialog.vue";
import LxHeader from "@/components/LxHeader/index.vue";
import headerContent from "@/components/LxHeader/XyContent.vue";
import drawer from "@/views/component/drawer.vue";
import imports from "@/views/component/imports.vue";
export default {
name: 'tableList',
components: {
LxHeader,
dialoger,
headerContent,
drawer,
imports,
},
mixins: [authMixin],
provide: {
formStore: () => this.form,
},
data() {
return {
firstAdjustTable: true,
op,
select: {
table_name: "",
filter: [
{
key: "",
op: "",
value: "",
},
],
},
form: [],
table: [],
customForm: {
customFormId: "",
tableName: "",
},
};
},
methods: {
index,
destroy,
download,
reset() {
this.select.filter.splice(1);
this.select.filter[0] = {
key: "",
op: "",
value: "",
};
},
async exportExcel(sheetName) {
const res = await index(
Object.assign(this.select, { page: 1, page_size: 9999 })
);
if (res.data) {
let headers = this.form.map((i) => {
return {
key: i.field,
title: i.name,
};
});
const data = res.data.map((row) =>
headers.map((header) => row[header.key])
);
data.unshift(headers.map((header) => header.title));
const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(data);
XLSX.utils.book_append_sheet(wb, ws, sheetName);
const wbout = XLSX.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
saveAs(
new Blob([wbout], { type: "application/octet-stream" }),
`${sheetName}.xlsx`
);
}
},
//target
inputStartHandler(e, target) {
let temp = target?.value.split(",")[1];
target.value = `${e},${temp ? temp : ""}`;
},
inputEndHandler(e, target) {
let temp = target?.value.split(",")[0];
target.value = `${temp ? temp : ""},${e}`;
},
async getFormDetail() {
if (this.$route.meta.params?.custom_form) {
let decode = decodeURIComponent(this.$route.meta.params?.custom_form);
try {
let custom_form = JSON.parse(decode);
this.customForm.customFormId = custom_form.custom_form_id;
this.customForm.tableName = custom_form.table_name;
this.select.table_name = custom_form.table_name;
} catch (err) {
console.warn(err);
}
}
const res = await show({ id: this.customForm.customFormId }, false);
//
//
let baseTable = new Map([
['departments', async () => {
const res = await listdept()
return res
}],
['admins',[]]
])
let { fields, relation } = res;
let fieldRes = fields.sort((a,b) => a.sort - b.sort)
if (
!fields ||
!relation ||
!fields instanceof Array ||
!relation instanceof Array
) {
throw new Error("fields或relation格式错误");
}
console.log(fieldRes)
fieldRes?.forEach((i, index) => {
i._relations = relation.find(
(j) => j.link_table_name.split("_")[1] === i.field
) || relation.find(
(j) => j.local_key === i.field
);
if (i.select_item && typeof i.select_item === "object") {
let keys = Object.keys(i.select_item);
if (keys.length > 0) {
i._params = keys.map((key) => {
return {
key,
value: /^\d*$/.test(i.select_item[key])
? Number(i.select_item[key])
: i.select_item[key],
};
});
}
}
if (i.edit_input === 'file' || i.edit_input === 'files') {
return
}
if (i._relations) {
if (baseTable.get(i._relations.link_table_name)) {
baseTable
.get(i._relations.link_table_name)()
.then((res) => {
i._params = res.data;
});
} else {
i._params = i._relations.parameter_id
? getparameter({ id: i._relations.parameter_id }, false).then(
(res) => {
i._params = res.detail;
}
)
: this.index({
table_name: i._relations.link_table_name,
page: 1,
page_size: 9999,
}).then((res) => {
i._params = res.data;
});
}
}
});
this.form = fieldRes || [];
this.form
?.filter((i) => i.list_show)
.forEach((i) => {
let linkOb = {};
if (i.edit_input === "richtext") {
linkOb.customFn = (row) => {
return (
<div
style={{ "max-height": "55px","overflow": "scroll" }}
domPropsInnerHTML={row[i.field]}
></div>
);
};
}
if (
i.select_item &&
typeof i.select_item === "object" &&
!(i.select_item instanceof Array)
) {
let keys = Object.keys(i.select_item);
linkOb.customFn = (row) => {
let paramMap = new Map();
keys.forEach((key) => {
paramMap.set(i.select_item[key], key);
});
return <span>{ paramMap.get(row[i.field]) ? paramMap.get(row[i.field].toString()) : row[i.field] }</span>;
};
}
if (i._relations) {
let { link_relation, foreign_key, link_with_name } = i._relations;
if (link_relation === "newHasOne" || link_relation === "hasOne") {
linkOb.customFn = (row) => {
if (i.edit_input === "file") {
return (
<a
download={row[link_with_name]?.original_name}
href={row[link_with_name]?.url}
>
{row[link_with_name]?.original_name}
</a>
);
} else {
return (
<span>
{row[link_with_name]?.name ||
row[link_with_name]?.no ||
row[link_with_name]?.value}
</span>
);
}
};
}
if (link_relation === "hasMany" || link_relation === "newHasMany") {
linkOb.customFn = (row) => {
if (i.edit_input === "files") {
return (
<div style="display: flex;flex-direction: column;">
{row[link_with_name]?.map((o) => (
<a>
{ o?.original_name || o?.name }
</a>
))}
</div>
)
} else {
return (
<div>
{row[link_with_name]?.map((o) => (
<p>
{o?.name ||
o?.no ||
o?.value ||
o?.biaoti ||
o?.mingcheng}
</p>
))}
</div>
);
}
};
}
}
this.table.push(
Object.assign(
{
prop: i.field,
label: i.name,
width: i.width,
align: 'center',
fixed: i.is_fixed,
},
linkOb
)
);
});
this.table.unshift({
prop: "id",
width: 60,
label: "序号",
});
},
adjustAlignment () {
if (this.firstAdjustTable) {
const data = this.$refs['xyTable'].getListData();
if (data.length < 2) return;
try {
this.form.filter(i => i.list_show).forEach((i) => {
let lengthTemp;
let temp = 0;
while (!lengthTemp || temp < data.length) {
lengthTemp = data[temp][i.field]?.length??0;
temp++;
}
for (let j = 0;j < data.length;j++) {
if (/^-?\d+\.\d+/.test(data[j][i.field])) {
this.table.find(a => a.prop === i.field).align = 'right';
return
}
if (Math.abs(lengthTemp - (data[j][i.field]?.length)??0) > 4) {
this.table.find(a => a.prop === i.field).align = 'left';
return
}
}
})
} catch (e) {
}
this.$nextTick(() => {
this.$refs['xyTable'].doLayout();
this.firstAdjustTable = false;
})
}
}
},
computed: {
columnArrTest() {
return function (field) {
return this.form.find((i) => i.field === field)
? this.form.find((i) => i.field === field).search_input === "checkbox" || this.form.find((i) => i.field === field).search_input === "radio"
: false;
};
},
getColumnField() {
return function (field) {
return this.form.find((i) => i.field === field)
? this.form.find((i) => i.field === field)
: {};
};
},
getColumnParams() {
return function (field) {
return this.form.find((i) => i.field === field)
? this.form.find((i) => i.field === field)._params
: [];
};
}
},
created() {
this.getFormDetail();
},
};
</script>
<style scoped lang="scss">
.select {
&__item {
& > p {
display: inline-block;
width: 80px;
text-align: center;
}
& + div {
margin-top: 6px;
}
}
}
.add-btn {
display: flex;
justify-content: center;
align-items: center;
margin-top: 10px;
& > span {
padding: 0 10px;
}
}
a {
color: red;
text-decoration: none;
transition: all 0.2s;
}
a:hover {
color: red;
text-decoration: underline;
}
</style>

@ -1,5 +1,5 @@
<script>
import { save, show, index, destroy } from "@/api/system/baseForm";
import { save, show, index, destroy, imports } from "@/api/system/baseForm";
import { CreateDialog } from "@/utils/createDialog"
import { deepCopy } from "@/utils";
import { resolveFormInfo } from '@/utils/createTable'
@ -12,6 +12,27 @@ export default {
render(h) {
const _this = this;
let dialog = new CreateDialog(this,[
{
show: true,
key: "qiandingnianyue",
label: "签订年月",
render: h('el-date-picker', {
style: { width: '100%' },
props: {
type: 'month',
placeholder: '请选择签订年月',
value: _this.form.qiandingnianyue,
format: 'yyyy-MM',
valueFormat: 'yyyy-MM'
},
on: {
['input']: e => {
_this.form.qiandingnianyue = e;
_this.form = Object.assign({}, _this.form);
}
}
})
}
],{}, false)
return (
@ -25,7 +46,14 @@ export default {
this.$router.go(-1)
}
}}></i>
<p>{ this.type === '签订合同' ? '签订合同' : '合同变更' }</p>
<p>{ (() => {
let title = new Map([
['add', '签订合同'],
['editor', '修改合同'],
['change', '合同变更']
])
return title.get(this.type)
})() }</p>
</div>
{/* 资产信息 */}
@ -51,7 +79,48 @@ export default {
</div>
</div>
<xy-table list={[...this.selectedLands,...this.selectedHouses]}
<xy-table list={
this.distinct([
...this.selectedLands,
...this.selectedHouses,
...(() => {
let temp = [];
this.originalForm?.id_leases_to_assets_lease_id_relation?.forEach(item => {
if (item.land_id) {
let land = this.originalForm.land?.find(land => land.id === item.land_id);
if (land) {
temp.push({
id: land.id,
name: land.name,
zuoluo: land.zuoluo,
zichanweizhi: land.zichanweizhi,
dengjimianji: land.dengjimianji,
_chuzumianji: item.chuzumianji,
_relation_id: item.id,
_TAG_: "land"
});
}
} else {
let house = this.originalForm.house?.find(house => house.id === item.house_id);
if (house) {
temp.push({
id: house.id,
name: house.name,
zuoluo: house.zuoluo,
zichanweizhi: house.zichanweizhi,
dengjimianji: house.dengjimianji,
_chuzumianji: item.chuzumianji,
_relation_id: item.id,
_TAG_: "house"
});
}
}
})
return temp;
})()
])
}
height="300"
isHandlerKey={false}
is-page={false}
@ -106,12 +175,21 @@ export default {
['click']: _ => {
this.$confirm("确定删除?").then(_ => {
if (row.hasOwnProperty("land_id")) {
this.$refs["houseLinkTable"].toggleRowSelection(row,false)
this.$refs["houseLinkTable"]?.toggleRowSelection(row,false)
++this.houseSelectTemp;
} else {
this.$refs["landLinkTable"].toggleRowSelection(row,false)
this.$refs["landLinkTable"]?.toggleRowSelection(row,false)
++this.landSelectTemp;
}
if (row._relation_id) {
destroy({ table_name: "leases_to_assets", id: row._relation_id },false).then(_ => {
let index = this.originalForm.id_leases_to_assets_lease_id_relation?.findIndex(item => item.id === row._relation_id);
this.originalForm.id_leases_to_assets_lease_id_relation?.splice(index, 1);
++this.landSelectTemp;
++this.houseSelectTemp;
})
}
})
}
}}>删除</Button>
@ -184,7 +262,7 @@ export default {
width: 160,
customFn: row => {
return (
<el-input-number style="width: 100%;" size="small" controls={false} precision={2} vModel={row.shijidaozhang} size="small"></el-input-number>
<el-input-number disabled style="width: 100%;" size="small" controls={false} precision={2} vModel={row.shijidaozhang} size="small"></el-input-number>
)
}
},
@ -194,7 +272,7 @@ export default {
width: 180,
customFn: row => {
return (
<el-input style="width: 100%;" size="small" vModel={row.weidaoweiyuanyin} size="small"></el-input>
<el-input readonly style="width: 100%;" size="small" vModel={row.weidaoweiyuanyin} size="small"></el-input>
)
}
},
@ -205,6 +283,7 @@ export default {
customFn: row => {
return (
<el-date-picker
readonly
style="width: 100%;"
size="small"
vModel={row.shijidaozhangriqi}
@ -229,6 +308,10 @@ export default {
['click']: _ => {
this.$confirm("确定删除?").then(_ => {
this.leasePlans.splice($index, 1)
if (row.id) {
destroy({ table_name: "lease_plans", id: row.id},false)
}
})
}
}}>删除</Button>
@ -612,6 +695,21 @@ export default {
};
},
methods: {
distinct (arr, key="id") {
let newobj = {};
arr = arr.reduce((preVal, curVal) => {
if (!newobj[curVal[key]]) {
newobj[curVal[key]] = preVal.push(curVal)
} else {
let findVal = preVal.find(item => item[key] === curVal[key]);
findVal._chuzumianji = newobj[curVal[key]]["_chuzumianji"] || curVal["_chuzumianji"];
findVal._chuzumianji = newobj[curVal[key]]["_relation_id"] || curVal["_relation_id"];
findVal._TAG_ = newobj[curVal[key]]["_TAG_"] || curVal["_TAG_"];
}
return preVal
}, []);
return arr;
},
index,
setRow (row) {
this.row = row
@ -660,12 +758,6 @@ export default {
},
submit() {
if (/\/house/g.test(this.$route.path)) {
this.form['house_id'] = this.row.id
}
if (/\/land/g.test(this.$route.path)) {
this.form['land_id'] = this.row.id
}
if (this.type === "add") {
if (this.form.hasOwnProperty("id")) {
delete this.form.id;
@ -681,23 +773,98 @@ export default {
}
this.form.let_id = this.$route.params.letId;
this.form.id_leases_to_assets_lease_id_relation = [];
this.selectedHouses?.forEach(i => {
this.form.id_leases_to_assets_lease_id_relation.push({
house_id: i.id,
lease_id: this.id,
chuzumianji: i._chuzumianji
})
})
this.selectedLands?.forEach(i => {
this.form.id_leases_to_assets_lease_id_relation.push({
land_id: i.id,
lease_id: this.id,
chuzumianji: i._chuzumianji
})
})
this.form.id_lease_plans_lease_id_relation = this.leasePlans;
// this.form.id_leases_to_assets_lease_id_relation = [];
// this.selectedHouses?.forEach(i => {
// this.form.id_leases_to_assets_lease_id_relation.push({
// house_id: i.id,
// lease_id: this.id,
// chuzumianji: i._chuzumianji
// })
// })
// this.selectedLands?.forEach(i => {
// this.form.id_leases_to_assets_lease_id_relation.push({
// land_id: i.id,
// lease_id: this.id,
// chuzumianji: i._chuzumianji
// })
// })
// this.form.id_lease_plans_lease_id_relation = this.leasePlans;
save(Object.assign(this.form, { table_name: 'leases' })).then(res => {
let leaseToAssetsData = this.distinct([
...this.selectedLands,
...this.selectedHouses,
...(() => {
let temp = [];
this.originalForm?.id_leases_to_assets_lease_id_relation?.forEach(item => {
if (item.land_id) {
let land = this.originalForm.land?.find(land => land.id === item.land_id);
if (land) {
temp.push({
id: land.id,
name: land.name,
zuoluo: land.zuoluo,
zichanweizhi: land.zichanweizhi,
dengjimianji: land.dengjimianji,
_chuzumianji: item.chuzumianji,
_relation_id: item.id,
_TAG_: "land"
});
}
} else {
let house = this.originalForm.house?.find(house => house.id === item.house_id);
if (house) {
temp.push({
id: house.id,
name: house.name,
zuoluo: house.zuoluo,
zichanweizhi: house.zichanweizhi,
dengjimianji: house.dengjimianji,
_chuzumianji: item.chuzumianji,
_relation_id: item.id,
_TAG_: "house"
});
}
}
})
return temp;
})()
]).map(item => ({
id: item._relation_id,
land_id: item._TAG_ === "land" ? item.id : "",
house_id: item._TAG_ === "house"? item.id : "",
chuzumianji: item._chuzumianji,
lease_id: res.id
}));
if (leaseToAssetsData && leaseToAssetsData.length > 0) {
imports({
table_name: "leases_to_assets",
data: leaseToAssetsData
},false)
}
let leasePlansData = this.leasePlans.map(item => ({
...item,
lease_id: res.id
}));
if (leasePlansData && leasePlansData.length > 0) {
imports({
table_name: "lease_plans",
data: leasePlansData
})
}
//
if (this.type === "change") {
let content = "";
for (let key in this.originalForm) {
if (this.form[key] && (this.originalForm[key] !== this.form[key])) {
content += `${key}${this.originalForm[key]}变更为${this.form[key]}\n`;
}
}
save({
table_name: "lease_logs",
content,
lease_id: this.id
},false)
}
this.$Message.success({
content: `${this.type === "add" ? "新增" : "编辑"}成功`,
});
@ -707,12 +874,6 @@ export default {
},
},
computed: {
title () {
if (this.type === 'add') return '新增'
if (this.type === 'editor') return '编辑'
if (this.type === 'show') return '查看'
},
selectedLands () {
let temp = this.landSelectTemp;
return this.$refs['landLinkTable']?.getSelection() || [];
@ -765,7 +926,7 @@ export default {
"--column-num",
this.columns
);
if (this.type === "editor" || this.type === "show") {
if (this.type === "editor" || this.type === "change") {
this.$nextTick(() => this.getDetail());
}
} else {
@ -785,11 +946,25 @@ export default {
created() {
this.id = this.$route.query.leaseId;
this.type = this.$route.query.type;
resolveFormInfo(15).then(res => this.formInfo = res)
resolveFormInfo(15).then(res => {
this.formInfo = res;
if (this.type === "editor" || this.type === "change") {
this.$nextTick(() => this.getDetail());
}
})
},
mounted() {
if (this.type === "editor" || this.type === "change") {
this.$nextTick(() => this.getDetail());
},
beforeDestroy() {
this.id = "";
this.type = "";
this.init();
this.$refs["elForm"].clearValidate();
delete this.form.id;
for (let key in this.file) {
this.file[key] = [];
}
}
};

Loading…
Cancel
Save