|
|
|
|
@ -74,10 +74,10 @@
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="商户名称" prop="merchantName">
|
|
|
|
|
<JnpfSelect v-model="dataForm.merchantName" @change="changeData('merchantName', -1)"
|
|
|
|
|
<jnpf-form-tip-item label="商户名称" prop="merchantId">
|
|
|
|
|
<JnpfSelect v-model="dataForm.merchantId" @change="changeData('merchantId', -1)"
|
|
|
|
|
placeholder="请选择" clearable :style='{ "width": "100%" }' filterable
|
|
|
|
|
:options="merchantNameOptions" :props="merchantNameProps">
|
|
|
|
|
:options="merchantIdOptions" :props="merchantIdProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -201,19 +201,19 @@
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="空间名称" prop="spaceName">
|
|
|
|
|
<el-table-column label="空间名称" prop="spaceId">
|
|
|
|
|
<template slot="header" v-if="false">
|
|
|
|
|
<span class="required-sign">*</span>空间名称
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfPopupSelect v-model="scope.row.spaceName"
|
|
|
|
|
@change="changeData('spacecontract-spaceName', scope.$index)"
|
|
|
|
|
<JnpfPopupSelect v-model="scope.row.spaceId"
|
|
|
|
|
@change="changeData('spacecontract-spaceId', scope.$index)"
|
|
|
|
|
:rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
|
:templateJson="interfaceRes.spacecontractspaceName" placeholder="请选择"
|
|
|
|
|
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
|
relationField='name' :field="'spaceName' + scope.$index"
|
|
|
|
|
interfaceId="582491427901014533" :pageSize="20"
|
|
|
|
|
:columnOptions="spacecontractspaceNamecolumnOptions" clearable
|
|
|
|
|
:templateJson="interfaceRes.spacecontractspaceId" placeholder="请选择空间"
|
|
|
|
|
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
|
|
|
|
|
popupType="dialog" relationField='name' :field="'spaceId' + scope.$index"
|
|
|
|
|
interfaceId="584015452494104389" :pageSize="20"
|
|
|
|
|
:columnOptions="spacecontractspaceIdcolumnOptions" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</template>
|
|
|
|
|
@ -225,7 +225,7 @@
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.spaceArea"
|
|
|
|
|
@change="changeData('spacecontract-spaceArea', scope.$index)"
|
|
|
|
|
placeholder="请输入空间面积" disabled clearable :style='{ "width": "100%" }'>
|
|
|
|
|
placeholder="选择空间自动生成" disabled clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
@ -303,8 +303,8 @@ export default {
|
|
|
|
|
spacecontractList: {
|
|
|
|
|
contractLineNumber: '',
|
|
|
|
|
contractLineNumberOptions: [],
|
|
|
|
|
spaceName: '',
|
|
|
|
|
spaceNameOptions: [],
|
|
|
|
|
spaceId: '',
|
|
|
|
|
spaceIdOptions: [],
|
|
|
|
|
spaceArea: '',
|
|
|
|
|
spaceAreaOptions: [],
|
|
|
|
|
totalRentalPrice: '',
|
|
|
|
|
@ -320,7 +320,7 @@ export default {
|
|
|
|
|
pricingMethod: undefined,
|
|
|
|
|
signingDate: undefined,
|
|
|
|
|
parkId: undefined,
|
|
|
|
|
merchantName: undefined,
|
|
|
|
|
merchantId: undefined,
|
|
|
|
|
totalRentalPrice: undefined,
|
|
|
|
|
totalDeposit: undefined,
|
|
|
|
|
payDeposit: undefined,
|
|
|
|
|
@ -368,7 +368,7 @@ export default {
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
merchantName: [
|
|
|
|
|
merchantId: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择',
|
|
|
|
|
@ -416,7 +416,7 @@ export default {
|
|
|
|
|
startTime: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择',
|
|
|
|
|
message: '请选择开始时间',
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
@ -467,16 +467,16 @@ export default {
|
|
|
|
|
pricingMethodOptions: [{ "fullName": "月付", "id": "1" }, { "fullName": "季付", "id": "2" }, { "fullName": "年付", "id": "3" }],
|
|
|
|
|
pricingMethodProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
parkIdOptions: [],
|
|
|
|
|
parkIdProps: { "label": "name", "value": "id" },
|
|
|
|
|
merchantNameOptions: [],
|
|
|
|
|
merchantNameProps: { "label": "cmp_nm", "value": "id" },
|
|
|
|
|
parkIdProps: { "label": "name", "value": "code" },
|
|
|
|
|
merchantIdOptions: [],
|
|
|
|
|
merchantIdProps: { "label": "cmp_nm", "value": "id" },
|
|
|
|
|
payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],
|
|
|
|
|
payDepositProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
returnDepositOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
|
|
|
|
|
returnDepositProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "待确认", "id": "21" }],
|
|
|
|
|
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "合同变更", "id": "21" }],
|
|
|
|
|
contractStatusProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
spacecontractspaceNamecolumnOptions: [{ "label": "空间编码", "value": "code" }, { "label": "空间名称", "value": "name" },],
|
|
|
|
|
spacecontractspaceIdcolumnOptions: [{ "label": "空间名称", "value": "name" }, { "label": "园区名称", "value": "park_name" }, { "label": "区域名称", "value": "area_name" },],
|
|
|
|
|
childIndex: -1,
|
|
|
|
|
isEdit: false,
|
|
|
|
|
interfaceRes: {
|
|
|
|
|
@ -485,7 +485,7 @@ export default {
|
|
|
|
|
pricingMethod: [],
|
|
|
|
|
signingDate: [],
|
|
|
|
|
parkId: [],
|
|
|
|
|
merchantName: [],
|
|
|
|
|
merchantId: [],
|
|
|
|
|
totalRentalPrice: [],
|
|
|
|
|
totalDeposit: [],
|
|
|
|
|
payDeposit: [],
|
|
|
|
|
@ -500,7 +500,7 @@ export default {
|
|
|
|
|
contractExplain: [],
|
|
|
|
|
contractEnclosure: [],
|
|
|
|
|
spacecontractcontractLineNumber: [],
|
|
|
|
|
spacecontractspaceName: [],
|
|
|
|
|
spacecontractspaceId: [],
|
|
|
|
|
spacecontractspaceArea: [],
|
|
|
|
|
spacecontracttotalRentalPrice: [],
|
|
|
|
|
},
|
|
|
|
|
@ -625,7 +625,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
dataAll() {
|
|
|
|
|
this.getparkIdOptions();
|
|
|
|
|
this.getmerchantNameOptions();
|
|
|
|
|
this.getmerchantIdOptions();
|
|
|
|
|
},
|
|
|
|
|
spacecontractExist() {
|
|
|
|
|
let isOk = true;
|
|
|
|
|
@ -674,9 +674,9 @@ export default {
|
|
|
|
|
this.changeDataFormData(1, 'parkId', 'parkId', index, '')
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
getmerchantNameOptions() {
|
|
|
|
|
getmerchantIdOptions() {
|
|
|
|
|
const index = this.childIndex
|
|
|
|
|
let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.merchantName))
|
|
|
|
|
let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.merchantId))
|
|
|
|
|
for (let i = 0; i < templateJsonList.length; i++) {
|
|
|
|
|
let json = templateJsonList[i];
|
|
|
|
|
if (json.relationField) {
|
|
|
|
|
@ -695,8 +695,8 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
getDataInterfaceRes('582842667524685829', template).then(res => {
|
|
|
|
|
let data = res.data
|
|
|
|
|
this.merchantNameOptions = data
|
|
|
|
|
this.changeDataFormData(1, 'merchantName', 'merchantName', index, '')
|
|
|
|
|
this.merchantIdOptions = data
|
|
|
|
|
this.changeDataFormData(1, 'merchantId', 'merchantId', index, '')
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
goBack() {
|
|
|
|
|
@ -815,7 +815,7 @@ export default {
|
|
|
|
|
addspacecontractList() {
|
|
|
|
|
let item = {
|
|
|
|
|
contractLineNumber: undefined,
|
|
|
|
|
spaceName: '',
|
|
|
|
|
spaceId: '',
|
|
|
|
|
spaceArea: undefined,
|
|
|
|
|
totalRentalPrice: undefined,
|
|
|
|
|
}
|
|
|
|
|
|
jiyufei
3 months ago