jiyufei
3 months ago
parent
cb06375025
commit
3feac22f86
File diff suppressed because one or more lines are too long
@ -0,0 +1,52 @@
|
||||
package jnpf.model.contract;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class ContractDTO implements Serializable {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
private String id;
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
private String contractNumber;
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
private String contractName;
|
||||
/**
|
||||
* 商户id
|
||||
*/
|
||||
private String merchantId;
|
||||
/**
|
||||
* 商户id
|
||||
*/
|
||||
private String merchantName;
|
||||
/**
|
||||
* 空间id
|
||||
*/
|
||||
private String spaceNumber;
|
||||
/**
|
||||
* 空间名称
|
||||
*/
|
||||
private String spaceId;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private Date startTime;
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private Date endTime;
|
||||
/**
|
||||
* 租金总价
|
||||
*/
|
||||
private BigDecimal totalRentalPrice;
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package jnpf.model.contract;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class ContractDevicesDTO implements Serializable {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private Date startTime;
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private Date endTime;
|
||||
/**
|
||||
* 租金总价
|
||||
*/
|
||||
private BigDecimal totalRentalPrice;
|
||||
|
||||
/**
|
||||
* 租赁单号
|
||||
*/
|
||||
private String leaseNumber;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String equipmentNumber;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String equipmentName;
|
||||
|
||||
|
||||
}
|
||||
@ -1,356 +1,332 @@
|
||||
<template>
|
||||
<transition name="el-zoom-in-center">
|
||||
<div class="JNPF-preview-main">
|
||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||
<div class="JNPF-common-page-header">
|
||||
<el-page-header @back="goBack"
|
||||
content="详情"/>
|
||||
<div class="options">
|
||||
<el-button @click="goBack">取 消</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
|
||||
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
|
||||
<template v-if="!loading">
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="账单号"
|
||||
prop="billNumbe" >
|
||||
<p>{{dataForm.billNumbe}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="合同名称"
|
||||
prop="contractId" >
|
||||
<p>{{dataForm.contractId}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="账单状态"
|
||||
prop="billStatus" >
|
||||
<p>{{ dataForm.billStatus }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="商户名称"
|
||||
prop="merchantId" >
|
||||
<p>{{dataForm.merchantId}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="开始时间"
|
||||
prop="startTime" >
|
||||
<p>{{dataForm.startTime}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="结束时间"
|
||||
prop="endTime" >
|
||||
<p>{{dataForm.endTime}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="账单金额"
|
||||
prop="billAmount" >
|
||||
<JnpfNumber v-model="dataForm.billAmount"
|
||||
placeholder="账单金额" disabled
|
||||
:step="1" >
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="通知方式"
|
||||
prop="notificationMethod" >
|
||||
<p>{{ dataForm.notificationMethod }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="通知时间"
|
||||
prop="noticeTime" >
|
||||
<p>{{dataForm.noticeTime}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="通知状态"
|
||||
prop="notificationState" >
|
||||
<p>{{ dataForm.notificationState }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="支付方式"
|
||||
prop="payStatus" >
|
||||
<p>{{ dataForm.payStatus }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="支付金额"
|
||||
prop="payAmount" >
|
||||
<JnpfNumber v-model="dataForm.payAmount"
|
||||
placeholder="支付金额" disabled
|
||||
:step="1" >
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="确认人"
|
||||
prop="confirmPersonnel" >
|
||||
<p>{{dataForm.confirmPersonnel}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="确认时间"
|
||||
prop="confirmTime" >
|
||||
<p>{{dataForm.confirmTime}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8" >
|
||||
<jnpf-form-tip-item label="相关附件"
|
||||
prop="billAttachment" >
|
||||
<JnpfUploadFile v-model="dataForm.billAttachment"
|
||||
disabled
|
||||
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传" >
|
||||
</JnpfUploadFile>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-tabs v-model="activegecbmb" tab-position="top" class="mb-20">
|
||||
<el-tab-pane label="空间租金" name="1">
|
||||
<el-col :span="24" >
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<el-table :data="dataForm.tableField140" size='mini' >
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="spaceNumber" label="空间编码" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.spaceNumber}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="spaceId" label="空间名称" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.spaceId}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.startTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.endTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额" >
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount"
|
||||
placeholder="账单金额" disabled
|
||||
:step="1" >
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.costDescription}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane >
|
||||
<el-tab-pane label="设备租金" name="2">
|
||||
<el-col :span="24" >
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<div class="JNPF-common-title">
|
||||
<h2></h2>
|
||||
</div>
|
||||
<el-table :data="dataForm.tableField158" size='mini' >
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="leaseNumber" label="租赁单号" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.leaseNumber}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentNumber" label="设备编码" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.equipmentNumber}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentName" label="设备名称" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.equipmentName}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.startTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.endTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额" >
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount"
|
||||
placeholder="账单金额" disabled
|
||||
:step="1" >
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.costDescription}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane >
|
||||
<el-tab-pane label="其它费用" name="3KzarC2">
|
||||
<el-col :span="24" >
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<div class="JNPF-common-title">
|
||||
<h2></h2>
|
||||
<transition name="el-zoom-in-center">
|
||||
<div class="JNPF-preview-main">
|
||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||
<div class="JNPF-common-page-header">
|
||||
<el-page-header @back="goBack" content="详情" />
|
||||
<div class="options">
|
||||
<el-button @click="goBack">取 消</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="dataForm.tableField166" size='mini' >
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="useAmount" label="使用量" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.useAmount}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.startTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.endTime}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额" >
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount"
|
||||
placeholder="账单金额" disabled
|
||||
:step="1" >
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明" >
|
||||
<template slot-scope="scope">
|
||||
<p>{{scope.row.costDescription}}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane >
|
||||
</el-tabs>
|
||||
</el-col>
|
||||
</template>
|
||||
</el-form>
|
||||
</el-row>
|
||||
</div>
|
||||
</transition>
|
||||
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
|
||||
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
|
||||
<template v-if="!loading">
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="账单号" prop="billNumbe">
|
||||
<p>{{ dataForm.billNumbe }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="合同名称" prop="contractId">
|
||||
<p>{{ dataForm.contractId }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="账单状态" prop="billStatus">
|
||||
<p>{{ dataForm.billStatus }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="商户名称" prop="merchantId">
|
||||
<p>{{ dataForm.merchantId }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="开始时间" prop="startTime">
|
||||
<p>{{ dataForm.startTime }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="结束时间" prop="endTime">
|
||||
<p>{{ dataForm.endTime }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="账单金额" prop="billAmount">
|
||||
<JnpfNumber v-model="dataForm.billAmount" placeholder="账单金额" disabled :step="1">
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="通知方式" prop="notificationMethod">
|
||||
<p>{{ dataForm.notificationMethod }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="通知时间" prop="noticeTime">
|
||||
<p>{{ dataForm.noticeTime }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="通知状态" prop="notificationState">
|
||||
<p>{{ dataForm.notificationState }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="支付方式" prop="payStatus">
|
||||
<p>{{ dataForm.payStatus }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="支付金额" prop="payAmount">
|
||||
<JnpfNumber v-model="dataForm.payAmount" placeholder="支付金额" disabled :step="1">
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="确认人" prop="confirmPersonnel">
|
||||
<p>{{ dataForm.confirmPersonnel }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="确认时间" prop="confirmTime">
|
||||
<p>{{ dataForm.confirmTime }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<jnpf-form-tip-item label="相关附件" prop="billAttachment">
|
||||
<JnpfUploadFile v-model="dataForm.billAttachment" disabled detailed :fileSize="10"
|
||||
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
|
||||
</JnpfUploadFile>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-tabs v-model="activegecbmb" tab-position="top" class="mb-20">
|
||||
<el-tab-pane label="空间租金" name="1">
|
||||
<el-col :span="24">
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<el-table :data="dataForm.tableField140" size='mini'>
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="spaceNumber" label="空间编码">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.spaceNumber }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="spaceId" label="空间名称">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.spaceId }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.startTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.endTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额">
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount" placeholder="账单金额"
|
||||
disabled :step="1">
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.costDescription }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="设备租金" name="2">
|
||||
<el-col :span="24">
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<div class="JNPF-common-title">
|
||||
<h2></h2>
|
||||
</div>
|
||||
<el-table :data="dataForm.tableField158" size='mini'>
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="leaseNumber" label="租赁单号">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.leaseNumber }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentNumber" label="设备编码">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.equipmentNumber }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentName" label="设备名称">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.equipmentName }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.startTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.endTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额">
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount" placeholder="账单金额"
|
||||
disabled :step="1">
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.costDescription }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="其它费用" name="3KzarC2">
|
||||
<el-col :span="24">
|
||||
<jnpf-form-tip-item label-width="0">
|
||||
<div class="JNPF-common-title">
|
||||
<h2></h2>
|
||||
</div>
|
||||
<el-table :data="dataForm.tableField166" size='mini'>
|
||||
<el-table-column type="index" width="50" label="序号" align="center" />
|
||||
<el-table-column prop="useAmount" label="使用量">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.useAmount }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.startTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.endTime }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="billAmount" label="账单金额">
|
||||
<template slot-scope="scope">
|
||||
<JnpfNumber v-model="scope.row.billAmount" placeholder="账单金额"
|
||||
disabled :step="1">
|
||||
</JnpfNumber>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="costDescription" label="费用说明">
|
||||
<template slot-scope="scope">
|
||||
<p>{{ scope.row.costDescription }}</p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-col>
|
||||
</template>
|
||||
</el-form>
|
||||
</el-row>
|
||||
</div>
|
||||
</transition>
|
||||
</template>
|
||||
<script>
|
||||
import request from '@/utils/request'
|
||||
import request from '@/utils/request'
|
||||
|
||||
import { getConfigData } from '@/api/onlineDev/visualDev'
|
||||
import jnpf from '@/utils/jnpf'
|
||||
import Detail from '@/views/basic/dynamicModel/list/detail'
|
||||
import { thousandsFormat } from "@/components/Generator/utils/index"
|
||||
export default {
|
||||
components: { Detail},
|
||||
props: [],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
detailVisible: false,
|
||||
loading: false,
|
||||
import { getConfigData } from '@/api/onlineDev/visualDev'
|
||||
import jnpf from '@/utils/jnpf'
|
||||
import Detail from '@/views/basic/dynamicModel/list/detail'
|
||||
import { thousandsFormat } from "@/components/Generator/utils/index"
|
||||
export default {
|
||||
components: { Detail },
|
||||
props: [],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
detailVisible: false,
|
||||
loading: false,
|
||||
|
||||
dataForm: {
|
||||
id :'',
|
||||
billNumbe : '',
|
||||
contractId : "",
|
||||
billStatus : "10",
|
||||
merchantId : '',
|
||||
startTime : '',
|
||||
endTime : '',
|
||||
billAmount : '',
|
||||
notificationMethod : "",
|
||||
noticeTime : '',
|
||||
notificationState : "2",
|
||||
payStatus : "1",
|
||||
payAmount : '',
|
||||
confirmPersonnel : '',
|
||||
confirmTime : "",
|
||||
billAttachment : [],
|
||||
contractName : '',
|
||||
merchantName : '',
|
||||
creationTime : "",
|
||||
contractNumber : '',
|
||||
billspacedetailList:[],
|
||||
billdevicedeatialList:[],
|
||||
billotherdeatialList:[],
|
||||
id: '',
|
||||
billNumbe: '',
|
||||
contractId: "",
|
||||
billStatus: "10",
|
||||
merchantId: '',
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
billAmount: '',
|
||||
notificationMethod: "",
|
||||
noticeTime: '',
|
||||
notificationState: "2",
|
||||
payStatus: "1",
|
||||
payAmount: '',
|
||||
confirmPersonnel: '',
|
||||
confirmTime: "",
|
||||
billAttachment: [],
|
||||
contractName: '',
|
||||
merchantName: '',
|
||||
creationTime: "",
|
||||
contractNumber: '',
|
||||
billspacedetailList: [],
|
||||
billdevicedeatialList: [],
|
||||
billotherdeatialList: [],
|
||||
},
|
||||
activegecbmb:'3KzarC2',
|
||||
billStatusOptions:[{"fullName":"待确认","id":"10"},{"fullName":"已确认","id":"20"},{"fullName":"已驳回","id":"30"},{"fullName":"部分结算","id":"40"},{"fullName":"已结算","id":"50"}],
|
||||
billStatusProps:{"label":"fullName","value":"id" },
|
||||
notificationMethodOptions:[{"fullName":"口头","id":"1"},{"fullName":"书面","id":"2"}],
|
||||
notificationMethodProps:{"label":"fullName","value":"id" },
|
||||
notificationStateOptions:[{"fullName":"未通知","id":"1"},{"fullName":"已通知","id":"2"}],
|
||||
notificationStateProps:{"label":"fullName","value":"id" },
|
||||
payStatusOptions:[{"fullName":"现金","id":"1"},{"fullName":"转账","id":"2"},{"fullName":"汇票","id":"3"}],
|
||||
payStatusProps:{"label":"fullName","value":"id" },
|
||||
activegecbmb: '1',
|
||||
billStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已驳回", "id": "30" }, { "fullName": "部分结算", "id": "40" }, { "fullName": "已结算", "id": "50" }],
|
||||
billStatusProps: { "label": "fullName", "value": "id" },
|
||||
notificationMethodOptions: [{ "fullName": "口头", "id": "1" }, { "fullName": "书面", "id": "2" }],
|
||||
notificationMethodProps: { "label": "fullName", "value": "id" },
|
||||
notificationStateOptions: [{ "fullName": "未通知", "id": "1" }, { "fullName": "已通知", "id": "2" }],
|
||||
notificationStateProps: { "label": "fullName", "value": "id" },
|
||||
payStatusOptions: [{ "fullName": "现金", "id": "1" }, { "fullName": "转账", "id": "2" }, { "fullName": "汇票", "id": "3" }],
|
||||
payStatusProps: { "label": "fullName", "value": "id" },
|
||||
|
||||
}
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
|
||||
},
|
||||
mounted() { },
|
||||
methods: {
|
||||
toDetail(defaultValue, modelId) {
|
||||
if (!defaultValue) return
|
||||
getConfigData(modelId).then(res => {
|
||||
if (!res.data || !res.data.formData) return
|
||||
let formData = JSON.parse(res.data.formData)
|
||||
formData.popupType = 'general'
|
||||
this.detailVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.Detail.init(formData, modelId, defaultValue)
|
||||
})
|
||||
})
|
||||
},
|
||||
dataInfo(dataAll) {
|
||||
let _dataAll = dataAll
|
||||
this.dataForm = _dataAll
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
|
||||
goBack() {
|
||||
this.$emit('refresh')
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
toDetail(defaultValue, modelId) {
|
||||
if (!defaultValue) return
|
||||
getConfigData(modelId).then(res => {
|
||||
if (!res.data || !res.data.formData) return
|
||||
let formData = JSON.parse(res.data.formData)
|
||||
formData.popupType = 'general'
|
||||
this.detailVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.Detail.init(formData, modelId, defaultValue)
|
||||
init(id) {
|
||||
this.dataForm.id = id || 0;
|
||||
this.visible = true;
|
||||
this.$nextTick(() => {
|
||||
if (this.dataForm.id) {
|
||||
this.loading = true
|
||||
request({
|
||||
url: '/api/example/BillTable/detail/' + this.dataForm.id,
|
||||
method: 'get'
|
||||
}).then(res => {
|
||||
this.dataInfo(res.data)
|
||||
this.loading = false
|
||||
})
|
||||
})
|
||||
},
|
||||
dataInfo(dataAll){
|
||||
let _dataAll =dataAll
|
||||
this.dataForm = _dataAll
|
||||
},
|
||||
}
|
||||
|
||||
goBack() {
|
||||
this.$emit('refresh')
|
||||
},
|
||||
init(id) {
|
||||
this.dataForm.id = id || 0;
|
||||
this.visible = true;
|
||||
this.$nextTick(() => {
|
||||
if(this.dataForm.id){
|
||||
this.loading = true
|
||||
request({
|
||||
url: '/api/example/BillTable/detail/'+this.dataForm.id,
|
||||
method: 'get'
|
||||
}).then(res => {
|
||||
this.dataInfo(res.data)
|
||||
this.loading = false
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
})
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,153 @@
|
||||
<template>
|
||||
<el-dialog title="选择空间" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
|
||||
lock-scroll append-to-body width="800px">
|
||||
<el-row class="JNPF-common-search-box" :gutter="16">
|
||||
<el-form @submit.native.prevent>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="关键词">
|
||||
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
|
||||
</el-button>
|
||||
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
<div class="JNPF-common-search-box-right">
|
||||
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
|
||||
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</el-row>
|
||||
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
|
||||
<el-table-column prop="leaseNumber" label="租赁单号" align="center" sortable>
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentNumber" label="设备编码" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column prop="equipmentName" label="设备名称" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" align="center" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatTimestamp(scope.row.startTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatTimestamp(scope.row.endTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalRentalPrice" label="租金总价" align="center">
|
||||
</el-table-column>
|
||||
</JNPF-table>
|
||||
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
|
||||
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import request from '@/utils/request'
|
||||
import {
|
||||
GoodsList
|
||||
} from '@/api/extend/order'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
listLoading: true,
|
||||
keyword: '',
|
||||
list: [],
|
||||
total: 0,
|
||||
listQuery: {
|
||||
superQueryJson: '',
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
sort: "desc",
|
||||
sidx: "",
|
||||
},
|
||||
excludeIdList: [],
|
||||
checked: [],
|
||||
contractId: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatTimestamp(timestamp) {
|
||||
const date = new Date(timestamp);
|
||||
return date.toLocaleString();
|
||||
},
|
||||
init(excludeIdList, contractId) {
|
||||
this.visible = true
|
||||
this.listLoading = true
|
||||
if (excludeIdList && excludeIdList instanceof Array) {
|
||||
this.excludeIdList = excludeIdList;
|
||||
}
|
||||
this.contractId = contractId
|
||||
let query = {
|
||||
...this.listQuery,
|
||||
keyword: this.keyword,
|
||||
excludeIdList: this.excludeIdList,
|
||||
contractId: contractId,
|
||||
}
|
||||
console.log();
|
||||
request({
|
||||
url: `/api/example/Contract/getDevicesById`,
|
||||
method: 'post',
|
||||
data: query,
|
||||
}).then(res => {
|
||||
this.list = res.data.list
|
||||
this.listLoading = false
|
||||
this.total = res.data.list.length
|
||||
if (res.data.list.length != 0) {
|
||||
this.contractId = res.data.list[0].id
|
||||
}
|
||||
})
|
||||
},
|
||||
refresh() {
|
||||
this.keyword = ''
|
||||
this.listQuery.currentPage = 1
|
||||
this.listQuery.pageSize = 20
|
||||
this.listQuery.sort = "desc"
|
||||
this.listQuery.sidx = ""
|
||||
this.init(this.excludeIdList, this.contractId)
|
||||
},
|
||||
search() {
|
||||
this.listQuery.currentPage = 1
|
||||
this.listQuery.pageSize = 20
|
||||
this.listQuery.sort = "desc"
|
||||
this.listQuery.sidx = ""
|
||||
this.init(this.excludeIdList, this.contractId)
|
||||
},
|
||||
select() {
|
||||
if (!this.checked.length) return
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList', this.checked)
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.checked = val
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
>>>.el-dialog__body {
|
||||
height: 70vh;
|
||||
padding: 0 0 10px !important;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
|
||||
.JNPF-common-search-box {
|
||||
margin-bottom: 0;
|
||||
|
||||
.JNPF-common-search-box-right {
|
||||
padding: 10px 10px 0 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,151 @@
|
||||
<template>
|
||||
<el-dialog title="选择空间" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
|
||||
lock-scroll append-to-body width="800px">
|
||||
<el-row class="JNPF-common-search-box" :gutter="16">
|
||||
<el-form @submit.native.prevent>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="关键词">
|
||||
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
|
||||
</el-button>
|
||||
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
<div class="JNPF-common-search-box-right">
|
||||
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
|
||||
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</el-row>
|
||||
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
|
||||
<el-table-column prop="spaceNumber" label="空间ID" align="center" sortable>
|
||||
</el-table-column>
|
||||
<el-table-column prop="spaceId" label="空间名称" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" align="center" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatTimestamp(scope.row.startTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endTime" label="结束时间" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatTimestamp(scope.row.endTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalRentalPrice" label="租金总价" align="center">
|
||||
</el-table-column>
|
||||
</JNPF-table>
|
||||
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
|
||||
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import request from '@/utils/request'
|
||||
import {
|
||||
GoodsList
|
||||
} from '@/api/extend/order'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
listLoading: true,
|
||||
keyword: '',
|
||||
list: [],
|
||||
total: 0,
|
||||
listQuery: {
|
||||
superQueryJson: '',
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
sort: "desc",
|
||||
sidx: "",
|
||||
},
|
||||
excludeIdList: [],
|
||||
checked: [],
|
||||
contractId: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatTimestamp(timestamp) {
|
||||
const date = new Date(timestamp);
|
||||
return date.toLocaleString();
|
||||
},
|
||||
init(excludeIdList, contractId) {
|
||||
this.visible = true
|
||||
this.listLoading = true
|
||||
if (excludeIdList && excludeIdList instanceof Array) {
|
||||
this.excludeIdList = excludeIdList;
|
||||
}
|
||||
this.contractId = contractId
|
||||
let query = {
|
||||
...this.listQuery,
|
||||
keyword: this.keyword,
|
||||
excludeIdList: this.excludeIdList,
|
||||
contractId: contractId,
|
||||
}
|
||||
console.log();
|
||||
request({
|
||||
url: `/api/example/Contract/getSpacesById`,
|
||||
method: 'post',
|
||||
data: query,
|
||||
}).then(res => {
|
||||
this.list = res.data.list
|
||||
this.listLoading = false
|
||||
this.total = res.data.list.length
|
||||
if (res.data.list.length != 0) {
|
||||
this.contractId = res.data.list[0].id
|
||||
}
|
||||
})
|
||||
},
|
||||
refresh() {
|
||||
this.keyword = ''
|
||||
this.listQuery.currentPage = 1
|
||||
this.listQuery.pageSize = 20
|
||||
this.listQuery.sort = "desc"
|
||||
this.listQuery.sidx = ""
|
||||
this.init(this.excludeIdList, this.contractId)
|
||||
},
|
||||
search() {
|
||||
this.listQuery.currentPage = 1
|
||||
this.listQuery.pageSize = 20
|
||||
this.listQuery.sort = "desc"
|
||||
this.listQuery.sidx = ""
|
||||
this.init(this.excludeIdList, this.contractId)
|
||||
},
|
||||
select() {
|
||||
if (!this.checked.length) return
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList', this.checked)
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.checked = val
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
>>>.el-dialog__body {
|
||||
height: 70vh;
|
||||
padding: 0 0 10px !important;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
|
||||
.JNPF-common-search-box {
|
||||
margin-bottom: 0;
|
||||
|
||||
.JNPF-common-search-box-right {
|
||||
padding: 10px 10px 0 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue