feat(front):前端样式调整;

master
jiyufei 3 months ago
parent 548524916b
commit 0adaeefb96

@ -14,14 +14,14 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="8"> <el-col :span="24">
<jnpf-form-tip-item label="账单号" prop="billNumbe"> <jnpf-form-tip-item label="账单号" prop="billNumbe">
<JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)" <JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'> placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="24">
<jnpf-form-tip-item label="账单状态" prop="billStatus"> <jnpf-form-tip-item label="账单状态" prop="billStatus">
<JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)" <JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)"
placeholder="请选择账单状态" clearable :style='{ "width": "100%" }' placeholder="请选择账单状态" clearable :style='{ "width": "100%" }'
@ -29,7 +29,7 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="24">
<jnpf-form-tip-item label="支付方式" prop="payStatus"> <jnpf-form-tip-item label="支付方式" prop="payStatus">
<JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)" <JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)"
placeholder="请选择支付方式" clearable :style='{ "width": "100%" }' placeholder="请选择支付方式" clearable :style='{ "width": "100%" }'
@ -37,14 +37,14 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="24">
<jnpf-form-tip-item label="支付金额" prop="payAmount"> <jnpf-form-tip-item label="支付金额" prop="payAmount">
<JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)" <JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)"
placeholder="支付金额" :step="1"> placeholder="支付金额" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="24">
<jnpf-form-tip-item label="相关附件" prop="billAttachment"> <jnpf-form-tip-item label="相关附件" prop="billAttachment">
<JnpfUploadFile v-model="dataForm.billAttachment" <JnpfUploadFile v-model="dataForm.billAttachment"
@change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9" @change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9"

@ -63,57 +63,58 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" @row-click="handleRowClick"> :span-method="arraySpanMethod" @row-click="handleRowClick" border>
<el-table-column width="55" align="center"> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column width="50" align="center" fixed="left" >
<template slot-scope="scope"> <template slot-scope="scope">
<input type="radio" :value="scope.row.id" v-model="selectedRowId" <input type="radio" :value="scope.row.id" v-model="selectedRowId"
@change="handleSelectionChange"> @change="handleSelectionChange">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contractNumber" label="合同编号" align="left"> <el-table-column prop="contractNumber" label="合同编号" align="center"width="150"fixed="left" >
</el-table-column> </el-table-column>
<el-table-column prop="contractId" label="合同名称" align="left"> <el-table-column prop="contractId" label="合同名称" align="center"width="200"fixed="left" >
</el-table-column> </el-table-column>
<el-table-column prop="merchantId" label="商户名称" align="left"> <el-table-column prop="merchantId" label="商户名称" align="center"width="200"fixed="left" >
</el-table-column> </el-table-column>
<el-table-column label="账单状态" prop="billStatus" algin="left"> <el-table-column label="账单状态" prop="billStatus" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.billStatus }} {{ scope.row.billStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="billAmount" label="账单金额" align="left"> <el-table-column prop="billAmount" label="账单金额" align="center"width="150">
<template slot-scope="scope" v-if="scope.row.billAmount"> <template slot-scope="scope" v-if="scope.row.billAmount">
<JnpfNumber v-model="scope.row.billAmount" :thousands="false" /> <JnpfNumber v-model="scope.row.billAmount" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="payStatus" algin="left"> <el-table-column label="支付方式" prop="payStatus" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.payStatus }} {{ scope.row.payStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payAmount" label="支付金额" align="left"> <el-table-column prop="payAmount" label="支付金额" align="center"width="150">
<template slot-scope="scope" v-if="scope.row.payAmount"> <template slot-scope="scope" v-if="scope.row.payAmount">
<JnpfNumber v-model="scope.row.payAmount" :thousands="false" /> <JnpfNumber v-model="scope.row.payAmount" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="通知方式" prop="notificationMethod" algin="left"> <el-table-column label="通知方式" prop="notificationMethod" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.notificationMethod }} {{ scope.row.notificationMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="通知状态" prop="notificationState" algin="left"> <el-table-column label="通知状态" prop="notificationState" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.notificationState }} {{ scope.row.notificationState }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="noticeTime" label="通知时间" align="left"> <el-table-column prop="noticeTime" label="通知时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="confirmPersonnel" label="确认人" align="left"> <el-table-column prop="confirmPersonnel" label="确认人" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="confirmTime" label="确认时间" align="left"> <el-table-column prop="confirmTime" label="确认时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
@ -124,7 +125,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </el-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> @pagination="initData" />
</div> </div>

@ -2,7 +2,7 @@
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack"/>变更合同 <el-page-header @back="goBack" />变更合同
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
@ -58,10 +58,10 @@
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="签订日期" prop="signingDate"> <jnpf-form-tip-item label="签订日期" prop="signingDate">
<JnpfDatePicker v-model="dataForm.signingDate" disabled @change="changeData('signingDate', -1)" <JnpfDatePicker v-model="dataForm.signingDate" disabled
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" @change="changeData('signingDate', -1)" :startTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择签订日期" clearable :style='{ "width": "100%" }' type="date" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择签订日期" clearable
format="yyyy-MM-dd"> :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -75,9 +75,10 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="商户名称" prop="merchantName"> <jnpf-form-tip-item label="商户名称" prop="merchantName">
<JnpfSelect v-model="dataForm.merchantName" disabled @change="changeData('merchantName', -1)" <JnpfSelect v-model="dataForm.merchantName" disabled
placeholder="请选择" clearable :style='{ "width": "100%" }' filterable @change="changeData('merchantName', -1)" placeholder="请选择" clearable
:options="merchantNameOptions" :props="merchantNameProps"> :style='{ "width": "100%" }' filterable :options="merchantNameOptions"
:props="merchantNameProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -201,19 +202,19 @@
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="空间名称" prop="spaceName"> <el-table-column label="空间名称" prop="spaceId">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>空间名称 <span class="required-sign">*</span>空间名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.spaceName" <JnpfPopupSelect v-model="scope.row.spaceId"
@change="changeData('spacecontract-spaceName', scope.$index)" @change="changeData('spacecontract-spaceId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm" :rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.spacecontractspaceName" placeholder="请选择" :templateJson="interfaceRes.spacecontractspaceId" placeholder="请选择空间"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
relationField='name' :field="'spaceName' + scope.$index" popupType="dialog" relationField='name' :field="'spaceId' + scope.$index"
interfaceId="582491427901014533" :pageSize="20" interfaceId="584015452494104389" :pageSize="20"
:columnOptions="spacecontractspaceNamecolumnOptions" clearable :columnOptions="spacecontractspaceIdcolumnOptions" disabled clearable
:style='{ "width": "100%" }'> :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
@ -236,7 +237,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.totalRentalPrice" <JnpfInput v-model="scope.row.totalRentalPrice"
@change="changeData('spacecontract-totalRentalPrice', scope.$index)" @change="changeData('spacecontract-totalRentalPrice', scope.$index)"
placeholder="请输入租金总价" clearable :style='{ "width": "100%" }'> placeholder="请输入租金总价" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
@ -667,7 +668,7 @@ export default {
let template = { let template = {
paramList: templateJsonList paramList: templateJsonList
} }
getDataInterfaceRes('582491427901014533', template).then(res => { getDataInterfaceRes('584015452494104389', template).then(res => {
let data = res.data let data = res.data
this.parkIdOptions = data this.parkIdOptions = data
this.changeDataFormData(1, 'parkId', 'parkId', index, '') this.changeDataFormData(1, 'parkId', 'parkId', index, '')
@ -761,26 +762,26 @@ export default {
} else { } else {
this.btnLoading = true this.btnLoading = true
} }
request({ request({
url: '/api/example/Contract/' + this.dataForm.id, url: '/api/example/Contract/' + this.dataForm.id,
method: 'PUT', method: 'PUT',
data: _data data: _data
}).then((res) => { }).then((res) => {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: 'success', type: 'success',
duration: 1000, duration: 1000,
onClose: () => { onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false this.visible = false
this.btnLoading = false this.btnLoading = false
this.$emit('refresh', true) this.$emit('refresh', true)
} }
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
}) })
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}, },
addspacecontractList() { addspacecontractList() {
let item = { let item = {

@ -79,61 +79,62 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" @row-click="handleRowClick"> :span-method="arraySpanMethod" @row-click="handleRowClick" border>
<el-table-column width="55" align="center"> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column width="50" align="center" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="radio" :value="scope.row.id" v-model="selectedRowId" <input type="radio" :value="scope.row.id" v-model="selectedRowId"
@change="handleSelectionChange"> @change="handleSelectionChange">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contractNumber" label="合同编号" align="left"> <el-table-column prop="contractNumber" label="合同编号" align="center"width="150"fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="contractName" label="合同名称" align="left"> <el-table-column prop="contractName" label="合同名称" align="center"width="150"fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="合同状态" prop="contractStatus" algin="left"> <el-table-column label="合同状态" prop="contractStatus" align="center"width="150"fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.contractStatus }} {{ scope.row.contractStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="parkId" label="园区名称" align="left"> <el-table-column prop="parkId" label="园区名称" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="merchantName" label="商户名称" align="left"> <el-table-column prop="merchantName" label="商户名称" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="signingDate" label="签订日期" align="left"> <el-table-column prop="signingDate" label="签订日期" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="leaseTerm" label="租期" align="left"> <el-table-column prop="leaseTerm" label="租期" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left"> <el-table-column prop="startTime" label="开始时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left"> <el-table-column prop="endTime" label="结束时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="contacts" label="联系人" align="left"> <el-table-column prop="contacts" label="联系人" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left"> <el-table-column prop="contactsPhone" label="联系电话" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="totalRentalPrice" label="租金总价" align="left"> <el-table-column prop="totalRentalPrice" label="租金总价" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="计价方式" prop="pricingMethod" algin="left"> <el-table-column label="计价方式" prop="pricingMethod" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.pricingMethod }} {{ scope.row.pricingMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalDeposit" label="押金总计" align="left"> <el-table-column prop="totalDeposit" label="押金总计" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="payDeposit" algin="left"> <el-table-column label="支付方式" prop="payDeposit" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.payDeposit }} {{ scope.row.payDeposit }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退还方式" prop="returnDeposit" algin="left"> <el-table-column label="退还方式" prop="returnDeposit" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.returnDeposit }} {{ scope.row.returnDeposit }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contractExplain" label="合同说明" align="left"> <el-table-column prop="contractExplain" label="合同说明" align="center"width="300">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="180"> <el-table-column label="操作" fixed="right" width="180"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-show="scope.row.contractStatus === ''" <el-button type="text" v-show="scope.row.contractStatus === ''"
@click="addOrUpdateHandle(scope.row)">编辑 @click="addOrUpdateHandle(scope.row)">编辑
@ -148,7 +149,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </el-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> @pagination="initData" />
</div> </div>

@ -25,12 +25,12 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="预计开始时间" prop="expectedStartTime"> <jnpf-form-tip-item label="开始时间" prop="expectedStartTime">
<p>{{ dataForm.expectedStartTime }}</p> <p>{{ dataForm.expectedStartTime }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="预计结束时间" prop="expectedEndTime"> <jnpf-form-tip-item label="结束时间" prop="expectedEndTime">
<p>{{ dataForm.expectedEndTime }}</p> <p>{{ dataForm.expectedEndTime }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>

@ -48,7 +48,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="预计开始时间" prop="expectedStartTime"> <jnpf-form-tip-item label="开始时间" prop="expectedStartTime">
<JnpfDatePicker v-model="dataForm.expectedStartTime" <JnpfDatePicker v-model="dataForm.expectedStartTime"
@change="changeData('expectedStartTime', -1)" :startTime="dateTime(false, 1, 1, '', '')" @change="changeData('expectedStartTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计开始时间" clearable :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计开始时间" clearable
@ -58,7 +58,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="预计结束时间" prop="expectedEndTime"> <jnpf-form-tip-item label="结束时间" prop="expectedEndTime">
<JnpfDatePicker v-model="dataForm.expectedEndTime" <JnpfDatePicker v-model="dataForm.expectedEndTime"
@change="changeData('expectedEndTime', -1)" :startTime="dateTime(false, 1, 1, '', '')" @change="changeData('expectedEndTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计结束时间" clearable :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计结束时间" clearable

@ -61,39 +61,40 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="applicationNumber" label="申请单号" align="left"> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column prop="applicationNumber" label="申请单号" align="center" fixed="left"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="merchantId" label="商户名称" align="left"> <el-table-column prop="merchantId" label="商户名称" align="center" fixed="left"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="contractId" label="合同名称" align="left"> <el-table-column prop="contractId" label="合同名称" align="center"fixed="left"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="spaceId" label="空间名称" align="left"> <el-table-column prop="spaceId" label="空间名称" align="center"fixed="left"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="expectedStartTime" label="预计开始时间" align="left"> <el-table-column prop="expectedStartTime" label="预计开始时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="expectedEndTime" label="预计结束时间" align="left"> <el-table-column prop="expectedEndTime" label="预计结束时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="depositAmount" label="押金金额" align="left"> <el-table-column prop="depositAmount" label="押金金额" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="押金是否退回" prop="isTheDepositRefunded" algin="left"> <el-table-column label="押金是否退回" prop="isTheDepositRefunded" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.isTheDepositRefunded }} {{ scope.row.isTheDepositRefunded }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="depositRefundDate" label="押金退回日期" align="left"> <el-table-column prop="depositRefundDate" label="押金退回日期" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="装修进度" prop="decorationProgress" algin="left"> <el-table-column label="装修进度" prop="decorationProgress" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.decorationProgress }} {{ scope.row.decorationProgress }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contacts" label="联系人" align="left"> <el-table-column prop="contacts" label="联系人" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left"> <el-table-column prop="contactsPhone" label="联系电话" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-show="scope.row.decorationProgress != '已装修'" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-show="scope.row.decorationProgress != '已装修'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
@ -103,7 +104,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </el-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> @pagination="initData" />
</div> </div>

@ -1,179 +1,164 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="1000px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="设备编码" prop="code">
<el-col :span="8" > <p>{{ dataForm.code }}</p>
<jnpf-form-tip-item label="设备编码" </jnpf-form-tip-item>
prop="code" > </el-col>
<p>{{dataForm.code}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="设备名称" prop="name">
</el-col> <p>{{ dataForm.name }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="设备名称" </el-col>
prop="name" > <el-col :span="8">
<p>{{dataForm.name}}</p> <jnpf-form-tip-item label="设备类型" prop="type">
</jnpf-form-tip-item> <p>{{ dataForm.type }} </p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="设备类型" <el-col :span="8">
prop="type" > <jnpf-form-tip-item label="设备品牌" prop="brand">
<p>{{ dataForm.type }} </p> <p>{{ dataForm.brand }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="设备品牌" <jnpf-form-tip-item label="设备型号" prop="model">
prop="brand" > <p>{{ dataForm.model }}</p>
<p>{{dataForm.brand}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="批次号" prop="batchNumber">
<jnpf-form-tip-item label="设备型号" <p>{{ dataForm.batchNumber }}</p>
prop="model" > </jnpf-form-tip-item>
<p>{{dataForm.model}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="8">
</el-col> <jnpf-form-tip-item label="供应商" prop="supplier">
<el-col :span="8" > <p>{{ dataForm.supplier }}</p>
<jnpf-form-tip-item label="批次号" </jnpf-form-tip-item>
prop="batchNumber" > </el-col>
<p>{{dataForm.batchNumber}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="联系电话" prop="supplierPhone">
</el-col> <p>{{ dataForm.supplierPhone }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="供应商" </el-col>
prop="supplier" > <el-col :span="8">
<p>{{dataForm.supplier}}</p> <jnpf-form-tip-item label="设备状态" prop="status">
</jnpf-form-tip-item> <p>{{ dataForm.status }} </p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="供应商联系电话" <el-col :span="8">
prop="supplierPhone" > <jnpf-form-tip-item label="保修期" prop="defectsLiabilityPeriod">
<p>{{dataForm.supplierPhone}}</p> <p>{{ dataForm.defectsLiabilityPeriod }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="设备状态" <jnpf-form-tip-item label="开始时间" prop="warrantyStartTime">
prop="status" > <p>{{ dataForm.warrantyStartTime }}</p>
<p>{{ dataForm.status }} </p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="结束时间" prop="warrantyEndTime">
<jnpf-form-tip-item label="保修期" <p>{{ dataForm.warrantyEndTime }}</p>
prop="defectsLiabilityPeriod" > </jnpf-form-tip-item>
<p>{{dataForm.defectsLiabilityPeriod}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="设备描述" prop="description">
<el-col :span="8" > <p>{{ dataForm.description }}</p>
<jnpf-form-tip-item label="保修开始时间" </jnpf-form-tip-item>
prop="warrantyStartTime" > </el-col>
<p>{{dataForm.warrantyStartTime}}</p> </template>
</jnpf-form-tip-item> </el-form>
</el-col> </el-row>
<el-col :span="8" > <span slot="footer" class="dialog-footer">
<jnpf-form-tip-item label="保修结束时间" <el-button @click="visible = false"> </el-button>
prop="warrantyEndTime" > </span>
<p>{{dataForm.warrantyEndTime}}</p> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="设备描述"
prop="description" >
<p>{{dataForm.description}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
code : '', code: '',
name : '', name: '',
type : "", type: "",
brand : '', brand: '',
model : '', model: '',
batchNumber : '', batchNumber: '',
supplier : '', supplier: '',
supplierPhone : '', supplierPhone: '',
status : "1", status: "1",
defectsLiabilityPeriod : '', defectsLiabilityPeriod: '',
warrantyStartTime : '', warrantyStartTime: '',
warrantyEndTime : '', warrantyEndTime: '',
description : '', description: '',
}, },
typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}], typeOptions: [{ "fullName": "类型1", "id": "10" }, { "fullName": "类型2", "id": "20" }],
typeProps:{"label":"fullName","value":"id" }, typeProps: { "label": "fullName", "value": "id" },
statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}], statusOptions: [{ "fullName": "可用", "id": "1" }, { "fullName": "已租", "id": "2" }, { "fullName": "报废", "id": "3" }],
statusProps:{"label":"fullName","value":"id" }, statusProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/Equipment/detail/'+this.dataForm.id, url: '/api/example/Equipment/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -56,7 +56,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="供应商联系电话" prop="supplierPhone"> <jnpf-form-tip-item label="联系电话" prop="supplierPhone">
<JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" placeholder="请输入" <JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" placeholder="请输入"
clearable :style='{"width":"100%"}'> clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
@ -78,7 +78,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="保修开始时间" prop="warrantyStartTime"> <jnpf-form-tip-item label="开始时间" prop="warrantyStartTime">
<JnpfDatePicker v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime',-1)" <JnpfDatePicker v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"> :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
@ -87,7 +87,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="保修结束时间" prop="warrantyEndTime"> <jnpf-form-tip-item label="结束时间" prop="warrantyEndTime">
<JnpfDatePicker v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime',-1)" <JnpfDatePicker v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"> :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">

@ -57,40 +57,41 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"> <el-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
<el-table-column prop="code" label="设备编码" align="left"> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column prop="code" label="设备编码" align="center"width="150"fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="设备名称" align="left"> <el-table-column prop="name" label="设备名称" align="center"width="150"fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="设备状态" prop="status" algin="left"> <el-table-column label="设备状态" prop="status" align="center"width="150"fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status}} {{ scope.row.status}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="batchNumber" label="批次号" align="left"> <el-table-column prop="batchNumber" label="批次号" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="设备类型" prop="type" algin="left"> <el-table-column label="设备类型" prop="type" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.type}} {{ scope.row.type}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="brand" label="设备品牌" align="left"> <el-table-column prop="brand" label="设备品牌" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="model" label="设备型号" align="left"> <el-table-column prop="model" label="设备型号" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="supplier" label="供应商" align="left"> <el-table-column prop="supplier" label="供应商" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="supplierPhone" label="供应商联系电话" align="left"> <el-table-column prop="supplierPhone" label="供应商联系电话" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="warrantyStartTime" label="保修开始时间" align="left"> <el-table-column prop="warrantyStartTime" label="保修开始时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="warrantyEndTime" label="保修结束时间" align="left"> <el-table-column prop="warrantyEndTime" label="保修结束时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="defectsLiabilityPeriod" label="保修期" align="left"> <el-table-column prop="defectsLiabilityPeriod" label="保修期" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="description" label="设备描述" align="left"> <el-table-column prop="description" label="设备描述" align="center"width="200">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="200"> <el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
@ -102,7 +103,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </el-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> @pagination="initData" />
</div> </div>

@ -55,21 +55,21 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
<el-table-column prop="inspectionTicketNumber" label="巡检单号" align="left"> <el-table-column prop="inspectionTicketNumber" label="巡检单号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="spaceName" label="空间名称" align="left"> <el-table-column prop="spaceName" label="空间名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentNumber" label="设备编码" align="left"> <el-table-column prop="equipmentNumber" label="设备编码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentName" label="设备名称" align="left"> <el-table-column prop="equipmentName" label="设备名称" align="center">
</el-table-column> </el-table-column>
<el-table-column label="设备状态" prop="equipmentStatus" algin="left"> <el-table-column label="设备状态" prop="equipmentStatus" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.equipmentStatus}} {{ scope.row.equipmentStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>

@ -1,194 +1,177 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="1000px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="维修单号" prop="repairOrderNumber">
<el-col :span="8" > <p>{{ dataForm.repairOrderNumber }}</p>
<jnpf-form-tip-item label="维修单号" </jnpf-form-tip-item>
prop="repairOrderNumber" > </el-col>
<p>{{dataForm.repairOrderNumber}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="报修单" prop="repairOrderId">
</el-col> <p>{{ dataForm.repairOrderId }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="报修单" </el-col>
prop="repairOrderId" > <el-col :span="8">
<p>{{dataForm.repairOrderId}}</p> <jnpf-form-tip-item label="设备编码" prop="number">
</jnpf-form-tip-item> <p>{{ dataForm.number }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="设备编码" <el-col :span="8">
prop="number" > <jnpf-form-tip-item label="设备名称" prop="name">
<p>{{dataForm.number}}</p> <p>{{ dataForm.name }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="设备名称" <jnpf-form-tip-item label="维修方式" prop="maintenanceMethods">
prop="name" > <p>{{ dataForm.maintenanceMethods }} </p>
<p>{{dataForm.name}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="维修进度" prop="maintenancePlan">
<jnpf-form-tip-item label="维修方式" <p>{{ dataForm.maintenancePlan }} </p>
prop="maintenanceMethods" > </jnpf-form-tip-item>
<p>{{ dataForm.maintenanceMethods }} </p> </el-col>
</jnpf-form-tip-item> <el-col :span="8">
</el-col> <jnpf-form-tip-item label="维修人" prop="maintenancePersonnel">
<el-col :span="8" > <p>{{ dataForm.maintenancePersonnel }}</p>
<jnpf-form-tip-item label="维修进度" </jnpf-form-tip-item>
prop="maintenancePlan" > </el-col>
<p>{{ dataForm.maintenancePlan }} </p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="维修时间" prop="maintenanceDate">
</el-col> <p>{{ dataForm.maintenanceDate }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="维修人" </el-col>
prop="maintenancePersonnel" > <el-col :span="8">
<p>{{dataForm.maintenancePersonnel}}</p> <jnpf-form-tip-item label="是否有费用" prop="expensesIncurred">
</jnpf-form-tip-item> <p>{{ dataForm.expensesIncurred }} </p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="维修时间" <el-col :span="8">
prop="maintenanceDate" > <jnpf-form-tip-item label="费用金额" prop="costAmount">
<p>{{dataForm.maintenanceDate}}</p> <p>{{ dataForm.costAmount }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="是否产生费用" <jnpf-form-tip-item label="是否计入租户账单" prop="tenantBill">
prop="expensesIncurred" > <p>{{ dataForm.tenantBill }} </p>
<p>{{ dataForm.expensesIncurred }} </p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="费用说明" prop="costDetail">
<jnpf-form-tip-item label="费用金额" <p>{{ dataForm.costDetail }}</p>
prop="costAmount" > </jnpf-form-tip-item>
<p>{{dataForm.costAmount}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="维修描述" prop="maintenanceDescribe">
<el-col :span="8" > <p>{{ dataForm.maintenanceDescribe }}</p>
<jnpf-form-tip-item label="是否计入租户账单" </jnpf-form-tip-item>
prop="tenantBill" > </el-col>
<p>{{ dataForm.tenantBill }} </p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="维修照片" prop="repairPhoto">
</el-col> <JnpfUploadImg v-model="dataForm.repairPhoto" disabled detailed :fileSize="10" sizeUnit="MB"
<el-col :span="8" > :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="费用说明" </JnpfUploadImg>
prop="costDetail" > </jnpf-form-tip-item>
<p>{{dataForm.costDetail}}</p> </el-col>
</jnpf-form-tip-item> </template>
</el-col> </el-form>
<el-col :span="24" > </el-row>
<jnpf-form-tip-item label="维修描述" <span slot="footer" class="dialog-footer">
prop="maintenanceDescribe" > <el-button @click="visible = false"> </el-button>
<p>{{dataForm.maintenanceDescribe}}</p> </span>
</jnpf-form-tip-item> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="维修照片"
prop="repairPhoto" >
<JnpfUploadImg v-model="dataForm.repairPhoto"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
repairOrderNumber : '', repairOrderNumber: '',
repairOrderId : "", repairOrderId: "",
number : '', number: '',
name : '', name: '',
maintenanceMethods : "1", maintenanceMethods: "1",
maintenancePlan : "2", maintenancePlan: "2",
maintenancePersonnel : '', maintenancePersonnel: '',
maintenanceDate : '', maintenanceDate: '',
expensesIncurred : "2", expensesIncurred: "2",
costAmount : '', costAmount: '',
tenantBill : "2", tenantBill: "2",
costDetail : '', costDetail: '',
maintenanceDescribe : '', maintenanceDescribe: '',
repairPhoto : [], repairPhoto: [],
equipmentId : '', equipmentId: '',
}, },
maintenanceMethodsOptions:[{"fullName":"保修期内","id":"1"},{"fullName":"更换配件","id":"2"},{"fullName":"更换设备","id":"3"}], maintenanceMethodsOptions: [{ "fullName": "保修期内", "id": "1" }, { "fullName": "更换配件", "id": "2" }, { "fullName": "更换设备", "id": "3" }],
maintenanceMethodsProps:{"label":"fullName","value":"id" }, maintenanceMethodsProps: { "label": "fullName", "value": "id" },
maintenancePlanOptions:[{"fullName":"维修中","id":"1"},{"fullName":"已维修","id":"2"}], maintenancePlanOptions: [{ "fullName": "维修中", "id": "1" }, { "fullName": "已维修", "id": "2" }],
maintenancePlanProps:{"label":"fullName","value":"id" }, maintenancePlanProps: { "label": "fullName", "value": "id" },
expensesIncurredOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}], expensesIncurredOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
expensesIncurredProps:{"label":"fullName","value":"id" }, expensesIncurredProps: { "label": "fullName", "value": "id" },
tenantBillOptions:[{"fullName":"是 ","id":"1"},{"fullName":"否","id":"2"}], tenantBillOptions: [{ "fullName": "是 ", "id": "1" }, { "fullName": "否", "id": "2" }],
tenantBillProps:{"label":"fullName","value":"id" }, tenantBillProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/EquipmentMaintenanceRecords/detail/'+this.dataForm.id, url: '/api/example/EquipmentMaintenanceRecords/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -1,53 +1,44 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="维修时间"> <el-form-item label="维修时间">
<JnpfDateRangePicker v-model="query.maintenanceDate" <JnpfDateRangePicker v-model="query.maintenanceDate" format="yyyy-MM-dd"
format="yyyy-MM-dd" startPlaceholder="开始日期" startPlaceholder="开始日期" endPlaceholder="结束日期">
endPlaceholder="结束日期" > </JnpfDateRangePicker>
</JnpfDateRangePicker> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6">
<el-col :span="6"> <el-form-item label="设备编码">
<el-form-item label="设备编码"> <el-input v-model="query.number" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.number" placeholder="请输入" clearable> </el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6">
<el-col :span="6"> <el-form-item label="设备名称">
<el-form-item label="设备名称"> <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.name" placeholder="请输入" clearable> </el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <template v-if="showAll">
<template v-if="showAll"> <el-col :span="6">
<el-col :span="6"> <el-form-item label="维修进度">
<el-form-item label="维修进度"> <JnpfSelect v-model="query.maintenancePlan" placeholder="请选择" clearable
<JnpfSelect v-model="query.maintenancePlan" placeholder="请选择" clearable :options="maintenancePlanOptions" :props="maintenancePlanProps" multiple>
:options="maintenancePlanOptions" </JnpfSelect>
:props="maintenancePlanProps" multiple > </el-form-item>
</JnpfSelect> </el-col>
</el-form-item> </template>
</el-col>
</template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -55,485 +46,454 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod" border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
> <el-table-column prop="repairOrderNumber" label="维修单号" align="center" width="150"fixed="left">
<el-table-column </el-table-column>
prop="repairOrderNumber" <el-table-column prop="number" label="设备编码" align="center"width="150"fixed="left">
label="维修单号" align="left" </el-table-column>
> <el-table-column prop="name" label="设备名称" align="center"width="150"fixed="left">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="maintenancePersonnel" label="维修人" align="center"width="150">
prop="number" </el-table-column>
label="设备编码" align="left" <el-table-column prop="maintenanceDate" label="维修时间" align="center"width="150">
> </el-table-column>
</el-table-column> <el-table-column label="维修方式" prop="maintenanceMethods" align="center"width="150">
<el-table-column <template slot-scope="scope">
prop="name" {{ scope.row.maintenanceMethods }}
label="设备名称" align="left" </template>
> </el-table-column>
</el-table-column> <el-table-column label="维修进度" prop="maintenancePlan" align="center"width="150">
<el-table-column <template slot-scope="scope">
prop="maintenancePersonnel" {{ scope.row.maintenancePlan }}
label="维修人" align="left" </template>
> </el-table-column>
</el-table-column> <el-table-column label="是否产生费用" prop="expensesIncurred" align="center"width="150">
<el-table-column <template slot-scope="scope">
prop="maintenanceDate" {{ scope.row.expensesIncurred }}
label="维修时间" align="left" </template>
> </el-table-column>
</el-table-column> <el-table-column prop="costAmount" label="费用金额" align="center"width="150">
<el-table-column label="维修方式" prop="maintenanceMethods" algin="left" </el-table-column>
> <el-table-column prop="costDetail" label="费用说明" align="center"width="150">
<template slot-scope="scope"> </el-table-column>
{{ scope.row.maintenanceMethods}} <el-table-column label="是否计入租户账单" prop="tenantBill" align="center"width="150">
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.tenantBill }}
<el-table-column </template>
prop="maintenanceDescribe" </el-table-column>
label="维修描述" align="left" <el-table-column prop="maintenanceDescribe" label="维修描述" align="center"width="300">
> </el-table-column>
</el-table-column> <el-table-column label="操作" fixed="right" width="150" align="center">
<el-table-column label="维修进度" prop="maintenancePlan" algin="left" <template slot-scope="scope">
> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
<template slot-scope="scope"> </el-button>
{{ scope.row.maintenancePlan}} <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</template> </el-button>
</el-table-column> <el-button type="text" @click="goDetail(scope.row.id)">
<el-table-column label="是否产生费用" prop="expensesIncurred" algin="left" </el-button>
> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.expensesIncurred}} </el-table>
</template> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
</el-table-column> @pagination="initData" />
<el-table-column </div>
prop="costAmount"
label="费用金额" align="left"
>
</el-table-column>
<el-table-column
prop="costDetail"
label="费用说明" align="left"
>
</el-table-column>
<el-table-column label="是否计入租户账单" prop="tenantBill" algin="left"
>
<template slot-scope="scope">
{{ scope.row.tenantBill}}
</template>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
</div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
showAll: false, showAll: false,
superQueryVisible: false, superQueryVisible: false,
superQueryJson, superQueryJson,
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
maintenanceDate:undefined, maintenanceDate: undefined,
number:undefined, number: undefined,
name:undefined, name: undefined,
maintenancePlan:undefined, maintenancePlan: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
label: 'fullName', label: 'fullName',
value: 'id', value: 'id',
isLeaf: 'isLeaf' isLeaf: 'isLeaf'
}, },
list: [], list: [],
listLoading: true, listLoading: true,
total: 0, total: 0,
queryData: {}, queryData: {},
listQuery: { listQuery: {
superQueryJson: '', superQueryJson: '',
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: "desc",
sidx: "", sidx: "",
}, },
formVisible: false, formVisible: false,
flowVisible: false, flowVisible: false,
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
maintenanceMethodsOptions:[{"fullName":"保修期内","id":"1"},{"fullName":"更换配件","id":"2"},{"fullName":"更换设备","id":"3"}], maintenanceMethodsOptions: [{ "fullName": "保修期内", "id": "1" }, { "fullName": "更换配件", "id": "2" }, { "fullName": "更换设备", "id": "3" }],
maintenanceMethodsProps:{"label":"fullName","value":"id" }, maintenanceMethodsProps: { "label": "fullName", "value": "id" },
maintenancePlanOptions:[{"fullName":"维修中","id":"1"},{"fullName":"已维修","id":"2"}], maintenancePlanOptions: [{ "fullName": "维修中", "id": "1" }, { "fullName": "已维修", "id": "2" }],
maintenancePlanProps:{"label":"fullName","value":"id" }, maintenancePlanProps: { "label": "fullName", "value": "id" },
expensesIncurredOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}], expensesIncurredOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
expensesIncurredProps:{"label":"fullName","value":"id" }, expensesIncurredProps: { "label": "fullName", "value": "id" },
tenantBillOptions:[{"fullName":"是 ","id":"1"},{"fullName":"否","id":"2"}], tenantBillOptions: [{ "fullName": "是 ", "id": "1" }, { "fullName": "否", "id": "2" }],
tenantBillProps:{"label":"fullName","value":"id" }, tenantBillProps: { "label": "fullName", "value": "id" },
interfaceRes: { interfaceRes: {
repairOrderId:[] , repairOrderId: [],
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
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.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
}, },
toggleTreeExpand(expands) { }
this.refreshTree = false },
this.expandsTree = expands computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
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.toFormDetailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTree = true this.$refs.toFormDetail.init(formData, modelId, defaultValue)
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
}) })
}, })
filterNode(value, data) { },
if (!value) return true; toggleTreeExpand(expands) {
return data[this.treeProps.label].indexOf(value) !== -1; this.refreshTree = false
}, this.expandsTree = expands
loadNode(node, resolve) { this.$nextTick(() => {
const nodeData = node.data this.refreshTree = true
const config ={ this.$nextTick(() => {
treeInterfaceId:"", this.$refs.treeBox.setCurrentKey(null)
treeTemplateJson:[] })
} })
if (config.treeInterfaceId) { },
// filterNode(value, data) {
if (config.treeTemplateJson && config.treeTemplateJson.length) { if (!value) return true;
for (let i = 0; i < config.treeTemplateJson.length; i++) { return data[this.treeProps.label].indexOf(value) !== -1;
const element = config.treeTemplateJson[i]; },
element.defaultValue = nodeData[element.relationField] || '' loadNode(node, resolve) {
} const nodeData = node.data
} const config = {
// treeInterfaceId: "",
let query = { treeTemplateJson: []
paramList: config.treeTemplateJson || [], }
} if (config.treeInterfaceId) {
// //
getDataInterfaceRes(config.treeInterfaceId, query).then(res => { if (config.treeTemplateJson && config.treeTemplateJson.length) {
let data = res.data for (let i = 0; i < config.treeTemplateJson.length; i++) {
if (Array.isArray(data)) { const element = config.treeTemplateJson[i];
resolve(data); element.defaultValue = nodeData[element.relationField] || ''
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
} }
} }
this.getMergeList(list) //
this.getExportList(list) let query = {
return list paramList: config.treeTemplateJson || [],
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
} }
}, //
getMergeList(list) { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let newList = JSON.parse(JSON.stringify(list)) let data = res.data
newList.forEach(item => { if (Array.isArray(data)) {
if (item.children && item.children.length) { resolve(data);
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else { } else {
this.mergeList.push({ resolve([]);
prop: item.prop,
rowspan: 1,
colspan: 1
})
} }
}) })
}, }
getExportList(list) { },
let exportList = [] getColumnList() {
for (let i = 0; i < list.length; i++) { //
if (list[i].jnpfKey === 'table') { this.columnOptions = this.transformColumnList(this.columnList)
for (let j = 0; j < list[i].children.length; j++) { },
exportList.push(list[i].children[j]) transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
} }
} else {
exportList.push(list[i])
} }
} }
this.exportList = exportList }
}, this.getMergeList(list)
goDetail(id){ this.getExportList(list)
this.detailVisible = true return list
this.$nextTick(() => { },
this.$refs.Detail.init(id) arraySpanMethod({ column }) {
}) for (let i = 0; i < this.mergeList.length; i++) {
}, if (column.property == this.mergeList[i].prop) {
sortChange({column, prop, order}) { return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' }
this.listQuery.sidx = !order ? '' : prop }
this.initData() },
}, getMergeList(list) {
async initSearchDataAndListData() { let newList = JSON.parse(JSON.stringify(list))
await this.initSearchData() newList.forEach(item => {
this.initData() if (item.children && item.children.length) {
}, let child = {
// prop: item.prop + '-child-first'
async initSearchData() { }
}, item.children.unshift(child)
initData() { }
this.listLoading = true; })
let _query = { newList.forEach(item => {
...this.listQuery, if (item.children && item.children.length) {
...this.query, item.children.forEach((child, index) => {
keyword: this.keyword, if (index == 0) {
dataType: 0, this.mergeList.push({
menuId:this.menuId, prop: child.prop,
moduleId:'583194294618161349', rowspan: 1,
type:1, colspan: item.children.length
}; })
request({ } else {
url: `/api/example/EquipmentMaintenanceRecords/getList`, this.mergeList.push({
method: 'post', prop: child.prop,
data: _query rowspan: 0,
}).then(res => { colspan: 0
var _list =res.data.list; })
this.list = _list.map(o => ({ }
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/EquipmentMaintenanceRecords/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}).catch(() => { } else {
}); this.mergeList.push({
}, prop: item.prop,
handelUpload(){ rowspan: 1,
this.uploadBoxVisible = true colspan: 1
this.$nextTick(() => {
this.$refs.UploadBox.init("","example/EquipmentMaintenanceRecords")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
}) })
}, }
superQuery(queryJson) { })
this.listQuery.superQueryJson = queryJson },
this.listQuery.currentPage = 1 getExportList(list) {
this.initData() let exportList = []
}, for (let i = 0; i < list.length; i++) {
addOrUpdateHandle(row, isDetail) { if (list[i].jnpfKey === 'table') {
let id = row?row.id:"" for (let j = 0; j < list[i].children.length; j++) {
this.formVisible = true exportList.push(list[i].children[j])
this.$nextTick(() => { }
this.$refs.JNPFForm.init(id, isDetail,this.list) } else {
}) exportList.push(list[i])
}, }
exportData() { }
this.exportBoxVisible = true this.exportList = exportList
this.$nextTick(() => { },
this.$refs.ExportBox.init(this.exportList) goDetail(id) {
}) this.detailVisible = true
}, this.$nextTick(() => {
download(data) { this.$refs.Detail.init(id)
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} })
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '583194294618161349',
type: 1,
};
request({
url: `/api/example/EquipmentMaintenanceRecords/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({ request({
url: `/api/example/EquipmentMaintenanceRecords/Actions/Export`, url: `/api/example/EquipmentMaintenanceRecords/${id}`,
method: 'post', method: 'DELETE'
data: query
}).then(res => { }).then(res => {
if (!res.data.url) return this.$message({
this.jnpf.downloadFile(res.data.url) type: 'success',
this.$refs.ExportBox.visible = false message: res.msg,
this.exportBoxVisible = false onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => {
search() { });
this.listQuery.currentPage=1 },
this.listQuery.pageSize=20 handelUpload() {
this.listQuery.sort="desc" this.uploadBoxVisible = true
this.listQuery.sidx="" this.$nextTick(() => {
this.initData() this.$refs.UploadBox.init("", "example/EquipmentMaintenanceRecords")
}, })
refresh(isrRefresh) { },
this.formVisible = false openSuperQuery() {
if (isrRefresh) this.reset() this.superQueryVisible = true
}, this.$nextTick(() => {
reset() { this.$refs.SuperQuery.init()
this.query = JSON.parse(JSON.stringify(this.queryData)) })
this.search() },
}, superQuery(queryJson) {
colseFlow(isrRefresh) { this.listQuery.superQueryJson = queryJson
this.flowVisible = false this.listQuery.currentPage = 1
if (isrRefresh) this.reset() this.initData()
}, },
} addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/EquipmentMaintenanceRecords/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
} }
}
</script> </script>

@ -66,45 +66,46 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="leaseNumber" label="租赁单号" align="left"> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column prop="leaseNumber" label="租赁单号" align="center" width="150" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentCoding" label="设备编码" align="left"> <el-table-column prop="equipmentCoding" label="设备编码" align="center"width="150" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentName" label="设备名称" align="left"> <el-table-column prop="equipmentName" label="设备名称" align="center"width="150" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="租赁状态" prop="leaseStatus" algin="left"> <el-table-column label="租赁状态" prop="leaseStatus" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.leaseStatus }} {{ scope.row.leaseStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="merchantId" label="商户名称" align="left"> <el-table-column prop="merchantId" label="商户名称" align="center"width="200">
</el-table-column> </el-table-column>
<el-table-column prop="contacts" label="联系人" align="left"> <el-table-column prop="contacts" label="联系人" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left"> <el-table-column prop="contactsPhone" label="联系电话" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="totalLeasePrice" label="租赁总价" align="left"> <el-table-column prop="totalLeasePrice" label="租赁总价" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="leaseDeposit" label="租赁押金" align="left"> <el-table-column prop="leaseDeposit" label="租赁押金" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left"> <el-table-column prop="startTime" label="开始时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left"> <el-table-column prop="endTime" label="结束时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="returnedBy" label="归还人" align="left"> <el-table-column prop="returnedBy" label="归还人" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column prop="returnTime" label="归还时间" align="left"> <el-table-column prop="returnTime" label="归还时间" align="center"width="150">
</el-table-column> </el-table-column>
<el-table-column label="归还状态" prop="returnStatus" algin="left"> <el-table-column label="归还状态" prop="returnStatus" align="center"width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.returnStatus }} {{ scope.row.returnStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remarks" label="归还说明" align="left"> <el-table-column prop="remarks" label="归还说明" align="center"width="300">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-show="scope.row.leaseStatus === '已租'" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-show="scope.row.leaseStatus === '已租'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
@ -114,7 +115,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </el-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> @pagination="initData" />
</div> </div>

@ -1,166 +1,153 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="1000px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="报修单号" prop="repairNumber">
<el-col :span="8" > <p>{{ dataForm.repairNumber }}</p>
<jnpf-form-tip-item label="报修单号" </jnpf-form-tip-item>
prop="repairNumber" > </el-col>
<p>{{dataForm.repairNumber}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="设备" prop="equipmentId">
</el-col> <p>{{ dataForm.equipmentId }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="设备" </el-col>
prop="equipmentId" > <el-col :span="8">
<p>{{dataForm.equipmentId}}</p> <jnpf-form-tip-item label="空间" prop="spaceId">
</jnpf-form-tip-item> <p>{{ dataForm.spaceId }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="空间" <el-col :span="8">
prop="spaceId" > <jnpf-form-tip-item label="报修人" prop="repairName">
<p>{{dataForm.spaceId}}</p> <p>{{ dataForm.repairName }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="报修人" <jnpf-form-tip-item label="联系方式" prop="contractInformation">
prop="repairName" > <p>{{ dataForm.contractInformation }}</p>
<p>{{dataForm.repairName}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="期望时间" prop="repairTime">
<jnpf-form-tip-item label="联系方式" <p>{{ dataForm.repairTime }}</p>
prop="contractInformation" > </jnpf-form-tip-item>
<p>{{dataForm.contractInformation}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="8">
</el-col> <jnpf-form-tip-item label="是否紧急" prop="urgent">
<el-col :span="8" > <p>{{ dataForm.urgent }} </p>
<jnpf-form-tip-item label="期望维修时间" </jnpf-form-tip-item>
prop="repairTime" > </el-col>
<p>{{dataForm.repairTime}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="消息状态" prop="messageStatus">
</el-col> <p>{{ dataForm.messageStatus }} </p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="是否紧急" </el-col>
prop="urgent" > <el-col :span="24">
<p>{{ dataForm.urgent }} </p> <jnpf-form-tip-item label="故障原因" prop="causeOmalfunction">
</jnpf-form-tip-item> <p>{{ dataForm.causeOmalfunction }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="消息状态" <el-col :span="8">
prop="messageStatus" > <jnpf-form-tip-item label="故障照片" prop="faultPhotos">
<p>{{ dataForm.messageStatus }} </p> <JnpfUploadImg v-model="dataForm.faultPhotos" disabled detailed :fileSize="10" sizeUnit="MB"
</jnpf-form-tip-item> :limit="9" pathType="defaultPath" :isAccount="0">
</el-col> </JnpfUploadImg>
<el-col :span="24" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="故障原因" </el-col>
prop="causeOmalfunction" > </template>
<p>{{dataForm.causeOmalfunction}}</p> </el-form>
</jnpf-form-tip-item> </el-row>
</el-col> <span slot="footer" class="dialog-footer">
<el-col :span="8" > <el-button @click="visible = false"> </el-button>
<jnpf-form-tip-item label="故障照片" </span>
prop="faultPhotos" > <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<JnpfUploadImg v-model="dataForm.faultPhotos"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
repairNumber : '', repairNumber: '',
equipmentId : "", equipmentId: "",
equipmentNumber : '', equipmentNumber: '',
equipmentName : '', equipmentName: '',
spaceId : "", spaceId: "",
repairName : '', repairName: '',
contractInformation : '', contractInformation: '',
repairTime : '', repairTime: '',
urgent : "1", urgent: "1",
messageStatus : "2", messageStatus: "2",
causeOmalfunction : '', causeOmalfunction: '',
faultPhotos : [], faultPhotos: [],
spaceName : '', spaceName: '',
regionId : '', regionId: '',
regionName : '', regionName: '',
}, },
urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}], urgentOptions: [{ "fullName": "非紧急", "id": "1" }, { "fullName": "紧急", "id": "2" }],
urgentProps:{"label":"fullName","value":"id" }, urgentProps: { "label": "fullName", "value": "id" },
messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}], messageStatusOptions: [{ "fullName": "已读", "id": "1" }, { "fullName": "未读", "id": "2" }],
messageStatusProps:{"label":"fullName","value":"id" }, messageStatusProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/EquipmentRepairRecords/detail/'+this.dataForm.id, url: '/api/example/EquipmentRepairRecords/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -57,34 +57,34 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"border>
<el-table-column prop="repairNumber" label="报修单号" align="left"> <el-table-column prop="repairNumber" label="报修单号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentNumber" label="设备编码" align="left"> <el-table-column prop="equipmentNumber" label="设备编码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="equipmentName" label="设备名称" align="left"> <el-table-column prop="equipmentName" label="设备名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="spaceId" label="空间" align="left"> <el-table-column prop="spaceId" label="空间" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="causeOmalfunction" label="故障原因" align="left"> <el-table-column prop="causeOmalfunction" label="故障原因" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="repairName" label="报修人" align="left"> <el-table-column prop="repairName" label="报修人" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="contractInformation" label="联系方式" align="left"> <el-table-column prop="contractInformation" label="联系方式" align="center">
</el-table-column> </el-table-column>
<el-table-column label="是否紧急" prop="urgent" algin="left"> <el-table-column label="是否紧急" prop="urgent" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.urgent}} {{ scope.row.urgent}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="repairTime" label="期望维修时间" align="left"> <el-table-column prop="repairTime" label="期望维修时间" align="center">
</el-table-column> </el-table-column>
<el-table-column label="消息状态" prop="messageStatus" algin="left"> <el-table-column label="消息状态" prop="messageStatus" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.messageStatus}} {{ scope.row.messageStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>

@ -1,231 +1,211 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack"> </el-button>
<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="equipmentCoding">
<p>{{ dataForm.equipmentCoding }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备类型" prop="equipmentType">
<p>{{ dataForm.equipmentType }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备品牌" prop="equipmentBrand">
<p>{{ dataForm.equipmentBrand }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="供应商" prop="supplier">
<p>{{ dataForm.supplier }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="supplierPhone">
<p>{{ dataForm.supplierPhone }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备保修期" prop="equipmentWarranty">
<p>{{ dataForm.equipmentWarranty }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="warrantyStartTime">
<p>{{ dataForm.warrantyStartTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="warrantyEndTime">
<p>{{ dataForm.warrantyEndTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="状态" prop="state">
<p>{{ dataForm.state }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备状态" prop="deviceStatus">
<p>{{ dataForm.deviceStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="MAC地址" prop="deviceMacAddress">
<p>{{ dataForm.deviceMacAddress }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="空间" prop="spaceId">
<p>{{ dataForm.spaceId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="区域名称" prop="regionName">
<p>{{ dataForm.regionName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="设备描述" prop="deviceDescription">
<p>{{ dataForm.deviceDescription }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="安装时间" prop="installationTime">
<p>{{ dataForm.installationTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="负责人" prop="personInCharge">
<p>{{ dataForm.personInCharge }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="chargePhone">
<p>{{ dataForm.chargePhone }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备码" prop="equipmentCode">
<p>{{ dataForm.equipmentCode }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div> </div>
</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="equipmentCoding" >
<p>{{dataForm.equipmentCoding}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备类型"
prop="equipmentType" >
<p>{{ dataForm.equipmentType }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备品牌"
prop="equipmentBrand" >
<p>{{dataForm.equipmentBrand}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="供应商"
prop="supplier" >
<p>{{dataForm.supplier}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="供应商联系电话"
prop="supplierPhone" >
<p>{{dataForm.supplierPhone}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备保修期"
prop="equipmentWarranty" >
<p>{{dataForm.equipmentWarranty}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="保修开始时间"
prop="warrantyStartTime" >
<p>{{dataForm.warrantyStartTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="保修结束时间"
prop="warrantyEndTime" >
<p>{{dataForm.warrantyEndTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="状态"
prop="state" >
<p>{{ dataForm.state }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备状态(正常、异常)"
prop="deviceStatus" >
<p>{{ dataForm.deviceStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备MAC地址"
prop="deviceMacAddress" >
<p>{{dataForm.deviceMacAddress}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="空间"
prop="spaceId" >
<p>{{dataForm.spaceId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="区域名称"
prop="regionName" >
<p>{{dataForm.regionName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="设备描述"
prop="deviceDescription" >
<p>{{dataForm.deviceDescription}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="安装时间"
prop="installationTime" >
<p>{{dataForm.installationTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="负责人"
prop="personInCharge" >
<p>{{dataForm.personInCharge}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="负责人联系电话"
prop="chargePhone" >
<p>{{dataForm.chargePhone}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备码"
prop="equipmentCode" >
<p>{{dataForm.equipmentCode}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
equipmentCoding : '', equipmentCoding: '',
deviceName : '', deviceName: '',
equipmentType : "", equipmentType: "",
equipmentBrand : '', equipmentBrand: '',
supplier : '', supplier: '',
supplierPhone : '', supplierPhone: '',
equipmentWarranty : '', equipmentWarranty: '',
warrantyStartTime : '', warrantyStartTime: '',
warrantyEndTime : '', warrantyEndTime: '',
state : "1", state: "1",
deviceStatus : "1", deviceStatus: "1",
deviceMacAddress : '', deviceMacAddress: '',
spaceId : "", spaceId: "",
regionName : '', regionName: '',
spaceName : '', spaceName: '',
regionId : '', regionId: '',
deviceDescription : '', deviceDescription: '',
installationTime : '', installationTime: '',
personInCharge : '', personInCharge: '',
chargePhone : '', chargePhone: '',
equipmentCode : '', equipmentCode: '',
}, },
equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}], equipmentTypeOptions: [{ "fullName": "类型1", "id": "10" }, { "fullName": "类型2", "id": "20" }],
equipmentTypeProps:{"label":"fullName","value":"id" }, equipmentTypeProps: { "label": "fullName", "value": "id" },
stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], stateOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
stateProps:{"label":"fullName","value":"id" }, stateProps: { "label": "fullName", "value": "id" },
deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}], deviceStatusOptions: [{ "fullName": "正常", "id": "1" }, { "fullName": "异常", "id": "2" }],
deviceStatusProps:{"label":"fullName","value":"id" }, deviceStatusProps: { "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() {}, init(id) {
methods: { this.dataForm.id = id || 0;
toDetail(defaultValue, modelId) { this.visible = true;
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { if (this.dataForm.id) {
if (!res.data || !res.data.formData) return this.loading = true
let formData = JSON.parse(res.data.formData) request({
formData.popupType = 'general' url: '/api/example/ParkEquipment/detail/' + this.dataForm.id,
this.detailVisible = true method: 'get'
this.$nextTick(() => { }).then(res => {
this.$refs.Detail.init(formData, modelId, defaultValue) 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/ParkEquipment/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}) })
},
}, },
} },
}
</script> </script>

@ -77,7 +77,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="供应商联系电话" prop="supplierPhone"> <jnpf-form-tip-item label="联系电话" prop="supplierPhone">
<JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone', -1)" <JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
@ -93,7 +93,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="保修开始时间" prop="warrantyStartTime"> <jnpf-form-tip-item label="开始时间" prop="warrantyStartTime">
<JnpfDatePicker v-model="dataForm.warrantyStartTime" <JnpfDatePicker v-model="dataForm.warrantyStartTime"
@change="changeData('warrantyStartTime', -1)" @change="changeData('warrantyStartTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@ -104,7 +104,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="保修结束时间" prop="warrantyEndTime"> <jnpf-form-tip-item label="结束时间" prop="warrantyEndTime">
<JnpfDatePicker v-model="dataForm.warrantyEndTime" <JnpfDatePicker v-model="dataForm.warrantyEndTime"
@change="changeData('warrantyEndTime', -1)" @change="changeData('warrantyEndTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@ -121,7 +121,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备状态(正常、异常)" prop="deviceStatus"> <jnpf-form-tip-item label="设备状态" prop="deviceStatus">
<JnpfSelect v-model="dataForm.deviceStatus" @change="changeData('deviceStatus', -1)" <JnpfSelect v-model="dataForm.deviceStatus" @change="changeData('deviceStatus', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' placeholder="请选择" clearable :style='{ "width": "100%" }'
:options="deviceStatusOptions" :props="deviceStatusProps"> :options="deviceStatusOptions" :props="deviceStatusProps">
@ -129,7 +129,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备MAC地址" prop="deviceMacAddress"> <jnpf-form-tip-item label="MAC地址" prop="deviceMacAddress">
<JnpfInput v-model="dataForm.deviceMacAddress" <JnpfInput v-model="dataForm.deviceMacAddress"
@change="changeData('deviceMacAddress', -1)" placeholder="请输入" clearable @change="changeData('deviceMacAddress', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'> :style='{ "width": "100%" }'>
@ -186,7 +186,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="负责人联系电话" prop="chargePhone"> <jnpf-form-tip-item label="联系电话" prop="chargePhone">
<JnpfInput v-model="dataForm.chargePhone" @change="changeData('chargePhone', -1)" <JnpfInput v-model="dataForm.chargePhone" @change="changeData('chargePhone', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>

@ -1,149 +1,138 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="1000px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="用户编码" prop="userCode">
<el-col :span="8" > <p>{{ dataForm.userCode }}</p>
<jnpf-form-tip-item label="用户编码" </jnpf-form-tip-item>
prop="userCode" > </el-col>
<p>{{dataForm.userCode}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="用户名" prop="userName">
</el-col> <p>{{ dataForm.userName }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="用户名" </el-col>
prop="userName" > <el-col :span="8">
<p>{{dataForm.userName}}</p> <jnpf-form-tip-item label="联系电话" prop="phone">
</jnpf-form-tip-item> <p>{{ dataForm.phone }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="身份证号" <el-col :span="8">
prop="idCard" > <jnpf-form-tip-item label="人员归属" prop="userAscription">
<p>{{dataForm.idCard}}</p> <p>{{ dataForm.userAscription }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="联系电话" <jnpf-form-tip-item label="身份证号" prop="idCard">
prop="phone" > <p>{{ dataForm.idCard }}</p>
<p>{{dataForm.phone}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="有效开始时间" prop="effectiveStartTime">
<jnpf-form-tip-item label="人员归属" <p>{{ dataForm.effectiveStartTime }}</p>
prop="userAscription" > </jnpf-form-tip-item>
<p>{{ dataForm.userAscription }} </p> </el-col>
</jnpf-form-tip-item> <el-col :span="8">
</el-col> <jnpf-form-tip-item label="有效结束时间" prop="effectiveEndTime">
<el-col :span="8" > <p>{{ dataForm.effectiveEndTime }}</p>
<jnpf-form-tip-item label="有效开始时间" </jnpf-form-tip-item>
prop="effectiveStartTime" > </el-col>
<p>{{dataForm.effectiveStartTime}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="出入码" prop="entryCodes">
</el-col> <p>{{ dataForm.entryCodes }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="有效结束时间" </el-col>
prop="effectiveEndTime" > <el-col :span="8">
<p>{{dataForm.effectiveEndTime}}</p> <jnpf-form-tip-item label="商户" prop="merchantId">
</jnpf-form-tip-item> <p>{{ dataForm.merchantId }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="出入码" </template>
prop="entryCodes" > </el-form>
<p>{{dataForm.entryCodes}}</p> </el-row>
</jnpf-form-tip-item> <span slot="footer" class="dialog-footer">
</el-col> <el-button @click="visible = false"> </el-button>
<el-col :span="8" > </span>
<jnpf-form-tip-item label="商户" <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
prop="merchantId" >
<p>{{dataForm.merchantId}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
userCode : '', userCode: '',
userName : '', userName: '',
idCard : '', idCard: '',
phone : '', phone: '',
userAscription : "1", userAscription: "1",
effectiveStartTime : '', effectiveStartTime: '',
effectiveEndTime : '', effectiveEndTime: '',
entryCodes : '', entryCodes: '',
merchantId : "", merchantId: "",
}, },
userAscriptionOptions:[{"fullName":"商户","id":"1"},{"fullName":"公司","id":"2"}], userAscriptionOptions: [{ "fullName": "商户", "id": "1" }, { "fullName": "公司", "id": "2" }],
userAscriptionProps:{"label":"fullName","value":"id" }, userAscriptionProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/Person/detail/'+this.dataForm.id, url: '/api/example/Person/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -20,13 +20,7 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8">
<jnpf-form-tip-item label="身份证号" prop="idCard">
<JnpfInput v-model="dataForm.idCard" @change="changeData('idCard',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="phone"> <jnpf-form-tip-item label="联系电话" prop="phone">
<JnpfInput v-model="dataForm.phone" @change="changeData('phone',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.phone" @change="changeData('phone',-1)" placeholder="请输入" clearable
@ -41,9 +35,15 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="有效开始时间" prop="effectiveStartTime"> <jnpf-form-tip-item label="身份证号" prop="idCard">
<JnpfInput v-model="dataForm.idCard" @change="changeData('idCard',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="effectiveStartTime">
<JnpfDatePicker v-model="dataForm.effectiveStartTime" @change="changeData('effectiveStartTime',-1)" <JnpfDatePicker v-model="dataForm.effectiveStartTime" @change="changeData('effectiveStartTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"> :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
@ -52,7 +52,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="有效结束时间" prop="effectiveEndTime"> <jnpf-form-tip-item label="结束时间" prop="effectiveEndTime">
<JnpfDatePicker v-model="dataForm.effectiveEndTime" @change="changeData('effectiveEndTime',-1)" <JnpfDatePicker v-model="dataForm.effectiveEndTime" @change="changeData('effectiveEndTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"> :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
@ -207,12 +207,12 @@
}, ], }, ],
effectiveStartTime: [{ effectiveStartTime: [{
required: true, required: true,
message: '请选择', message: '请选择身份证有效开始时间',
trigger: 'change' trigger: 'change'
}, ], }, ],
effectiveEndTime: [{ effectiveEndTime: [{
required: true, required: true,
message: '请选择', message: '请选择身份证有效结束时间',
trigger: 'change' trigger: 'change'
}, ], }, ],
entryCodes: [{ entryCodes: [{

@ -37,10 +37,10 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
<el-table-column prop="userCode" label="用户编码" align="left"> <el-table-column prop="userCode" label="用户编码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="userName" label="用户名" align="left"> <el-table-column prop="userName" label="用户名" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="userAscription" label="归属" align="center" width="150"> <el-table-column prop="userAscription" label="归属" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -48,23 +48,23 @@
<el-tag type="success" v-else-if="scope.row.userAscription == 2">公司</el-tag> <el-tag type="success" v-else-if="scope.row.userAscription == 2">公司</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="idCard" label="身份证号" align="left"> <el-table-column prop="idCard" label="身份证号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="联系电话" align="left"> <el-table-column prop="phone" label="联系电话" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="merchantName" label="归属名称" align="left"> <el-table-column prop="merchantName" label="归属名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="effectiveStartTime" label="有效开始时间" align="left"> <el-table-column prop="effectiveStartTime" label="有效开始时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.effectiveStartTime | toDate("yyyy-MM-dd HH:mm:ss") }} {{ scope.row.effectiveStartTime | toDate("yyyy-MM-dd HH:mm:ss") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="effectiveEndTime" label="有效结束时间" align="left"> <el-table-column prop="effectiveEndTime" label="有效结束时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.effectiveEndTime | toDate("yyyy-MM-dd HH:mm:ss") }} {{ scope.row.effectiveEndTime | toDate("yyyy-MM-dd HH:mm:ss") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>

@ -1,161 +1,148 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="600px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="车牌号" prop="vehicleNumber">
<el-col :span="8" > <p>{{ dataForm.vehicleNumber }}</p>
<jnpf-form-tip-item label="车牌号" </jnpf-form-tip-item>
prop="vehicleNumber" > </el-col>
<p>{{dataForm.vehicleNumber}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="车辆类型" prop="vehicleType">
</el-col> <p>{{ dataForm.vehicleType }} </p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="车辆类型" </el-col>
prop="vehicleType" > <el-col :span="8">
<p>{{ dataForm.vehicleType }} </p> <jnpf-form-tip-item label="车辆品牌" prop="vehicleBrand">
</jnpf-form-tip-item> <p>{{ dataForm.vehicleBrand }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="车辆品牌" <el-col :span="8">
prop="vehicleBrand" > <jnpf-form-tip-item label="车辆颜色" prop="vehicleColor">
<p>{{dataForm.vehicleBrand}}</p> <p>{{ dataForm.vehicleColor }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="车辆颜色" <jnpf-form-tip-item label="联系人" prop="contactsName">
prop="vehicleColor" > <p>{{ dataForm.contactsName }}</p>
<p>{{dataForm.vehicleColor}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="联系电话" prop="contactsPhone">
<jnpf-form-tip-item label="联系人" <p>{{ dataForm.contactsPhone }}</p>
prop="contactsName" > </jnpf-form-tip-item>
<p>{{dataForm.contactsName}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="车辆照片" prop="vehiclePhotos">
<el-col :span="8" > <JnpfUploadImg v-model="dataForm.vehiclePhotos" disabled detailed :fileSize="10"
<jnpf-form-tip-item label="联系电话" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
prop="contactsPhone" > </JnpfUploadImg>
<p>{{dataForm.contactsPhone}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="24" > <jnpf-form-tip-item label="车辆归属" prop="vehicleAscription">
<jnpf-form-tip-item label="车辆照片" <p>{{ dataForm.vehicleAscription }} </p>
prop="vehiclePhotos" > </jnpf-form-tip-item>
<JnpfUploadImg v-model="dataForm.vehiclePhotos" </el-col>
disabled <el-col :span="8">
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" > <jnpf-form-tip-item label="归属" prop="ascriptionId">
</JnpfUploadImg> <p>{{ dataForm.ascriptionId }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="车辆归属" <jnpf-form-tip-item label="归属名称" prop="ascriptionName">
prop="vehicleAscription" > <p>{{ dataForm.ascriptionName }}</p>
<p>{{ dataForm.vehicleAscription }} </p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> </template>
<el-col :span="8" > </el-form>
<jnpf-form-tip-item label="归属" </el-row>
prop="ascriptionId" > <span slot="footer" class="dialog-footer">
<p>{{dataForm.ascriptionId}}</p> <el-button @click="visible = false"> </el-button>
</jnpf-form-tip-item> </span>
</el-col> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<el-col :span="8" >
<jnpf-form-tip-item label="归属名称"
prop="ascriptionName" >
<p>{{dataForm.ascriptionName}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
vehicleNumber : '', vehicleNumber: '',
vehicleType : "", vehicleType: "",
vehicleBrand : '', vehicleBrand: '',
vehicleColor : '', vehicleColor: '',
contactsName : '', contactsName: '',
contactsPhone : '', contactsPhone: '',
vehiclePhotos : [], vehiclePhotos: [],
vehicleAscription : "1", vehicleAscription: "1",
ascriptionId : '', ascriptionId: '',
ascriptionName : "", ascriptionName: "",
}, },
vehicleTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}], vehicleTypeOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
vehicleTypeProps:{"label":"fullName","value":"id" }, vehicleTypeProps: { "label": "fullName", "value": "id" },
vehicleAscriptionOptions:[{"fullName":"商户","id":"1"},{"fullName":"公司","id":"2"}], vehicleAscriptionOptions: [{ "fullName": "商户", "id": "1" }, { "fullName": "公司", "id": "2" }],
vehicleAscriptionProps:{"label":"fullName","value":"id" }, vehicleAscriptionProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/Vehicle/detail/'+this.dataForm.id, url: '/api/example/Vehicle/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -39,8 +39,8 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
<el-table-column prop="vehicleNumber" label="车牌号" align="left"> <el-table-column prop="vehicleNumber" label="车牌号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="vehicleType" label="车辆类型" align="center" width="150"> <el-table-column prop="vehicleType" label="车辆类型" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -48,17 +48,17 @@
<el-tag type="success" v-else-if="scope.row.vehicleType == 2">类型2</el-tag> <el-tag type="success" v-else-if="scope.row.vehicleType == 2">类型2</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="vehicleBrand" label="车辆品牌" align="left"> <el-table-column prop="vehicleBrand" label="车辆品牌" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="vehicleColor" label="车辆颜色" align="left"> <el-table-column prop="vehicleColor" label="车辆颜色" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="contactsName" label="联系人" align="left"> <el-table-column prop="contactsName" label="联系人" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left"> <el-table-column prop="contactsPhone" label="联系电话" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="ascriptionName" label="归属" align="left"> <el-table-column prop="ascriptionName" label="归属" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>

@ -1,159 +1,147 @@
<template> <template>
<el-dialog title="详情" <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
:close-on-click-modal="false" append-to-body class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll <el-row :gutter="15" class="">
width="1000px"> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=""> <template v-if="!loading">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-col :span="8">
<template v-if="!loading"> <jnpf-form-tip-item label="申请单号" prop="applicationNumber">
<el-col :span="8" > <p>{{ dataForm.applicationNumber }}</p>
<jnpf-form-tip-item label="申请单号" </jnpf-form-tip-item>
prop="applicationNumber" > </el-col>
<p>{{dataForm.applicationNumber}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="商户名称" prop="merchantId">
</el-col> <p>{{ dataForm.merchantId }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="商户名称" </el-col>
prop="merchantId" > <el-col :span="8">
<p>{{dataForm.merchantId}}</p> <jnpf-form-tip-item label="空间名称" prop="spaceId">
</jnpf-form-tip-item> <p>{{ dataForm.spaceId }}</p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="空间名称" <el-col :span="8">
prop="spaceId" > <jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{dataForm.spaceId}}</p> <p>{{ dataForm.startTime }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="开始时间" <jnpf-form-tip-item label="结束时间" prop="endTime">
prop="startTime" > <p>{{ dataForm.endTime }}</p>
<p>{{dataForm.startTime}}</p> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8" > <jnpf-form-tip-item label="联系人" prop="contacts">
<jnpf-form-tip-item label="结束时间" <p>{{ dataForm.contacts }}</p>
prop="endTime" > </jnpf-form-tip-item>
<p>{{dataForm.endTime}}</p> </el-col>
</jnpf-form-tip-item> <el-col :span="8">
</el-col> <jnpf-form-tip-item label="联系电话" prop="contactsPhone">
<el-col :span="8" > <p>{{ dataForm.contactsPhone }}</p>
<jnpf-form-tip-item label="联系人" </jnpf-form-tip-item>
prop="contacts" > </el-col>
<p>{{dataForm.contacts}}</p> <el-col :span="8">
</jnpf-form-tip-item> <jnpf-form-tip-item label="预约人数" prop="reservationsNumber">
</el-col> <p>{{ dataForm.reservationsNumber }}</p>
<el-col :span="8" > </jnpf-form-tip-item>
<jnpf-form-tip-item label="联系电话" </el-col>
prop="contactsPhone" > <el-col :span="8">
<p>{{dataForm.contactsPhone}}</p> <jnpf-form-tip-item label="预约进度" prop="usageProgress">
</jnpf-form-tip-item> <p>{{ dataForm.usageProgress }} </p>
</el-col> </jnpf-form-tip-item>
<el-col :span="8" > </el-col>
<jnpf-form-tip-item label="预约人数" <el-col :span="8">
prop="reservationsNumber" > <jnpf-form-tip-item label="预约事由" prop="reservationsThing">
<p>{{dataForm.reservationsNumber}}</p> <p>{{ dataForm.reservationsThing }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > </template>
<jnpf-form-tip-item label="预约事由" </el-form>
prop="reservationsThing" > </el-row>
<p>{{dataForm.reservationsThing}}</p> <span slot="footer" class="dialog-footer">
</jnpf-form-tip-item> <el-button @click="visible = false"> </el-button>
</el-col> </span>
<el-col :span="8" > <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<jnpf-form-tip-item label="预约进度"
prop="usageProgress" >
<p>{{ dataForm.usageProgress }} </p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
applicationNumber : '', applicationNumber: '',
merchantId : "", merchantId: "",
spaceId : "", spaceId: "",
startTime : '', startTime: '',
endTime : '', endTime: '',
contacts : '', contacts: '',
contactsPhone : '', contactsPhone: '',
reservationsNumber : '', reservationsNumber: '',
reservationsThing : '', reservationsThing: '',
usageProgress : "1", usageProgress: "1",
creationTime : "", creationTime: "",
spaceName : '', spaceName: '',
merchantName : '', merchantName: '',
}, },
usageProgressOptions:[{"fullName":"预约中","id":"1"},{"fullName":"已结束","id":"2"}], usageProgressOptions: [{ "fullName": "预约中", "id": "1" }, { "fullName": "已结束", "id": "2" }],
usageProgressProps:{"label":"fullName","value":"id" }, usageProgressProps: { "label": "fullName", "value": "id" },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData) let formData = JSON.parse(res.data.formData)
formData.popupType = 'general' formData.popupType = 'general'
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/VenueReservationRecord/detail/'+this.dataForm.id, url: '/api/example/VenueReservationRecord/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

@ -77,14 +77,6 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8">
<jnpf-form-tip-item label="预约事由" prop="reservationsThing">
<JnpfTextarea v-model="dataForm.reservationsThing"
@change="changeData('reservationsThing', -1)" placeholder="请输入预约事由"
:style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="预约进度" prop="usageProgress"> <jnpf-form-tip-item label="预约进度" prop="usageProgress">
<JnpfSelect v-model="dataForm.usageProgress" @change="changeData('usageProgress', -1)" <JnpfSelect v-model="dataForm.usageProgress" @change="changeData('usageProgress', -1)"
@ -93,6 +85,14 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8">
<jnpf-form-tip-item label="预约事由" prop="reservationsThing">
<JnpfTextarea v-model="dataForm.reservationsThing"
@change="changeData('reservationsThing', -1)" placeholder="请输入预约事由"
:style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>

@ -62,31 +62,31 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="applicationNumber" label="申请单号" align="left"> <el-table-column prop="applicationNumber" label="申请单号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="merchantId" label="商户名称" align="left"> <el-table-column prop="merchantId" label="商户名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="spaceId" label="空间名称" align="left"> <el-table-column prop="spaceId" label="空间名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="contacts" label="联系人" align="left"> <el-table-column prop="contacts" label="联系人" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left"> <el-table-column prop="contactsPhone" label="联系电话" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="reservationsThing" label="预约事由" align="left"> <el-table-column prop="reservationsThing" label="预约事由" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="reservationsNumber" label="预约人数" align="left"> <el-table-column prop="reservationsNumber" label="预约人数" align="center">
</el-table-column> </el-table-column>
<el-table-column label="预约进度" prop="usageProgress" algin="left"> <el-table-column label="预约进度" prop="usageProgress" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.usageProgress }} {{ scope.row.usageProgress }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left"> <el-table-column prop="startTime" label="开始时间" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left"> <el-table-column prop="endTime" label="结束时间" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150"align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-show="scope.row.usageProgress === '预约中'" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-show="scope.row.usageProgress === '预约中'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>

Loading…
Cancel
Save