From 0adaeefb961a1af074230ec5e86ded454c15315d Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 25 Jul 2024 11:21:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(front):=E5=89=8D=E7=AB=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/scm/billtable/entry.vue         |   10 +-
 .../src/views/scm/billtable/index.vue         |   35 +-
 .../src/views/scm/contract/change.vue         |   75 +-
 .../jnpf-web/src/views/scm/contract/index.vue |   45 +-
 .../scm/decorationapplicationform/Detail.vue  |    4 +-
 .../scm/decorationapplicationform/form.vue    |    4 +-
 .../scm/decorationapplicationform/index.vue   |   33 +-
 .../views/scm/enterprisemerchants/form.vue    | 1238 ++++++++---------
 .../views/scm/enterprisemerchants/index.vue   |  929 +++++++------
 .../src/views/scm/equipment/Detail.vue        |  309 ++--
 .../jnpf-web/src/views/scm/equipment/form.vue |    6 +-
 .../src/views/scm/equipment/index.vue         |   33 +-
 .../scm/equipmentinspectionrecords/index.vue  |   14 +-
 .../equipmentmaintenancerecords/Detail.vue    |  337 +++--
 .../scm/equipmentmaintenancerecords/form.vue  | 1016 +++++++-------
 .../scm/equipmentmaintenancerecords/index.vue |  900 ++++++------
 .../scm/equipmentrentalrecords/index.vue      |   39 +-
 .../scm/equipmentrepairrecords/Detail.vue     |  285 ++--
 .../views/scm/equipmentrepairrecords/form.vue |  958 ++++++-------
 .../scm/equipmentrepairrecords/index.vue      |   24 +-
 .../src/views/scm/parkequipment/Detail.vue    |  406 +++---
 .../src/views/scm/parkequipment/form.vue      |   12 +-
 .../src/views/scm/parkequipment/index.vue     |  937 ++++++-------
 .../jnpf-web/src/views/scm/person/Detail.vue  |  253 ++--
 .../jnpf-web/src/views/scm/person/form.vue    |   24 +-
 .../jnpf-web/src/views/scm/person/index.vue   |   18 +-
 .../jnpf-web/src/views/scm/vehicle/Detail.vue |  275 ++--
 .../jnpf-web/src/views/scm/vehicle/index.vue  |   16 +-
 .../scm/venuereservationrecord/Detail.vue     |  272 ++--
 .../views/scm/venuereservationrecord/form.vue |   16 +-
 .../scm/venuereservationrecord/index.vue      |   24 +-
 31 files changed, 4181 insertions(+), 4366 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/entry.vue b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/entry.vue
index 10e0a5d..42524b0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/entry.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/entry.vue
@@ -14,14 +14,14 @@
                     label-position="right">
                     <template v-if="!loading">
                         <!-- 具体表单 -->
-                        <el-col :span="8">
+                        <el-col :span="24">
                             <jnpf-form-tip-item label="账单号" prop="billNumbe">
                                 <JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)"
                                     placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
                                 </JnpfInput>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="24">
                             <jnpf-form-tip-item label="账单状态" prop="billStatus">
                                 <JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)"
                                     placeholder="请选择账单状态" clearable :style='{ "width": "100%" }'
@@ -29,7 +29,7 @@
                                 </JnpfSelect>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="24">
                             <jnpf-form-tip-item label="支付方式" prop="payStatus">
                                 <JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)"
                                     placeholder="请选择支付方式" clearable :style='{ "width": "100%" }'
@@ -37,14 +37,14 @@
                                 </JnpfSelect>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="24">
                             <jnpf-form-tip-item label="支付金额" prop="payAmount">
                                 <JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)"
                                     placeholder="支付金额" :step="1">
                                 </JnpfInputNumber>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="24">
                             <jnpf-form-tip-item label="相关附件" prop="billAttachment">
                                 <JnpfUploadFile v-model="dataForm.billAttachment"
                                     @change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
index 71e66c2..c036002 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
@@ -63,57 +63,58 @@
                         </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod" @row-click="handleRowClick">
-                    <el-table-column width="55" align="center">
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod" @row-click="handleRowClick" border>
+                    <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">
                             <input type="radio" :value="scope.row.id" v-model="selectedRowId"
                                 @change="handleSelectionChange">
                         </template>
                     </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 prop="contractId" label="合同名称" align="left">
+                    <el-table-column prop="contractId" label="合同名称" align="center"width="200"fixed="left" >
                     </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 label="账单状态" prop="billStatus" algin="left">
+                    <el-table-column label="账单状态" prop="billStatus" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.billStatus }}
                         </template>
                     </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">
                             <JnpfNumber v-model="scope.row.billAmount" :thousands="false" />
                         </template>
                     </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">
                             {{ scope.row.payStatus }}
                         </template>
                     </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">
                             <JnpfNumber v-model="scope.row.payAmount" :thousands="false" />
                         </template>
                     </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">
                             {{ scope.row.notificationMethod }}
                         </template>
                     </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">
                             {{ scope.row.notificationState }}
                         </template>
                     </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 prop="confirmPersonnel" label="确认人" align="left">
+                    <el-table-column prop="confirmPersonnel" label="确认人" align="center" width="150">
                     </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 label="操作" fixed="right" width="150">
+                    <el-table-column label="操作" fixed="right" width="150"align="center">
                         <template slot-scope="scope">
                             <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
                             </el-button>
@@ -124,7 +125,7 @@
                             </el-button>
                         </template>
                     </el-table-column>
-                </JNPF-table>
+                </el-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
                     @pagination="initData" />
             </div>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue
index ce97048..bf9ac4d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue
@@ -2,7 +2,7 @@
     <transition name="el-zoom-in-center">
         <div class="JNPF-preview-main">
             <div class="JNPF-common-page-header">
-                <el-page-header @back="goBack"/>变更合同
+                <el-page-header @back="goBack" />变更合同
                 <div class="options">
                     <el-dropdown class="dropdown" placement="bottom">
                         <el-button style="width:70px">
@@ -58,10 +58,10 @@
 
                         <el-col :span="8">
                             <jnpf-form-tip-item label="签订日期" prop="signingDate">
-                                <JnpfDatePicker v-model="dataForm.signingDate" disabled @change="changeData('signingDate', -1)"
-                                    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                                    placeholder="请选择签订日期" clearable :style='{ "width": "100%" }' type="date"
-                                    format="yyyy-MM-dd">
+                                <JnpfDatePicker v-model="dataForm.signingDate" disabled
+                                    @change="changeData('signingDate', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                    :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择签订日期" clearable
+                                    :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                                 </JnpfDatePicker>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -75,9 +75,10 @@
                         </el-col>
                         <el-col :span="8">
                             <jnpf-form-tip-item label="商户名称" prop="merchantName">
-                                <JnpfSelect v-model="dataForm.merchantName" disabled @change="changeData('merchantName', -1)"
-                                    placeholder="请选择" clearable :style='{ "width": "100%" }' filterable
-                                    :options="merchantNameOptions" :props="merchantNameProps">
+                                <JnpfSelect v-model="dataForm.merchantName" disabled
+                                    @change="changeData('merchantName', -1)" placeholder="请选择" clearable
+                                    :style='{ "width": "100%" }' filterable :options="merchantNameOptions"
+                                    :props="merchantNameProps">
                                 </JnpfSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -201,19 +202,19 @@
                                             </JnpfInput>
                                         </template>
                                     </el-table-column>
-                                    <el-table-column label="空间名称" prop="spaceName">
+                                    <el-table-column label="空间名称" prop="spaceId">
                                         <template slot="header" v-if="false">
                                             <span class="required-sign">*</span>空间名称
                                         </template>
                                         <template slot-scope="scope">
-                                            <JnpfPopupSelect v-model="scope.row.spaceName"
-                                                @change="changeData('spacecontract-spaceName', scope.$index)"
+                                            <JnpfPopupSelect v-model="scope.row.spaceId"
+                                                @change="changeData('spacecontract-spaceId', scope.$index)"
                                                 :rowIndex="scope.$index" :formData="dataForm"
-                                                :templateJson="interfaceRes.spacecontractspaceName" placeholder="请选择"
-                                                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                                                relationField='name' :field="'spaceName' + scope.$index"
-                                                interfaceId="582491427901014533" :pageSize="20"
-                                                :columnOptions="spacecontractspaceNamecolumnOptions" clearable
+                                                :templateJson="interfaceRes.spacecontractspaceId" placeholder="请选择空间"
+                                                hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                                                popupType="dialog" relationField='name' :field="'spaceId' + scope.$index"
+                                                interfaceId="584015452494104389" :pageSize="20"
+                                                :columnOptions="spacecontractspaceIdcolumnOptions" disabled clearable
                                                 :style='{ "width": "100%" }'>
                                             </JnpfPopupSelect>
                                         </template>
@@ -236,7 +237,7 @@
                                         <template slot-scope="scope">
                                             <JnpfInput v-model="scope.row.totalRentalPrice"
                                                 @change="changeData('spacecontract-totalRentalPrice', scope.$index)"
-                                                placeholder="请输入租金总价" clearable :style='{ "width": "100%" }'>
+                                                placeholder="请输入租金总价" disabled clearable :style='{ "width": "100%" }'>
                                             </JnpfInput>
                                         </template>
                                     </el-table-column>
@@ -667,7 +668,7 @@ export default {
             let template = {
                 paramList: templateJsonList
             }
-            getDataInterfaceRes('582491427901014533', template).then(res => {
+            getDataInterfaceRes('584015452494104389', template).then(res => {
                 let data = res.data
                 this.parkIdOptions = data
                 this.changeDataFormData(1, 'parkId', 'parkId', index, '')
@@ -761,26 +762,26 @@ export default {
             } else {
                 this.btnLoading = true
             }
-                request({
-                    url: '/api/example/Contract/' + this.dataForm.id,
-                    method: 'PUT',
-                    data: _data
-                }).then((res) => {
-                    this.$message({
-                        message: res.msg,
-                        type: 'success',
-                        duration: 1000,
-                        onClose: () => {
-                            if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                            this.visible = false
-                            this.btnLoading = false
-                            this.$emit('refresh', true)
-                        }
-                    })
-                }).catch(() => {
-                    this.btnLoading = false
-                    this.continueBtnLoading = false
+            request({
+                url: '/api/example/Contract/' + this.dataForm.id,
+                method: 'PUT',
+                data: _data
+            }).then((res) => {
+                this.$message({
+                    message: res.msg,
+                    type: 'success',
+                    duration: 1000,
+                    onClose: () => {
+                        if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                        this.visible = false
+                        this.btnLoading = false
+                        this.$emit('refresh', true)
+                    }
                 })
+            }).catch(() => {
+                this.btnLoading = false
+                this.continueBtnLoading = false
+            })
         },
         addspacecontractList() {
             let item = {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
index 641bba2..ea5e2be 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
@@ -79,61 +79,62 @@
                         </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod" @row-click="handleRowClick">
-                    <el-table-column width="55" align="center">
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod" @row-click="handleRowClick" border>
+                    <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">
                             <input type="radio" :value="scope.row.id" v-model="selectedRowId"
                                 @change="handleSelectionChange">
                         </template>
                     </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 prop="contractName" label="合同名称" align="left">
+                    <el-table-column prop="contractName" label="合同名称" align="center"width="150"fixed="left">
                     </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">
                             {{ scope.row.contractStatus }}
                         </template>
                     </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 prop="merchantName" label="商户名称" align="left">
+                    <el-table-column prop="merchantName" label="商户名称" align="center"width="150">
                     </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 prop="leaseTerm" label="租期" align="left">
+                    <el-table-column prop="leaseTerm" label="租期" align="center"width="150">
                     </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 prop="endTime" label="结束时间" align="left">
+                    <el-table-column prop="endTime" label="结束时间" align="center"width="150">
                     </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 prop="contactsPhone" label="联系电话" align="left">
+                    <el-table-column prop="contactsPhone" label="联系电话" align="center"width="150">
                     </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 label="计价方式" prop="pricingMethod" algin="left">
+                    <el-table-column label="计价方式" prop="pricingMethod" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.pricingMethod }}
                         </template>
                     </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 label="支付方式" prop="payDeposit" algin="left">
+                    <el-table-column label="支付方式" prop="payDeposit" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.payDeposit }}
                         </template>
                     </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">
                             {{ scope.row.returnDeposit }}
                         </template>
                     </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 label="操作" fixed="right" width="180">
+                    <el-table-column label="操作" fixed="right" width="180"align="center">
                         <template slot-scope="scope">
                             <el-button type="text" v-show="scope.row.contractStatus === '待确认'"
                                 @click="addOrUpdateHandle(scope.row)">编辑
@@ -148,7 +149,7 @@
                             </el-button>
                         </template>
                     </el-table-column>
-                </JNPF-table>
+                </el-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
                     @pagination="initData" />
             </div>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/Detail.vue
index d155252..d75770d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/Detail.vue
@@ -25,12 +25,12 @@
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="8">
-                        <jnpf-form-tip-item label="预计开始时间" prop="expectedStartTime">
+                        <jnpf-form-tip-item label="开始时间" prop="expectedStartTime">
                             <p>{{ dataForm.expectedStartTime }}</p>
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="8">
-                        <jnpf-form-tip-item label="预计结束时间" prop="expectedEndTime">
+                        <jnpf-form-tip-item label="结束时间" prop="expectedEndTime">
                             <p>{{ dataForm.expectedEndTime }}</p>
                         </jnpf-form-tip-item>
                     </el-col>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/form.vue
index 8d6b393..62a5aee 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/form.vue
@@ -48,7 +48,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                        <jnpf-form-tip-item label="预计开始时间" prop="expectedStartTime">
+                        <jnpf-form-tip-item label="开始时间" prop="expectedStartTime">
                             <JnpfDatePicker v-model="dataForm.expectedStartTime"
                                 @change="changeData('expectedStartTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
                                 :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计开始时间" clearable
@@ -58,7 +58,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                        <jnpf-form-tip-item label="预计结束时间" prop="expectedEndTime">
+                        <jnpf-form-tip-item label="结束时间" prop="expectedEndTime">
                             <JnpfDatePicker v-model="dataForm.expectedEndTime"
                                 @change="changeData('expectedEndTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
                                 :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择预计结束时间" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/index.vue
index 2168d75..dcd1ed4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/index.vue
@@ -61,39 +61,40 @@
                         </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod">
-                    <el-table-column prop="applicationNumber" label="申请单号" align="left">
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod" border>
+                    <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 prop="merchantId" label="商户名称" align="left">
+                    <el-table-column prop="merchantId" label="商户名称" align="center" fixed="left"width="150">
                     </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 prop="spaceId" label="空间名称" align="left">
+                    <el-table-column prop="spaceId" label="空间名称" align="center"fixed="left"width="150">
                     </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 prop="expectedEndTime" label="预计结束时间" align="left">
+                    <el-table-column prop="expectedEndTime" label="预计结束时间" align="center"width="150">
                     </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 label="押金是否退回" prop="isTheDepositRefunded" algin="left">
+                    <el-table-column label="押金是否退回" prop="isTheDepositRefunded" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.isTheDepositRefunded }}
                         </template>
                     </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 label="装修进度" prop="decorationProgress" algin="left">
+                    <el-table-column label="装修进度" prop="decorationProgress" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.decorationProgress }}
                         </template>
                     </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 prop="contactsPhone" label="联系电话" align="left">
+                    <el-table-column prop="contactsPhone" label="联系电话" align="center"width="150">
                     </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">
                             <el-button type="text" v-show="scope.row.decorationProgress != '已装修'"  @click="addOrUpdateHandle(scope.row)">编辑
                             </el-button>
@@ -103,7 +104,7 @@
                             </el-button>
                         </template>
                     </el-table-column>
-                </JNPF-table>
+                </el-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
                     @pagination="initData" />
             </div>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
index 751f007..fff10c5 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
@@ -2,7 +2,7 @@
   <transition name="el-zoom-in-center">
     <div class="JNPF-preview-main">
       <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
+        <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
         <div class="options">
           <el-dropdown class="dropdown" placement="bottom">
             <el-button style="width:70px">
@@ -11,15 +11,15 @@
             <el-dropdown-menu slot="dropdown">
               <template v-if="dataForm.id">
                 <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                  {{'上一条'}}
+                  {{ '上一条' }}
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                  {{'下一条'}}
+                  {{ '下一条' }}
                 </el-dropdown-item>
               </template>
               <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
                 :disabled='btnLoading'>
-                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保
@@ -27,7 +27,7 @@
           <el-button @click="goBack"> 取 消</el-button>
         </div>
       </div>
-      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+      <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
         <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
           label-position="right">
           <template v-if="!loading">
@@ -40,71 +40,71 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司编码" prop="cmpNo">
-                <JnpfInput v-model="dataForm.cmpNo" @change="changeData('cmpNo',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.cmpNo" @change="changeData('cmpNo', -1)" placeholder="请输入" clearable
+                  :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司名称" prop="cmpNm">
-                <JnpfInput v-model="dataForm.cmpNm" @change="changeData('cmpNm',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.cmpNm" @change="changeData('cmpNm', -1)" placeholder="请输入" clearable
+                  :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="所属行业" prop="industry">
-                <JnpfSelect v-model="dataForm.industry" @change="changeData('industry',-1)" placeholder="请选择" clearable
-                  :style='{"width":"100%"}' :options="industryOptions" :props="industryProps">
+                <JnpfSelect v-model="dataForm.industry" @change="changeData('industry', -1)" placeholder="请选择" clearable
+                  :style='{ "width": "100%" }' :options="industryOptions" :props="industryProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司规模" prop="companySize">
-                <JnpfSelect v-model="dataForm.companySize" @change="changeData('companySize',-1)" placeholder="请选择"
-                  clearable :style='{"width":"100%"}' :options="companySizeOptions" :props="companySizeProps">
+                <JnpfSelect v-model="dataForm.companySize" @change="changeData('companySize', -1)" placeholder="请选择"
+                  clearable :style='{ "width": "100%" }' :options="companySizeOptions" :props="companySizeProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司类型" prop="compType">
-                <JnpfSelect v-model="dataForm.compType" @change="changeData('compType',-1)" placeholder="请选择" clearable
-                  :style='{"width":"100%"}' :options="compTypeOptions" :props="compTypeProps">
+                <JnpfSelect v-model="dataForm.compType" @change="changeData('compType', -1)" placeholder="请选择" clearable
+                  :style='{ "width": "100%" }' :options="compTypeOptions" :props="compTypeProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司状态" prop="companyStatus">
-                <JnpfSelect v-model="dataForm.companyStatus" @change="changeData('companyStatus',-1)" placeholder="请选择"
-                  clearable :style='{"width":"100%"}' :options="companyStatusOptions" :props="companyStatusProps">
+                <JnpfSelect v-model="dataForm.companyStatus" @change="changeData('companyStatus', -1)" placeholder="请选择"
+                  clearable :style='{ "width": "100%" }' :options="companyStatusOptions" :props="companyStatusProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="联系人" prop="userNm">
-                <JnpfInput v-model="dataForm.userNm" @change="changeData('userNm',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.userNm" @change="changeData('userNm', -1)" placeholder="请输入" clearable
+                  :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="联系电话" prop="contactNumber">
-                <JnpfInput v-model="dataForm.contactNumber" @change="changeData('contactNumber',-1)" placeholder="请输入"
-                  clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.contactNumber" @change="changeData('contactNumber', -1)" placeholder="请输入"
+                  clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="邮箱" prop="mailbox">
-                <JnpfInput v-model="dataForm.mailbox" @change="changeData('mailbox',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.mailbox" @change="changeData('mailbox', -1)" placeholder="请输入" clearable
+                  :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="入驻状态" prop="entryStatus">
-                <JnpfSelect v-model="dataForm.entryStatus" @change="changeData('entryStatus',-1)" placeholder="请选择"
-                  clearable :style='{"width":"100%"}' :options="entryStatusOptions" :props="entryStatusProps">
+                <JnpfSelect v-model="dataForm.entryStatus" @change="changeData('entryStatus', -1)" placeholder="请选择"
+                  clearable :style='{ "width": "100%" }' :options="entryStatusOptions" :props="entryStatusProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
@@ -116,90 +116,90 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="营业执照照片" prop="businessLicensePhoto">
-                <JnpfUploadImg v-model="dataForm.businessLicensePhoto" @change="changeData('businessLicensePhoto',-1)"
+                <JnpfUploadImg v-model="dataForm.businessLicensePhoto" @change="changeData('businessLicensePhoto', -1)"
                   :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="注册地址" prop="registeredAddress">
-                <JnpfInput v-model="dataForm.registeredAddress" @change="changeData('registeredAddress',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.registeredAddress" @change="changeData('registeredAddress', -1)"
+                  placeholder="请输入" clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-                <JnpfInput v-model="dataForm.unifiedSocialCreditCode" @change="changeData('unifiedSocialCreditCode',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.unifiedSocialCreditCode" @change="changeData('unifiedSocialCreditCode', -1)"
+                  placeholder="请输入" clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
               <jnpf-form-tip-item label="成立日期" prop="incorporationDate">
-                <JnpfDatePicker v-model="dataForm.incorporationDate" @change="changeData('incorporationDate',-1)"
-                  :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
-                  clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+                <JnpfDatePicker v-model="dataForm.incorporationDate" @change="changeData('incorporationDate', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="法定代表人" prop="lgPersonNm">
-                <JnpfInput v-model="dataForm.lgPersonNm" @change="changeData('lgPersonNm',-1)" placeholder="请输入"
-                  clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.lgPersonNm" @change="changeData('lgPersonNm', -1)" placeholder="请输入"
+                  clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="公司注册号" prop="companyRegistrationNumber">
                 <JnpfInput v-model="dataForm.companyRegistrationNumber"
-                  @change="changeData('companyRegistrationNumber',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
+                  @change="changeData('companyRegistrationNumber', -1)" placeholder="请输入" clearable
+                  :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="办公地址" prop="officeAddress">
-                <JnpfInput v-model="dataForm.officeAddress" @change="changeData('officeAddress',-1)" placeholder="请输入"
-                  clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.officeAddress" @change="changeData('officeAddress', -1)" placeholder="请输入"
+                  clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="注册资本" prop="registeredCapital">
-                <JnpfInput v-model="dataForm.registeredCapital" @change="changeData('registeredCapital',-1)"
-                  placeholder="请输入" addonAfter="万" clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.registeredCapital" @change="changeData('registeredCapital', -1)"
+                  placeholder="请输入" addonAfter="万" clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="注册资金单位" prop="registeredCapitalUnit">
-                <JnpfSelect v-model="dataForm.registeredCapitalUnit" @change="changeData('registeredCapitalUnit',-1)"
-                  placeholder="请选择" clearable :style='{"width":"100%"}' :options="registeredCapitalUnitOptions"
+                <JnpfSelect v-model="dataForm.registeredCapitalUnit" @change="changeData('registeredCapitalUnit', -1)"
+                  placeholder="请选择" clearable :style='{ "width": "100%" }' :options="registeredCapitalUnitOptions"
                   :props="registeredCapitalUnitProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="银行账号" prop="bankAccount">
-                <JnpfInput v-model="dataForm.bankAccount" @change="changeData('bankAccount',-1)" placeholder="请输入"
-                  clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.bankAccount" @change="changeData('bankAccount', -1)" placeholder="请输入"
+                  clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="开户银行" prop="openingBank">
-                <JnpfInput v-model="dataForm.openingBank" @change="changeData('openingBank',-1)" placeholder="请输入"
-                  clearable :style='{"width":"100%"}'>
+                <JnpfInput v-model="dataForm.openingBank" @change="changeData('openingBank', -1)" placeholder="请输入"
+                  clearable :style='{ "width": "100%" }'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
               <jnpf-form-tip-item label="经营范围" prop="natureObusiness">
-                <JnpfTextarea v-model="dataForm.natureObusiness" @change="changeData('natureObusiness',-1)"
-                  placeholder="请输入" :style='{"width":"100%"}' true type="textarea"
-                  :autosize='{"minRows":4,"maxRows":4}'>
+                <JnpfTextarea v-model="dataForm.natureObusiness" @change="changeData('natureObusiness', -1)"
+                  placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
+                  :autosize='{ "minRows": 4, "maxRows": 4 }'>
                 </JnpfTextarea>
               </jnpf-form-tip-item>
             </el-col>
@@ -207,7 +207,7 @@
           </template>
         </el-form>
         <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-          @select="addForSelect" @close="selectDialogVisible=false" />
+          @select="addForSelect" @close="selectDialogVisible = false" />
       </el-row>
     </div>
   </transition>
@@ -215,605 +215,605 @@
 
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getDefaultCurrentValueUserId
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentId
-  } from '@/api/permission/organize'
-  import {
-    getDateDay,
-    getLaterData,
-    getBeforeData,
-    getBeforeTime,
-    getLaterTime
-  } from '@/components/Generator/utils/index.js'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  export default {
-    components: {},
-    props: [],
-    data() {
-      return {
-        dataFormSubmitType: 0,
-        continueBtnLoading: false,
-        index: 0,
-        prevDis: false,
-        nextDis: false,
-        allList: [],
-        visible: false,
-        loading: false,
-        btnLoading: false,
-        formRef: 'formRef',
-        setting: {},
-        eventType: '',
-        userBoxVisible: false,
-        selectDialogVisible: false,
-        currTableConf: {},
-        dataValueAll: {},
-        addTableConf: {},
-        //可选范围默认值
-        ableAll: {},
-        tableRows: {},
-        Vmodel: "",
-        currVmodel: "",
-        dataForm: {
-          cmpNo: undefined,
-          cmpNm: undefined,
-          industry: undefined,
-          companySize: "1",
-          compType: "1",
-          companyStatus: "1",
-          userNm: undefined,
-          contactNumber: undefined,
-          mailbox: undefined,
-          entryStatus: "1",
-          businessLicensePhoto: [],
-          registeredAddress: undefined,
-          unifiedSocialCreditCode: undefined,
-          incorporationDate: undefined,
-          lgPersonNm: undefined,
-          companyRegistrationNumber: undefined,
-          officeAddress: undefined,
-          registeredCapital: undefined,
-          registeredCapitalUnit: "1",
-          bankAccount: undefined,
-          openingBank: undefined,
-          natureObusiness: undefined,
-          version: 0,
-        },
-        tableRequiredData: {},
-        dataRule: {
-          cmpNo: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          cmpNm: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          industry: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          companySize: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          compType: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          companyStatus: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          userNm: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          contactNumber: [{
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-              message: '请输入正确的联系方式',
-              trigger: 'blur'
-            },
-          ],
-          mailbox: [{
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
-              message: '请输入正确的邮箱',
-              trigger: 'blur'
-            },
-          ],
-          businessLicensePhoto: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          registeredAddress: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          unifiedSocialCreditCode: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          incorporationDate: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          lgPersonNm: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          companyRegistrationNumber: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          officeAddress: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          registeredCapital: [{
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-              message: '请输入正确的金额',
-              trigger: 'blur'
-            },
-          ],
-          registeredCapitalUnit: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          bankAccount: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          natureObusiness: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-        },
-        industryOptions: [],
-        industryProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        companySizeOptions: [{
-          "fullName": "特大型",
-          "id": "1"
-        }, {
-          "fullName": "大型",
-          "id": "2"
-        }, {
-          "fullName": "中型",
-          "id": "3"
-        }, {
-          "fullName": "小型",
-          "id": "4"
-        }, {
-          "fullName": "微型",
-          "id": "5"
-        }],
-        companySizeProps: {
-          "label": "fullName",
-          "value": "id"
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getDefaultCurrentValueUserId
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentId
+} from '@/api/permission/organize'
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
+} from '@/components/Generator/utils/index.js'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {},
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {},
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        cmpNo: undefined,
+        cmpNm: undefined,
+        industry: undefined,
+        companySize: "1",
+        compType: "1",
+        companyStatus: "1",
+        userNm: undefined,
+        contactNumber: undefined,
+        mailbox: undefined,
+        entryStatus: "1",
+        businessLicensePhoto: [],
+        registeredAddress: undefined,
+        unifiedSocialCreditCode: undefined,
+        incorporationDate: undefined,
+        lgPersonNm: undefined,
+        companyRegistrationNumber: undefined,
+        officeAddress: undefined,
+        registeredCapital: undefined,
+        registeredCapitalUnit: "1",
+        bankAccount: undefined,
+        openingBank: undefined,
+        natureObusiness: undefined,
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule: {
+        cmpNo: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        cmpNm: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        industry: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        companySize: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        compType: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        companyStatus: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        userNm: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        contactNumber: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         },
-        compTypeOptions: [{
-          "fullName": "有限责任公司",
-          "id": "1"
-        }, {
-          "fullName": "股份有限公司",
-          "id": "2"
-        }],
-        compTypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+          message: '请输入正确的联系方式',
+          trigger: 'blur'
         },
-        companyStatusOptions: [{
-          "fullName": "正常",
-          "id": "1"
-        }, {
-          "fullName": "注销",
-          "id": "2"
-        }, {
-          "fullName": "停业",
-          "id": "3"
-        }],
-        companyStatusProps: {
-          "label": "fullName",
-          "value": "id"
+        ],
+        mailbox: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         },
-        entryStatusOptions: [{
-          "fullName": "待签约",
-          "id": "1"
-        }, {
-          "fullName": "已入驻",
-          "id": "2"
-        }, {
-          "fullName": "已退出",
-          "id": "3"
-        }],
-        entryStatusProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          pattern: /^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
+          message: '请输入正确的邮箱',
+          trigger: 'blur'
         },
-        registeredCapitalUnitOptions: [{
-          "fullName": "人民币",
-          "id": "1"
-        }, {
-          "fullName": "美元",
-          "id": "2"
-        }],
-        registeredCapitalUnitProps: {
-          "label": "fullName",
-          "value": "id"
+        ],
+        businessLicensePhoto: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        registeredAddress: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        unifiedSocialCreditCode: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        incorporationDate: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        lgPersonNm: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        companyRegistrationNumber: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        officeAddress: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        registeredCapital: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         },
-        childIndex: -1,
-        isEdit: false,
-        interfaceRes: {
-          cmpNo: [],
-          cmpNm: [],
-          industry: [],
-          companySize: [],
-          compType: [],
-          companyStatus: [],
-          userNm: [],
-          contactNumber: [],
-          mailbox: [],
-          entryStatus: [],
-          businessLicensePhoto: [],
-          registeredAddress: [],
-          unifiedSocialCreditCode: [],
-          incorporationDate: [],
-          lgPersonNm: [],
-          companyRegistrationNumber: [],
-          officeAddress: [],
-          registeredCapital: [],
-          registeredCapitalUnit: [],
-          bankAccount: [],
-          openingBank: [],
-          natureObusiness: [],
+        {
+          pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
+          message: '请输入正确的金额',
+          trigger: 'blur'
         },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo'])
-    },
-    watch: {},
-    created() {
-      this.dataAll()
-      this.initDefaultData()
-      this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-    },
-    mounted() {},
-    methods: {
-      prev() {
-        this.index--
-        if (this.index === 0) {
-          this.prevDis = true
-        }
-        this.nextDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+        ],
+        registeredCapitalUnit: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        bankAccount: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        natureObusiness: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
       },
-      next() {
-        this.index++
-        if (this.index === this.allList.length - 1) {
-          this.nextDis = true
-        }
-        this.prevDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+      industryOptions: [],
+      industryProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getInfo(id) {
-        request({
-          url: '/api/example/EnterpriseMerchants/' + id,
-          method: 'get'
-        }).then(res => {
-          this.dataInfo(res.data)
-        });
+      companySizeOptions: [{
+        "fullName": "特大型",
+        "id": "1"
+      }, {
+        "fullName": "大型",
+        "id": "2"
+      }, {
+        "fullName": "中型",
+        "id": "3"
+      }, {
+        "fullName": "小型",
+        "id": "4"
+      }, {
+        "fullName": "微型",
+        "id": "5"
+      }],
+      companySizeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      compTypeOptions: [{
+        "fullName": "有限责任公司",
+        "id": "1"
+      }, {
+        "fullName": "股份有限公司",
+        "id": "2"
+      }],
+      compTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      companyStatusOptions: [{
+        "fullName": "正常",
+        "id": "1"
+      }, {
+        "fullName": "注销",
+        "id": "2"
+      }, {
+        "fullName": "停业",
+        "id": "3"
+      }],
+      companyStatusProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      entryStatusOptions: [{
+        "fullName": "待签约",
+        "id": "1"
+      }, {
+        "fullName": "已入驻",
+        "id": "2"
+      }, {
+        "fullName": "已退出",
+        "id": "3"
+      }],
+      entryStatusProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      goBack() {
-        this.visible = false
-        this.$emit('refreshDataList', true)
+      registeredCapitalUnitOptions: [{
+        "fullName": "人民币",
+        "id": "1"
+      }, {
+        "fullName": "美元",
+        "id": "2"
+      }],
+      registeredCapitalUnitProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      changeData(model, index) {
-        this.isEdit = false
-        this.childIndex = index
-        let modelAll = model.split("-");
-        let faceMode = "";
-        for (let i = 0; i < modelAll.length; i++) {
-          faceMode += modelAll[i];
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        cmpNo: [],
+        cmpNm: [],
+        industry: [],
+        companySize: [],
+        compType: [],
+        companyStatus: [],
+        userNm: [],
+        contactNumber: [],
+        mailbox: [],
+        entryStatus: [],
+        businessLicensePhoto: [],
+        registeredAddress: [],
+        unifiedSocialCreditCode: [],
+        incorporationDate: [],
+        lgPersonNm: [],
+        companyRegistrationNumber: [],
+        officeAddress: [],
+        registeredCapital: [],
+        registeredCapitalUnit: [],
+        bankAccount: [],
+        openingBank: [],
+        natureObusiness: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        for (let key in this.interfaceRes) {
-          if (key != faceMode) {
-            let faceReList = this.interfaceRes[key]
-            for (let i = 0; i < faceReList.length; i++) {
-              if (faceReList[i].relationField == model) {
-                let options = 'get' + key + 'Options';
-                if (this[options]) {
-                  this[options]()
-                }
-                this.changeData(key, index)
-              }
-            }
-          }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-      },
-      changeDataFormData(type, data, model, index, defaultValue) {
-        if (!this.isEdit) {
-          if (type == 2) {
-            for (let i = 0; i < this.dataForm[data].length; i++) {
-              if (index == -1) {
-                this.dataForm[data][i][model] = defaultValue
-              } else if (index == i) {
-                this.dataForm[data][i][model] = defaultValue
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/example/EnterpriseMerchants/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
               }
+              this.changeData(key, index)
             }
-          } else {
-            this.dataForm[data] = defaultValue
           }
         }
-      },
-      dataAll() {
-        this.getindustryOptions();
-      },
-      getindustryOptions() {
-        getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
-          this.industryOptions = res.data.list
-        })
-      },
-      goBack() {
-        this.$emit('refresh')
-      },
-      clearData() {
-        this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-      },
-      init(id, isDetail, allList) {
-        this.prevDis = false
-        this.nextDis = false
-        this.allList = allList || []
-        if (allList.length) {
-          this.index = this.allList.findIndex(item => item.id === id)
-          if (this.index == 0) {
-            this.prevDis = true
-          }
-          if (this.index == this.allList.length - 1) {
-            this.nextDis = true
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
           }
         } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getindustryOptions();
+    },
+    getindustryOptions() {
+      getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
+        this.industryOptions = res.data.list
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
           this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
           this.nextDis = true
         }
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.$nextTick(() => {
-          if (this.dataForm.id) {
-            this.loading = true
-            request({
-              url: '/api/example/EnterpriseMerchants/' + this.dataForm.id,
-              method: 'get'
-            }).then(res => {
-              this.dataInfo(res.data)
-              this.loading = false
-            });
-          } else {
-            this.clearData()
-            this.initDefaultData()
-          }
-        });
-        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-      },
-      //初始化默认数据
-      initDefaultData() {
-
-      },
-      // 表单提交
-      dataFormSubmit(type) {
-        this.dataFormSubmitType = type ? type : 0
-        this.$refs['formRef'].validate((valid) => {
-          if (valid) {
-            this.request()
-          }
-        })
-      },
-      request() {
-        let _data = this.dataList()
-        if (this.dataFormSubmitType == 2) {
-          this.continueBtnLoading = true
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/example/EnterpriseMerchants/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
         } else {
-          this.btnLoading = true
+          this.clearData()
+          this.initDefaultData()
         }
-        if (!this.dataForm.id) {
-          request({
-            url: '/api/example/EnterpriseMerchants',
-            method: 'post',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) {
-                  this.$nextTick(() => {
-                    this.clearData()
-                    this.initDefaultData()
-                  })
-                  this.continueBtnLoading = false
-                  return
-                }
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/example/EnterpriseMerchants',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
               }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        } else {
-          request({
-            url: '/api/example/EnterpriseMerchants/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/example/EnterpriseMerchants/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        }
-      },
-      openSelectDialog(key) {
-        this.currTableConf = this.addTableConf[key]
-        this.currVmodel = key
-        this.selectDialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.selectDialog.init()
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
         })
-      },
-      addForSelect(data) {
-        for (let i = 0; i < data.length; i++) {
-          let t = data[i]
-          if (this['get' + this.currVmodel]) {
-            this['get' + this.currVmodel](t)
-          }
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
         }
-      },
-      dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-        let timeDataValue = null;
-        let timeValue = Number(timeValueData)
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = new Date().getTime()
-          } else if (timeType == 4) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getBeforeData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-            }
-          } else if (timeType == 5) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getLaterData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-            }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
           }
         }
-        return timeDataValue;
-      },
-      time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-        let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-        let timeDataValue = null
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue || '00:00:00'
-            if (timeDataValue.split(':').length == 3) {
-              timeDataValue = timeDataValue
-            } else {
-              timeDataValue = timeDataValue + ':00'
-            }
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = this.jnpf.toDate(new Date(), format)
-          } else if (timeType == 4) {
-            let previousDate = '';
-            previousDate = getBeforeTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
-          } else if (timeType == 5) {
-            let previousDate = '';
-            previousDate = getLaterTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
           }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
         }
-        return timeDataValue;
-      },
-      dataList() {
-        var _data = this.dataForm;
-        return _data;
-      },
-      dataInfo(dataAll) {
-        let _dataAll = dataAll
-        this.dataForm = _dataAll
-        this.isEdit = true
-        this.dataAll()
-        this.childIndex = -1
-      },
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
     },
-  }
+  },
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/index.vue
index 8ac40f3..29be7a1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/index.vue
@@ -33,10 +33,10 @@
             <el-form-item>
               <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 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 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-form-item>
@@ -59,63 +59,64 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="cmpNo" label="公司编码" align="left">
+        <el-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+          <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+          <el-table-column prop="cmpNo" label="公司编码" align="center"width="150"fixed="left">
           </el-table-column>
-          <el-table-column prop="cmpNm" label="公司名称" align="left">
+          <el-table-column prop="cmpNm" label="公司名称" align="center" width="150"fixed="left">
           </el-table-column>
-          <el-table-column label="入驻状态" prop="entryStatus" algin="left">
+          <el-table-column label="入驻状态" prop="entryStatus" align="center"width="150">
             <template slot-scope="scope">
-              {{ scope.row.entryStatus}}
+              {{ scope.row.entryStatus }}
             </template>
           </el-table-column>
-          <el-table-column label="公司类型" prop="compType" algin="left">
+          <el-table-column label="公司类型" prop="compType" align="center" width="150">
             <template slot-scope="scope">
-              {{ scope.row.compType}}
+              {{ scope.row.compType }}
             </template>
           </el-table-column>
-          <el-table-column prop="companyRegistrationNumber" label="公司注册号" align="left">
+          <el-table-column prop="companyRegistrationNumber" label="注册号" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="incorporationDate" label="成立日期" align="left">
+          <el-table-column prop="incorporationDate" label="成立日期" align="center"width="150">
           </el-table-column>
-          <el-table-column prop="registeredAddress" label="注册地址" align="left">
+          <el-table-column prop="registeredAddress" label="注册地址" align="center"width="200">
           </el-table-column>
-          <el-table-column prop="officeAddress" label="办公地址" align="left">
+          <el-table-column prop="officeAddress" label="办公地址" align="center"width="200">
           </el-table-column>
-          <el-table-column prop="userNm" label="联系人" align="left">
+          <el-table-column prop="userNm" label="联系人" align="center"width="200">
           </el-table-column>
-          <el-table-column prop="contactNumber" label="联系电话" align="left">
+          <el-table-column prop="contactNumber" label="联系电话" align="center"width="200">
           </el-table-column>
-          <el-table-column prop="mailbox" label="邮箱" align="left">
+          <el-table-column prop="mailbox" label="邮箱" align="center"width="200">
           </el-table-column>
-          <el-table-column prop="lgPersonNm" label="法定代表人" align="left">
+          <el-table-column prop="lgPersonNm" label="法定代表人" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="industry" label="所属行业" align="left">
+          <el-table-column prop="industry" label="所属行业" align="center"width="200">
           </el-table-column>
-          <el-table-column label="公司规模" prop="companySize" algin="left">
+          <el-table-column label="公司规模" prop="companySize" align="center"width="200">
             <template slot-scope="scope">
-              {{ scope.row.companySize}}
+              {{ scope.row.companySize }}
             </template>
           </el-table-column>
-          <el-table-column prop="registeredCapital" label="注册资本" align="left">
+          <el-table-column prop="registeredCapital" label="注册资本" align="center"width="200">
           </el-table-column>
-          <el-table-column label="注册资金单位" prop="registeredCapitalUnit" algin="left">
+          <el-table-column label="注册资金单位" prop="registeredCapitalUnit" align="center" width="150">
             <template slot-scope="scope">
-              {{ scope.row.registeredCapitalUnit}}
+              {{ scope.row.registeredCapitalUnit }}
             </template>
           </el-table-column>
-          <el-table-column label="公司状态" prop="companyStatus" algin="left">
+          <el-table-column label="公司状态" prop="companyStatus" align="center">
             <template slot-scope="scope">
-              {{ scope.row.companyStatus}}
+              {{ scope.row.companyStatus }}
             </template>
           </el-table-column>
-          <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" align="left">
+          <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" align="center" width="200">
           </el-table-column>
-          <el-table-column prop="bankAccount" label="银行账号" align="left">
+          <el-table-column prop="bankAccount" label="银行账号" align="center">
           </el-table-column>
-          <el-table-column prop="openingBank" label="开户银行" align="left">
+          <el-table-column prop="openingBank" label="开户银行" align="center"width="200">
           </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">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
@@ -125,7 +126,7 @@
               </el-button>
             </template>
           </el-table-column>
-        </JNPF-table>
+        </el-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
           @pagination="initData" />
       </div>
@@ -137,467 +138,467 @@
 
 
     <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" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './form'
-  import Detail from './Detail'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-  export default {
-    components: {
-      JNPFForm,
-      Detail,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    JNPFForm,
+    Detail,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
 
-        showAll: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          cmpNo: undefined,
-          cmpNm: undefined,
-          compType: undefined,
-          companyStatus: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        industryOptions: [],
-        industryProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        companySizeOptions: [{
-          "fullName": "特大型",
-          "id": "1"
-        }, {
-          "fullName": "大型",
-          "id": "2"
-        }, {
-          "fullName": "中型",
-          "id": "3"
-        }, {
-          "fullName": "小型",
-          "id": "4"
-        }, {
-          "fullName": "微型",
-          "id": "5"
-        }],
-        companySizeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        compTypeOptions: [{
-          "fullName": "有限责任公司",
-          "id": "1"
-        }, {
-          "fullName": "股份有限公司",
-          "id": "2"
-        }],
-        compTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        companyStatusOptions: [{
-          "fullName": "正常",
-          "id": "1"
-        }, {
-          "fullName": "注销",
-          "id": "2"
-        }, {
-          "fullName": "停业",
-          "id": "3"
-        }],
-        companyStatusProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        entryStatusOptions: [{
-          "fullName": "待签约",
-          "id": "1"
-        }, {
-          "fullName": "已入驻",
-          "id": "2"
-        }, {
-          "fullName": "已退出",
-          "id": "3"
-        }],
-        entryStatusProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        registeredCapitalUnitOptions: [{
-          "fullName": "人民币",
-          "id": "1"
-        }, {
-          "fullName": "美元",
-          "id": "2"
-        }],
-        registeredCapitalUnitProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {},
-      }
-    },
-    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)
-          })
-        })
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        cmpNo: undefined,
+        cmpNm: undefined,
+        compType: undefined,
+        companyStatus: undefined,
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
-          }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      industryOptions: [],
+      industryProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
+      companySizeOptions: [{
+        "fullName": "特大型",
+        "id": "1"
+      }, {
+        "fullName": "大型",
+        "id": "2"
+      }, {
+        "fullName": "中型",
+        "id": "3"
+      }, {
+        "fullName": "小型",
+        "id": "4"
+      }, {
+        "fullName": "微型",
+        "id": "5"
+      }],
+      companySizeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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)
-        return list
+      compTypeOptions: [{
+        "fullName": "有限责任公司",
+        "id": "1"
+      }, {
+        "fullName": "股份有限公司",
+        "id": "2"
+      }],
+      compTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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]
-          }
-        }
+      companyStatusOptions: [{
+        "fullName": "正常",
+        "id": "1"
+      }, {
+        "fullName": "注销",
+        "id": "2"
+      }, {
+        "fullName": "停业",
+        "id": "3"
+      }],
+      companyStatusProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
-            }
-            item.children.unshift(child)
-          }
+      entryStatusOptions: [{
+        "fullName": "待签约",
+        "id": "1"
+      }, {
+        "fullName": "已入驻",
+        "id": "2"
+      }, {
+        "fullName": "已退出",
+        "id": "3"
+      }],
+      entryStatusProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      registeredCapitalUnitOptions: [{
+        "fullName": "人民币",
+        "id": "1"
+      }, {
+        "fullName": "美元",
+        "id": "2"
+      }],
+      registeredCapitalUnitProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {},
+    }
+  },
+  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
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          this.$refs.treeBox.setCurrentKey(null)
         })
-        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
-                })
-              }
-            })
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
+          }
+        }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
           } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
+            resolve([]);
           }
         })
-      },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
+      }
+    },
+    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
             }
-          } else {
-            exportList.push(list[i])
           }
         }
-        this.exportList = exportList
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      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: '582533930381480837',
-          type: 1,
-        };
-        request({
-          url: `/api/example/EnterpriseMerchants/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({
-            url: `/api/example/EnterpriseMerchants/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    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) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          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 {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
           })
-        }).catch(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "example/EnterpriseMerchants")
-        })
-      },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
-      },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        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
         }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    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: '582533930381480837',
+        type: 1,
+      };
+      request({
+        url: `/api/example/EnterpriseMerchants/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({
-          url: `/api/example/EnterpriseMerchants/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/example/EnterpriseMerchants/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      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()
-      },
-    }
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "example/EnterpriseMerchants")
+      })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      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/EnterpriseMerchants/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>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/Detail.vue
index b4bd1bb..1caf9c4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/Detail.vue
@@ -1,179 +1,164 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<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="code"  >
-                        <p>{{dataForm.code}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备名称"  
- prop="name"  >
-                        <p>{{dataForm.name}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备类型"  
- prop="type"  >
-                         <p>{{ dataForm.type }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备品牌"  
- prop="brand"  >
-                        <p>{{dataForm.brand}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备型号"  
- prop="model"  >
-                        <p>{{dataForm.model}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="批次号"  
- prop="batchNumber"  >
-                        <p>{{dataForm.batchNumber}}</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="status"  >
-                         <p>{{ dataForm.status }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="保修期"  
- prop="defectsLiabilityPeriod"  >
-                        <p>{{dataForm.defectsLiabilityPeriod}}</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="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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="code">
+                            <p>{{ dataForm.code }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备名称" prop="name">
+                            <p>{{ dataForm.name }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备类型" prop="type">
+                            <p>{{ dataForm.type }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备品牌" prop="brand">
+                            <p>{{ dataForm.brand }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备型号" prop="model">
+                            <p>{{ dataForm.model }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="批次号" prop="batchNumber">
+                            <p>{{ dataForm.batchNumber }}</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="status">
+                            <p>{{ dataForm.status }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="保修期" prop="defectsLiabilityPeriod">
+                            <p>{{ dataForm.defectsLiabilityPeriod }}</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="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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            code : '',
-                            name : '',
-                            type : "",
-                            brand : '',
-                            model : '',
-                            batchNumber : '',
-                            supplier : '',
-                            supplierPhone : '',
-                            status : "1",
-                            defectsLiabilityPeriod : '',
-                            warrantyStartTime : '',
-                            warrantyEndTime : '',
-                            description : '',
+                id: '',
+                code: '',
+                name: '',
+                type: "",
+                brand: '',
+                model: '',
+                batchNumber: '',
+                supplier: '',
+                supplierPhone: '',
+                status: "1",
+                defectsLiabilityPeriod: '',
+                warrantyStartTime: '',
+                warrantyEndTime: '',
+                description: '',
             },
-                            typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
-                        typeProps:{"label":"fullName","value":"id"  },
-                            statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}],
-                        statusProps:{"label":"fullName","value":"id"  },
+            typeOptions: [{ "fullName": "类型1", "id": "10" }, { "fullName": "类型2", "id": "20" }],
+            typeProps: { "label": "fullName", "value": "id" },
+            statusOptions: [{ "fullName": "可用", "id": "1" }, { "fullName": "已租", "id": "2" }, { "fullName": "报废", "id": "3" }],
+            statusProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Equipment/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/Equipment/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue
index 02443a2..e4dc489 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue
@@ -56,7 +56,7 @@
             </jnpf-form-tip-item>
           </el-col>
           <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="请输入"
                 clearable :style='{"width":"100%"}'>
               </JnpfInput>
@@ -78,7 +78,7 @@
           </el-col>
 
           <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)"
                 :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
                 :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
@@ -87,7 +87,7 @@
           </el-col>
 
           <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)"
                 :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
                 :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
index 3754483..bdfe24f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
@@ -57,40 +57,41 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="code" label="设备编码" align="left">
+        <el-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+          <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 prop="name" label="设备名称" align="left">
+          <el-table-column prop="name" label="设备名称" align="center"width="150"fixed="left">
           </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">
               {{ scope.row.status}}
             </template>
           </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 label="设备类型" prop="type" algin="left">
+          <el-table-column label="设备类型" prop="type" align="center"width="150">
             <template slot-scope="scope">
               {{ scope.row.type}}
             </template>
           </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 prop="model" label="设备型号" align="left">
+          <el-table-column prop="model" label="设备型号" align="center"width="150">
           </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 prop="supplierPhone" label="供应商联系电话" align="left">
+          <el-table-column prop="supplierPhone" label="供应商联系电话" align="center"width="150">
           </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 prop="warrantyEndTime" label="保修结束时间" align="left">
+          <el-table-column prop="warrantyEndTime" label="保修结束时间" align="center"width="150">
           </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 prop="description" label="设备描述" align="left">
+          <el-table-column prop="description" label="设备描述" align="center"width="200">
           </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">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
@@ -102,7 +103,7 @@
               </el-button>
             </template>
           </el-table-column>
-        </JNPF-table>
+        </el-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
           @pagination="initData" />
       </div>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/index.vue
index b3adcd9..d07969e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/index.vue
@@ -55,21 +55,21 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="inspectionTicketNumber" label="巡检单号" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+          <el-table-column prop="inspectionTicketNumber" label="巡检单号" align="center">
           </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 prop="equipmentNumber" label="设备编码" align="left">
+          <el-table-column prop="equipmentNumber" label="设备编码" align="center">
           </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 label="设备状态" prop="equipmentStatus" algin="left">
+          <el-table-column label="设备状态" prop="equipmentStatus" align="center">
             <template slot-scope="scope">
               {{ scope.row.equipmentStatus}}
             </template>
           </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">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/Detail.vue
index 41a4fb7..8a4045d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/Detail.vue
@@ -1,194 +1,177 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<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="repairOrderNumber"  >
-                        <p>{{dataForm.repairOrderNumber}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="报修单"  
- prop="repairOrderId"  >
-                        <p>{{dataForm.repairOrderId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备编码"  
- prop="number"  >
-                        <p>{{dataForm.number}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备名称"  
- prop="name"  >
-                        <p>{{dataForm.name}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="维修方式"  
- prop="maintenanceMethods"  >
-                         <p>{{ dataForm.maintenanceMethods }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="维修进度"  
- prop="maintenancePlan"  >
-                         <p>{{ dataForm.maintenancePlan }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="维修人"  
- prop="maintenancePersonnel"  >
-                        <p>{{dataForm.maintenancePersonnel}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="维修时间"  
- prop="maintenanceDate"  >
-                        <p>{{dataForm.maintenanceDate}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="是否产生费用"  
- prop="expensesIncurred"  >
-                         <p>{{ dataForm.expensesIncurred }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="费用金额"  
- prop="costAmount"  >
-                        <p>{{dataForm.costAmount}}元</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="是否计入租户账单"  
- prop="tenantBill"  >
-                         <p>{{ dataForm.tenantBill }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="费用说明"  
- prop="costDetail"  >
-                        <p>{{dataForm.costDetail}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="维修描述"  
- prop="maintenanceDescribe"  >
-                        <p>{{dataForm.maintenanceDescribe}}</p>
-                </jnpf-form-tip-item>
-            </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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="repairOrderNumber">
+                            <p>{{ dataForm.repairOrderNumber }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="报修单" prop="repairOrderId">
+                            <p>{{ dataForm.repairOrderId }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备编码" prop="number">
+                            <p>{{ dataForm.number }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备名称" prop="name">
+                            <p>{{ dataForm.name }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="维修方式" prop="maintenanceMethods">
+                            <p>{{ dataForm.maintenanceMethods }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="维修进度" prop="maintenancePlan">
+                            <p>{{ dataForm.maintenancePlan }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="维修人" prop="maintenancePersonnel">
+                            <p>{{ dataForm.maintenancePersonnel }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="维修时间" prop="maintenanceDate">
+                            <p>{{ dataForm.maintenanceDate }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="是否有费用" prop="expensesIncurred">
+                            <p>{{ dataForm.expensesIncurred }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="费用金额" prop="costAmount">
+                            <p>{{ dataForm.costAmount }}元</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="是否计入租户账单" prop="tenantBill">
+                            <p>{{ dataForm.tenantBill }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="费用说明" prop="costDetail">
+                            <p>{{ dataForm.costDetail }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="维修描述" prop="maintenanceDescribe">
+                            <p>{{ dataForm.maintenanceDescribe }}</p>
+                        </jnpf-form-tip-item>
+                    </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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            repairOrderNumber : '',
-                            repairOrderId : "",
-                            number : '',
-                            name : '',
-                            maintenanceMethods : "1",
-                            maintenancePlan : "2",
-                            maintenancePersonnel : '',
-                            maintenanceDate : '',
-                            expensesIncurred : "2",
-                            costAmount : '',
-                            tenantBill : "2",
-                            costDetail : '',
-                            maintenanceDescribe : '',
-                            repairPhoto : [],
-                            equipmentId : '',
+                id: '',
+                repairOrderNumber: '',
+                repairOrderId: "",
+                number: '',
+                name: '',
+                maintenanceMethods: "1",
+                maintenancePlan: "2",
+                maintenancePersonnel: '',
+                maintenanceDate: '',
+                expensesIncurred: "2",
+                costAmount: '',
+                tenantBill: "2",
+                costDetail: '',
+                maintenanceDescribe: '',
+                repairPhoto: [],
+                equipmentId: '',
             },
-                            maintenanceMethodsOptions:[{"fullName":"保修期内","id":"1"},{"fullName":"更换配件","id":"2"},{"fullName":"更换设备","id":"3"}],
-                        maintenanceMethodsProps:{"label":"fullName","value":"id"  },
-                            maintenancePlanOptions:[{"fullName":"维修中","id":"1"},{"fullName":"已维修","id":"2"}],
-                        maintenancePlanProps:{"label":"fullName","value":"id"  },
-                            expensesIncurredOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}],
-                        expensesIncurredProps:{"label":"fullName","value":"id"  },
-                            tenantBillOptions:[{"fullName":"是 ","id":"1"},{"fullName":"否","id":"2"}],
-                        tenantBillProps:{"label":"fullName","value":"id"  },
+            maintenanceMethodsOptions: [{ "fullName": "保修期内", "id": "1" }, { "fullName": "更换配件", "id": "2" }, { "fullName": "更换设备", "id": "3" }],
+            maintenanceMethodsProps: { "label": "fullName", "value": "id" },
+            maintenancePlanOptions: [{ "fullName": "维修中", "id": "1" }, { "fullName": "已维修", "id": "2" }],
+            maintenancePlanProps: { "label": "fullName", "value": "id" },
+            expensesIncurredOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
+            expensesIncurredProps: { "label": "fullName", "value": "id" },
+            tenantBillOptions: [{ "fullName": "是 ", "id": "1" }, { "fullName": "否", "id": "2" }],
+            tenantBillProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/EquipmentMaintenanceRecords/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/EquipmentMaintenanceRecords/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/form.vue
index 0a04ae6..7fe378a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+  <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
     class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
@@ -8,106 +8,106 @@
           <!-- 具体表单 -->
           <el-col :span="8">
             <jnpf-form-tip-item label="维修单号" prop="repairOrderNumber">
-              <JnpfInput v-model="dataForm.repairOrderNumber" @change="changeData('repairOrderNumber',-1)"
-                placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.repairOrderNumber" @change="changeData('repairOrderNumber', -1)"
+                placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="报修单" prop="repairOrderId">
-              <JnpfPopupSelect v-model="dataForm.repairOrderId" @change="repairOrderChangeData"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.repairOrderId" placeholder="请选择"
-                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='repair_number'
+              <JnpfPopupSelect v-model="dataForm.repairOrderId" @change="repairOrderChangeData" :rowIndex="null"
+                :formData="dataForm" :templateJson="interfaceRes.repairOrderId" placeholder="请选择" propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='repair_number'
                 field='repairOrderId' interfaceId="583200623768371397" :pageSize="20" :disabled="dataForm.id"
-                :columnOptions="repairOrderIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                :columnOptions="repairOrderIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="设备编码" prop="number">
-              <JnpfInput v-model="dataForm.number" @change="changeData('number',-1)" placeholder="请输入" readonly
-                clearable :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.number" @change="changeData('number', -1)" placeholder="请输入" readonly
+                clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="设备名称" prop="name">
-              <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入" readonly clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入" readonly clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="维修方式" prop="maintenanceMethods">
-              <JnpfSelect v-model="dataForm.maintenanceMethods" @change="changeData('maintenanceMethods',-1)"
-                placeholder="请选择" clearable :style='{"width":"100%"}' :options="maintenanceMethodsOptions"
+              <JnpfSelect v-model="dataForm.maintenanceMethods" @change="changeData('maintenanceMethods', -1)"
+                placeholder="请选择" clearable :style='{ "width": "100%" }' :options="maintenanceMethodsOptions"
                 :props="maintenanceMethodsProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="维修进度" prop="maintenancePlan">
-              <JnpfSelect v-model="dataForm.maintenancePlan" @change="changeData('maintenancePlan',-1)"
-                placeholder="请选择" clearable :style='{"width":"100%"}' :options="maintenancePlanOptions"
+              <JnpfSelect v-model="dataForm.maintenancePlan" @change="changeData('maintenancePlan', -1)"
+                placeholder="请选择" clearable :style='{ "width": "100%" }' :options="maintenancePlanOptions"
                 :props="maintenancePlanProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="维修人" prop="maintenancePersonnel">
-              <JnpfInput v-model="dataForm.maintenancePersonnel" @change="changeData('maintenancePersonnel',-1)"
-                placeholder="请输入" clearable :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.maintenancePersonnel" @change="changeData('maintenancePersonnel', -1)"
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8">
             <jnpf-form-tip-item label="维修时间" prop="maintenanceDate">
-              <JnpfDatePicker v-model="dataForm.maintenanceDate" @change="changeData('maintenanceDate',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
-                :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+              <JnpfDatePicker v-model="dataForm.maintenanceDate" @change="changeData('maintenanceDate', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
+                :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
-            <jnpf-form-tip-item label="是否产生费用" prop="expensesIncurred">
-              <JnpfSelect v-model="dataForm.expensesIncurred" @change="changeData('expensesIncurred',-1)"
-                placeholder="请选择" clearable :style='{"width":"100%"}' :options="expensesIncurredOptions"
+            <jnpf-form-tip-item label="是否有费用" prop="expensesIncurred">
+              <JnpfSelect v-model="dataForm.expensesIncurred" @change="changeData('expensesIncurred', -1)"
+                placeholder="请选择" clearable :style='{ "width": "100%" }' :options="expensesIncurredOptions"
                 :props="expensesIncurredProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="dataForm.expensesIncurred == 1">
             <jnpf-form-tip-item label="费用金额" prop="costAmount">
-              <JnpfInput v-model="dataForm.costAmount" @change="changeData('costAmount',-1)" placeholder="请输入"
-                addonAfter="元" clearable :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.costAmount" @change="changeData('costAmount', -1)" placeholder="请输入"
+                addonAfter="元" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="dataForm.expensesIncurred == 1">
             <jnpf-form-tip-item label="是否计入租户账单" prop="tenantBill">
-              <JnpfSelect v-model="dataForm.tenantBill" @change="changeData('tenantBill',-1)" placeholder="请选择"
-                clearable :style='{"width":"100%"}' :options="tenantBillOptions" :props="tenantBillProps">
+              <JnpfSelect v-model="dataForm.tenantBill" @change="changeData('tenantBill', -1)" placeholder="请选择"
+                clearable :style='{ "width": "100%" }' :options="tenantBillOptions" :props="tenantBillProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="dataForm.expensesIncurred == 1">
             <jnpf-form-tip-item label="费用说明" prop="costDetail">
-              <JnpfInput v-model="dataForm.costDetail" @change="changeData('costDetail',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.costDetail" @change="changeData('costDetail', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="维修描述" prop="maintenanceDescribe">
-              <JnpfTextarea v-model="dataForm.maintenanceDescribe" @change="changeData('maintenanceDescribe',-1)"
-                placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}'>
+              <JnpfTextarea v-model="dataForm.maintenanceDescribe" @change="changeData('maintenanceDescribe', -1)"
+                placeholder="请输入" :style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="维修照片" prop="repairPhoto">
-              <JnpfUploadImg v-model="dataForm.repairPhoto" @change="changeData('repairPhoto',-1)" :fileSize="10"
+              <JnpfUploadImg v-model="dataForm.repairPhoto" @change="changeData('repairPhoto', -1)" :fileSize="10"
                 sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
               </JnpfUploadImg>
             </jnpf-form-tip-item>
@@ -116,19 +116,19 @@
         </template>
       </el-form>
       <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-        @select="addForSelect" @close="selectDialogVisible=false" />
+        @select="addForSelect" @close="selectDialogVisible = false" />
     </el-row>
     <span slot="footer" class="dialog-footer">
       <div class="upAndDown-button" v-if="dataForm.id">
         <el-button @click="prev" :disabled='prevDis'>
-          {{'上一条'}}
+          {{ '上一条' }}
         </el-button>
         <el-button @click="next" :disabled='nextDis'>
-          {{'下一条'}}
+          {{ '下一条' }}
         </el-button>
       </div>
       <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
-        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
+        {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
       <el-button @click="visible = false"> 取 消</el-button>
       <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
     </span>
@@ -137,504 +137,504 @@
 
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getDefaultCurrentValueUserId
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentId
-  } from '@/api/permission/organize'
-  import {
-    getDateDay,
-    getLaterData,
-    getBeforeData,
-    getBeforeTime,
-    getLaterTime
-  } from '@/components/Generator/utils/index.js'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  export default {
-    components: {},
-    props: [],
-    data() {
-      return {
-        dataFormSubmitType: 0,
-        continueBtnLoading: false,
-        index: 0,
-        prevDis: false,
-        nextDis: false,
-        allList: [],
-        visible: false,
-        loading: false,
-        btnLoading: false,
-        formRef: 'formRef',
-        setting: {},
-        eventType: '',
-        userBoxVisible: false,
-        selectDialogVisible: false,
-        currTableConf: {},
-        dataValueAll: {},
-        addTableConf: {},
-        //可选范围默认值
-        ableAll: {},
-        tableRows: {},
-        Vmodel: "",
-        currVmodel: "",
-        dataForm: {
-          repairOrderNumber: undefined,
-          repairOrderId: undefined,
-          number: undefined,
-          name: undefined,
-          maintenanceMethods: "1",
-          maintenancePlan: "2",
-          maintenancePersonnel: undefined,
-          maintenanceDate: undefined,
-          expensesIncurred: "2",
-          costAmount: undefined,
-          tenantBill: "2",
-          costDetail: undefined,
-          maintenanceDescribe: undefined,
-          repairPhoto: [],
-          equipmentId: undefined,
-          version: 0,
-        },
-        tableRequiredData: {},
-        dataRule: {
-          repairOrderId: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          number: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          name: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          maintenanceMethods: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          maintenancePlan: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          maintenancePersonnel: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          maintenanceDate: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          costAmount: [{
-            pattern: /^\d+$/,
-            message: '请输入正确的数字',
-            trigger: 'blur'
-          }, ],
-          equipmentId: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-        },
-        repairOrderIdcolumnOptions: [{
-          "label": "报修单号",
-          "value": "repair_number"
-        }, {
-          "label": "空间名称",
-          "value": "space_name"
-        }, {
-          "label": "设备编号",
-          "value": "equipment_number"
-        }, {
-          "label": "设备名称",
-          "value": "equipment_name"
-        }, {
-          "label": "故障原因",
-          "value": "cause_of_malfunction"
-        }, ],
-        maintenanceMethodsOptions: [{
-          "fullName": "保修期内",
-          "id": "1"
-        }, {
-          "fullName": "更换配件",
-          "id": "2"
-        }, {
-          "fullName": "更换设备",
-          "id": "3"
-        }],
-        maintenanceMethodsProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        maintenancePlanOptions: [{
-          "fullName": "维修中",
-          "id": "1"
-        }, {
-          "fullName": "已维修",
-          "id": "2"
-        }],
-        maintenancePlanProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        expensesIncurredOptions: [{
-          "fullName": "是",
-          "id": "1"
-        }, {
-          "fullName": "否",
-          "id": "2"
-        }],
-        expensesIncurredProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tenantBillOptions: [{
-          "fullName": "是 ",
-          "id": "1"
-        }, {
-          "fullName": "否",
-          "id": "2"
-        }],
-        tenantBillProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        childIndex: -1,
-        isEdit: false,
-        interfaceRes: {
-          repairOrderNumber: [],
-          repairOrderId: [],
-          number: [],
-          name: [],
-          maintenanceMethods: [],
-          maintenancePlan: [],
-          maintenancePersonnel: [],
-          maintenanceDate: [],
-          expensesIncurred: [],
-          costAmount: [],
-          tenantBill: [],
-          costDetail: [],
-          maintenanceDescribe: [],
-          repairPhoto: [],
-          equipmentId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo'])
-    },
-    watch: {},
-    created() {
-      this.dataAll()
-      this.initDefaultData()
-      this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-    },
-    mounted() {},
-    methods: {
-      repairOrderChangeData(var1, var2){
-        this.dataForm.repairOrderId = var2.id
-        this.dataForm.equipmentId = var2.equipment_id
-        this.dataForm.number = var2.equipment_number
-        this.dataForm.name = var2.equipment_name
-        this.dataForm.spaceId = var2.space_id
-        this.dataForm.spaceName = var2.space_name
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getDefaultCurrentValueUserId
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentId
+} from '@/api/permission/organize'
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
+} from '@/components/Generator/utils/index.js'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {},
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {},
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        repairOrderNumber: undefined,
+        repairOrderId: undefined,
+        number: undefined,
+        name: undefined,
+        maintenanceMethods: "1",
+        maintenancePlan: "2",
+        maintenancePersonnel: undefined,
+        maintenanceDate: undefined,
+        expensesIncurred: "2",
+        costAmount: undefined,
+        tenantBill: "2",
+        costDetail: undefined,
+        maintenanceDescribe: undefined,
+        repairPhoto: [],
+        equipmentId: undefined,
+        version: 0,
       },
-      prev() {
-        this.index--
-        if (this.index === 0) {
-          this.prevDis = true
-        }
-        this.nextDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+      tableRequiredData: {},
+      dataRule: {
+        repairOrderId: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        number: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        name: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        maintenanceMethods: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        maintenancePlan: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        maintenancePersonnel: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        maintenanceDate: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        costAmount: [{
+          pattern: /^\d+$/,
+          message: '请输入正确的数字',
+          trigger: 'blur'
+        },],
+        equipmentId: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
       },
-      next() {
-        this.index++
-        if (this.index === this.allList.length - 1) {
-          this.nextDis = true
-        }
-        this.prevDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+      repairOrderIdcolumnOptions: [{
+        "label": "报修单号",
+        "value": "repair_number"
+      }, {
+        "label": "空间名称",
+        "value": "space_name"
+      }, {
+        "label": "设备编号",
+        "value": "equipment_number"
+      }, {
+        "label": "设备名称",
+        "value": "equipment_name"
+      }, {
+        "label": "故障原因",
+        "value": "cause_of_malfunction"
+      },],
+      maintenanceMethodsOptions: [{
+        "fullName": "保修期内",
+        "id": "1"
+      }, {
+        "fullName": "更换配件",
+        "id": "2"
+      }, {
+        "fullName": "更换设备",
+        "id": "3"
+      }],
+      maintenanceMethodsProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getInfo(id) {
-        request({
-          url: '/api/example/EquipmentMaintenanceRecords/' + id,
-          method: 'get'
-        }).then(res => {
-          this.dataInfo(res.data)
-        });
+      maintenancePlanOptions: [{
+        "fullName": "维修中",
+        "id": "1"
+      }, {
+        "fullName": "已维修",
+        "id": "2"
+      }],
+      maintenancePlanProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      expensesIncurredOptions: [{
+        "fullName": "是",
+        "id": "1"
+      }, {
+        "fullName": "否",
+        "id": "2"
+      }],
+      expensesIncurredProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      goBack() {
-        this.visible = false
-        this.$emit('refreshDataList', true)
+      tenantBillOptions: [{
+        "fullName": "是 ",
+        "id": "1"
+      }, {
+        "fullName": "否",
+        "id": "2"
+      }],
+      tenantBillProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      changeData(model, index) {
-        this.isEdit = false
-        this.childIndex = index
-        let modelAll = model.split("-");
-        let faceMode = "";
-        for (let i = 0; i < modelAll.length; i++) {
-          faceMode += modelAll[i];
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        repairOrderNumber: [],
+        repairOrderId: [],
+        number: [],
+        name: [],
+        maintenanceMethods: [],
+        maintenancePlan: [],
+        maintenancePersonnel: [],
+        maintenanceDate: [],
+        expensesIncurred: [],
+        costAmount: [],
+        tenantBill: [],
+        costDetail: [],
+        maintenanceDescribe: [],
+        repairPhoto: [],
+        equipmentId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    repairOrderChangeData(var1, var2) {
+      this.dataForm.repairOrderId = var2.id
+      this.dataForm.equipmentId = var2.equipment_id
+      this.dataForm.number = var2.equipment_number
+      this.dataForm.name = var2.equipment_name
+      this.dataForm.spaceId = var2.space_id
+      this.dataForm.spaceName = var2.space_name
+    },
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        for (let key in this.interfaceRes) {
-          if (key != faceMode) {
-            let faceReList = this.interfaceRes[key]
-            for (let i = 0; i < faceReList.length; i++) {
-              if (faceReList[i].relationField == model) {
-                let options = 'get' + key + 'Options';
-                if (this[options]) {
-                  this[options]()
-                }
-                this.changeData(key, index)
-              }
-            }
-          }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-      },
-      changeDataFormData(type, data, model, index, defaultValue) {
-        if (!this.isEdit) {
-          if (type == 2) {
-            for (let i = 0; i < this.dataForm[data].length; i++) {
-              if (index == -1) {
-                this.dataForm[data][i][model] = defaultValue
-              } else if (index == i) {
-                this.dataForm[data][i][model] = defaultValue
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/example/EquipmentMaintenanceRecords/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
               }
+              this.changeData(key, index)
             }
-          } else {
-            this.dataForm[data] = defaultValue
           }
         }
-      },
-      dataAll() {},
-      clearData() {
-        this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-      },
-      init(id, isDetail, allList) {
-        this.prevDis = false
-        this.nextDis = false
-        this.allList = allList || []
-        if (allList.length) {
-          this.index = this.allList.findIndex(item => item.id === id)
-          if (this.index == 0) {
-            this.prevDis = true
-          }
-          if (this.index == this.allList.length - 1) {
-            this.nextDis = true
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
           }
         } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() { },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
           this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
           this.nextDis = true
         }
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.$nextTick(() => {
-          if (this.dataForm.id) {
-            this.loading = true
-            request({
-              url: '/api/example/EquipmentMaintenanceRecords/' + this.dataForm.id,
-              method: 'get'
-            }).then(res => {
-              this.dataInfo(res.data)
-              this.loading = false
-            });
-          } else {
-            this.clearData()
-            this.initDefaultData()
-          }
-        });
-        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-      },
-      //初始化默认数据
-      initDefaultData() {
-
-      },
-      // 表单提交
-      dataFormSubmit(type) {
-        this.dataFormSubmitType = type ? type : 0
-        this.$refs['formRef'].validate((valid) => {
-          if (valid) {
-            this.request()
-          }
-        })
-      },
-      request() {
-        let _data = this.dataList()
-        if (this.dataFormSubmitType == 2) {
-          this.continueBtnLoading = true
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/example/EquipmentMaintenanceRecords/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
         } else {
-          this.btnLoading = true
+          this.clearData()
+          this.initDefaultData()
         }
-        if (!this.dataForm.id) {
-          request({
-            url: '/api/example/EquipmentMaintenanceRecords',
-            method: 'post',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) {
-                  this.$nextTick(() => {
-                    this.clearData()
-                    this.initDefaultData()
-                  })
-                  this.continueBtnLoading = false
-                  return
-                }
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/example/EquipmentMaintenanceRecords',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
               }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        } else {
-          request({
-            url: '/api/example/EquipmentMaintenanceRecords/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/example/EquipmentMaintenanceRecords/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        }
-      },
-      openSelectDialog(key) {
-        this.currTableConf = this.addTableConf[key]
-        this.currVmodel = key
-        this.selectDialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.selectDialog.init()
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
         })
-      },
-      addForSelect(data) {
-        for (let i = 0; i < data.length; i++) {
-          let t = data[i]
-          if (this['get' + this.currVmodel]) {
-            this['get' + this.currVmodel](t)
-          }
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
         }
-      },
-      dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-        let timeDataValue = null;
-        let timeValue = Number(timeValueData)
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = new Date().getTime()
-          } else if (timeType == 4) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getBeforeData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-            }
-          } else if (timeType == 5) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getLaterData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-            }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
           }
         }
-        return timeDataValue;
-      },
-      time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-        let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-        let timeDataValue = null
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue || '00:00:00'
-            if (timeDataValue.split(':').length == 3) {
-              timeDataValue = timeDataValue
-            } else {
-              timeDataValue = timeDataValue + ':00'
-            }
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = this.jnpf.toDate(new Date(), format)
-          } else if (timeType == 4) {
-            let previousDate = '';
-            previousDate = getBeforeTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
-          } else if (timeType == 5) {
-            let previousDate = '';
-            previousDate = getLaterTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
           }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
         }
-        return timeDataValue;
-      },
-      dataList() {
-        var _data = this.dataForm;
-        return _data;
-      },
-      dataInfo(dataAll) {
-        let _dataAll = dataAll
-        this.dataForm = _dataAll
-        this.isEdit = true
-        this.dataAll()
-        this.childIndex = -1
-      },
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
     },
-  }
+  },
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/index.vue
index c229a9d..fcb29db 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/index.vue
@@ -1,53 +1,44 @@
-
-
-
-
-
-
-
 <template>
     <div class="JNPF-common-layout">
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="维修时间">
-                                        <JnpfDateRangePicker v-model="query.maintenanceDate"
-                                                             format="yyyy-MM-dd" startPlaceholder="开始日期"
-                                                             endPlaceholder="结束日期" >
-                                        </JnpfDateRangePicker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备编码">
-                                        <el-input v-model="query.number" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备名称">
-                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="维修进度">
-                                                <JnpfSelect v-model="query.maintenancePlan" placeholder="请选择" clearable
-                                                            :options="maintenancePlanOptions"
-                                                            :props="maintenancePlanProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="维修时间">
+                            <JnpfDateRangePicker v-model="query.maintenanceDate" format="yyyy-MM-dd"
+                                startPlaceholder="开始日期" endPlaceholder="结束日期">
+                            </JnpfDateRangePicker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备编码">
+                            <el-input v-model="query.number" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备名称">
+                            <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="维修进度">
+                                <JnpfSelect v-model="query.maintenancePlan" placeholder="请选择" clearable
+                                    :options="maintenancePlanOptions" :props="maintenancePlanProps" multiple>
+                                </JnpfSelect>
+                            </el-form-item>
+                        </el-col>
+                    </template>
                     <el-col :span="6">
                         <el-form-item>
                             <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 type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
+                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+                                展开
+                            </el-button>
+                            <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                                收起
+                            </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -55,485 +46,454 @@
             <div class="JNPF-common-layout-main JNPF-flex-main">
                 <div class="JNPF-common-head">
                     <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
+                        <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+                        </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
+                        <el-tooltip content="高级查询" placement="top" v-if="true">
+                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                @click="openSuperQuery()" />
+                        </el-tooltip>
+                        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                @click="initData()" />
+                        </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="repairOrderNumber"
- label="维修单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="number"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="name"
- label="设备名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="maintenancePersonnel"
- label="维修人"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="maintenanceDate"
- label="维修时间"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="维修方式"  prop="maintenanceMethods" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.maintenanceMethods}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="maintenanceDescribe"
- label="维修描述"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="维修进度"  prop="maintenancePlan" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.maintenancePlan}}
-                                            </template>
-                                        </el-table-column>
-                                        <el-table-column label="是否产生费用"  prop="expensesIncurred" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.expensesIncurred}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            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>
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :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="number" label="设备编码" align="center"width="150"fixed="left">
+                    </el-table-column>
+                    <el-table-column prop="name" label="设备名称" align="center"width="150"fixed="left">
+                    </el-table-column>
+                    <el-table-column prop="maintenancePersonnel" label="维修人" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="maintenanceDate" label="维修时间" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column label="维修方式" prop="maintenanceMethods" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.maintenanceMethods }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="维修进度" prop="maintenancePlan" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.maintenancePlan }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="是否产生费用" prop="expensesIncurred" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.expensesIncurred }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="costAmount" label="费用金额" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="costDetail" label="费用说明" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column label="是否计入租户账单" prop="tenantBill" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.tenantBill }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="maintenanceDescribe" label="维修描述" align="center"width="300">
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="150" align="center">
+                        <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>
+                </el-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData" />
+            </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
         <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" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
+        <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+            @superQuery="superQuery" />
     </div>
 </template>
 
 <script>
 
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+import columnList from './columnList'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
+export default {
+    components: {
+        JNPFForm,
+        Detail,
+        ExportBox, ToFormDetail, SuperQuery
+    },
+    data() {
+        return {
 
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
+            keyword: '',
+            expandsTree: true,
+            refreshTree: true,
+            toFormDetailVisible: false,
+            expandObj: {},
+            columnOptions: [],
+            mergeList: [],
+            exportList: [],
+            columnList,
 
-                    showAll: false,
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        maintenanceDate:undefined,
-                        number:undefined,
-                        name:undefined,
-                        maintenancePlan:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                maintenanceDate: undefined,
+                number: undefined,
+                name: undefined,
+                maintenancePlan: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "",
+                sidx: "",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                maintenanceMethodsOptions:[{"fullName":"保修期内","id":"1"},{"fullName":"更换配件","id":"2"},{"fullName":"更换设备","id":"3"}],
-                        maintenanceMethodsProps:{"label":"fullName","value":"id"  },
-                            maintenancePlanOptions:[{"fullName":"维修中","id":"1"},{"fullName":"已维修","id":"2"}],
-                        maintenancePlanProps:{"label":"fullName","value":"id"  },
-                            expensesIncurredOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}],
-                        expensesIncurredProps:{"label":"fullName","value":"id"  },
-                            tenantBillOptions:[{"fullName":"是 ","id":"1"},{"fullName":"否","id":"2"}],
-                        tenantBillProps:{"label":"fullName","value":"id"  },
+            maintenanceMethodsOptions: [{ "fullName": "保修期内", "id": "1" }, { "fullName": "更换配件", "id": "2" }, { "fullName": "更换设备", "id": "3" }],
+            maintenanceMethodsProps: { "label": "fullName", "value": "id" },
+            maintenancePlanOptions: [{ "fullName": "维修中", "id": "1" }, { "fullName": "已维修", "id": "2" }],
+            maintenancePlanProps: { "label": "fullName", "value": "id" },
+            expensesIncurredOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
+            expensesIncurredProps: { "label": "fullName", "value": "id" },
+            tenantBillOptions: [{ "fullName": "是 ", "id": "1" }, { "fullName": "否", "id": "2" }],
+            tenantBillProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
-                        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)
-                    })
-                })
+                repairOrderId: [],
             },
-            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.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } 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
-                            }
-                        }
+            })
+        },
+        toggleTreeExpand(expands) {
+            this.refreshTree = false
+            this.expandsTree = expands
+            this.$nextTick(() => {
+                this.refreshTree = true
+                this.$nextTick(() => {
+                    this.$refs.treeBox.setCurrentKey(null)
+                })
+            })
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data[this.treeProps.label].indexOf(value) !== -1;
+        },
+        loadNode(node, resolve) {
+            const nodeData = node.data
+            const config = {
+                treeInterfaceId: "",
+                treeTemplateJson: []
+            }
+            if (config.treeInterfaceId) {
+                //这里是为了拿到参数中关联的字段的值，后端自行拿
+                if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                    for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                        const element = config.treeTemplateJson[i];
+                        element.defaultValue = nodeData[element.relationField] || ''
                     }
                 }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            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]
-                    }
+                //参数
+                let query = {
+                    paramList: config.treeTemplateJson || [],
                 }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        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
-                                })
-                            }
-                        })
+                //接口
+                getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                    let data = res.data
+                    if (Array.isArray(data)) {
+                        resolve(data);
                     } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
+                        resolve([]);
                     }
                 })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
+            }
+        },
+        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
                         }
-                    } else {
-                        exportList.push(list[i])
                     }
                 }
-                this.exportList = exportList
-            },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            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({
-                        url: `/api/example/EquipmentMaintenanceRecords/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
+            }
+            this.getMergeList(list)
+            this.getExportList(list)
+            return list
+        },
+        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) {
+            let newList = JSON.parse(JSON.stringify(list))
+            newList.forEach(item => {
+                if (item.children && item.children.length) {
+                    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
+                            })
+                        }
                     })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","example/EquipmentMaintenanceRecords")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
+                } else {
+                    this.mergeList.push({
+                        prop: item.prop,
+                        rowspan: 1,
+                        colspan: 1
                     })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    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}
+                }
+            })
+        },
+        getExportList(list) {
+            let exportList = []
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].jnpfKey === 'table') {
+                    for (let j = 0; j < list[i].children.length; j++) {
+                        exportList.push(list[i].children[j])
+                    }
+                } else {
+                    exportList.push(list[i])
+                }
+            }
+            this.exportList = exportList
+        },
+        goDetail(id) {
+            this.detailVisible = true
+            this.$nextTick(() => {
+                this.$refs.Detail.init(id)
+            })
+        },
+        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({
-                    url: `/api/example/EquipmentMaintenanceRecords/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/example/EquipmentMaintenanceRecords/${id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            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()
-            },
-        }
+            }).catch(() => {
+            });
+        },
+        handelUpload() {
+            this.uploadBoxVisible = true
+            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
+            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>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/index.vue
index a364fa9..c2cc44f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/index.vue
@@ -66,45 +66,46 @@
                         </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod">
-                    <el-table-column prop="leaseNumber" label="租赁单号" align="left">
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod" border>
+                    <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 prop="equipmentCoding" label="设备编码" align="left">
+                    <el-table-column prop="equipmentCoding" label="设备编码" align="center"width="150" fixed="left">
                     </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 label="租赁状态" prop="leaseStatus" algin="left">
+                    <el-table-column label="租赁状态" prop="leaseStatus" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.leaseStatus }}
                         </template>
                     </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 prop="contacts" label="联系人" align="left">
+                    <el-table-column prop="contacts" label="联系人" align="center"width="150">
                     </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 prop="totalLeasePrice" label="租赁总价" align="left">
+                    <el-table-column prop="totalLeasePrice" label="租赁总价" align="center"width="150">
                     </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 prop="startTime" label="开始时间" align="left">
+                    <el-table-column prop="startTime" label="开始时间" align="center"width="150">
                     </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 prop="returnedBy" label="归还人" align="left">
+                    <el-table-column prop="returnedBy" label="归还人" align="center"width="150">
                     </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 label="归还状态" prop="returnStatus" algin="left">
+                    <el-table-column label="归还状态" prop="returnStatus" align="center"width="150">
                         <template slot-scope="scope">
                             {{ scope.row.returnStatus }}
                         </template>
                     </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 label="操作" fixed="right" width="150">
+                    <el-table-column label="操作" fixed="right" width="150"align="center">
                         <template slot-scope="scope">
                             <el-button type="text" v-show="scope.row.leaseStatus === '已租'" @click="addOrUpdateHandle(scope.row)">编辑
                             </el-button>
@@ -114,7 +115,7 @@
                             </el-button>
                         </template>
                     </el-table-column>
-                </JNPF-table>
+                </el-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
                     @pagination="initData" />
             </div>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/Detail.vue
index 3451d20..4feb6be 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/Detail.vue
@@ -1,166 +1,153 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<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="repairNumber"  >
-                        <p>{{dataForm.repairNumber}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备"  
- prop="equipmentId"  >
-                        <p>{{dataForm.equipmentId}}</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="repairName"  >
-                        <p>{{dataForm.repairName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系方式"  
- prop="contractInformation"  >
-                        <p>{{dataForm.contractInformation}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="期望维修时间"  
- prop="repairTime"  >
-                        <p>{{dataForm.repairTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="是否紧急"  
- prop="urgent"  >
-                         <p>{{ dataForm.urgent }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="消息状态"  
- prop="messageStatus"  >
-                         <p>{{ dataForm.messageStatus }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="故障原因"  
- prop="causeOmalfunction"  >
-                        <p>{{dataForm.causeOmalfunction}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="故障照片"  
- prop="faultPhotos"  >
-                    <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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="repairNumber">
+                            <p>{{ dataForm.repairNumber }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="设备" prop="equipmentId">
+                            <p>{{ dataForm.equipmentId }}</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="repairName">
+                            <p>{{ dataForm.repairName }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系方式" prop="contractInformation">
+                            <p>{{ dataForm.contractInformation }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="期望时间" prop="repairTime">
+                            <p>{{ dataForm.repairTime }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="是否紧急" prop="urgent">
+                            <p>{{ dataForm.urgent }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="消息状态" prop="messageStatus">
+                            <p>{{ dataForm.messageStatus }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="故障原因" prop="causeOmalfunction">
+                            <p>{{ dataForm.causeOmalfunction }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="故障照片" prop="faultPhotos">
+                            <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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            repairNumber : '',
-                            equipmentId : "",
-                            equipmentNumber : '',
-                            equipmentName : '',
-                            spaceId : "",
-                            repairName : '',
-                            contractInformation : '',
-                            repairTime : '',
-                            urgent : "1",
-                            messageStatus : "2",
-                            causeOmalfunction : '',
-                            faultPhotos : [],
-                            spaceName : '',
-                            regionId : '',
-                            regionName : '',
+                id: '',
+                repairNumber: '',
+                equipmentId: "",
+                equipmentNumber: '',
+                equipmentName: '',
+                spaceId: "",
+                repairName: '',
+                contractInformation: '',
+                repairTime: '',
+                urgent: "1",
+                messageStatus: "2",
+                causeOmalfunction: '',
+                faultPhotos: [],
+                spaceName: '',
+                regionId: '',
+                regionName: '',
             },
-                            urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}],
-                        urgentProps:{"label":"fullName","value":"id"  },
-                            messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}],
-                        messageStatusProps:{"label":"fullName","value":"id"  },
+            urgentOptions: [{ "fullName": "非紧急", "id": "1" }, { "fullName": "紧急", "id": "2" }],
+            urgentProps: { "label": "fullName", "value": "id" },
+            messageStatusOptions: [{ "fullName": "已读", "id": "1" }, { "fullName": "未读", "id": "2" }],
+            messageStatusProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/EquipmentRepairRecords/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/EquipmentRepairRecords/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue
index bdeb3bf..c3a5d73 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+  <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
     class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
@@ -8,8 +8,8 @@
           <!-- 具体表单 -->
           <el-col :span="8">
             <jnpf-form-tip-item label="报修单号" prop="repairNumber">
-              <JnpfInput v-model="dataForm.repairNumber" @change="changeData('repairNumber',-1)" placeholder="系统自动生成"
-                readonly :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.repairNumber" @change="changeData('repairNumber', -1)" placeholder="系统自动生成"
+                readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -19,7 +19,7 @@
                 :formData="dataForm" :templateJson="interfaceRes.equipmentId" placeholder="请选择" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='equipmentId'
                 interfaceId="584014538769170437" :pageSize="20" :columnOptions="equipmentIdcolumnOptions" clearable
-                :style='{"width":"100%"}'>
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -29,57 +29,57 @@
                 :formData="dataForm" :templateJson="interfaceRes.spaceId" placeholder="请选择" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='spaceId'
                 interfaceId="582825768971670725" :pageSize="20" :columnOptions="spaceIdcolumnOptions" clearable
-                :style='{"width":"100%"}'>
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="报修人" prop="repairName">
-              <JnpfInput v-model="dataForm.repairName" @change="changeData('repairName',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.repairName" @change="changeData('repairName', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="联系方式" prop="contractInformation">
-              <JnpfInput v-model="dataForm.contractInformation" @change="changeData('contractInformation',-1)"
-                placeholder="请输入" clearable :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.contractInformation" @change="changeData('contractInformation', -1)"
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8">
-            <jnpf-form-tip-item label="期望维修时间" prop="repairTime">
-              <JnpfDatePicker v-model="dataForm.repairTime" @change="changeData('repairTime',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
-                :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+            <jnpf-form-tip-item label="期望时间" prop="repairTime">
+              <JnpfDatePicker v-model="dataForm.repairTime" @change="changeData('repairTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
+                :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="是否紧急" prop="urgent">
-              <JnpfSelect v-model="dataForm.urgent" @change="changeData('urgent',-1)" placeholder="请选择" clearable
-                :style='{"width":"100%"}' :options="urgentOptions" :props="urgentProps">
+              <JnpfSelect v-model="dataForm.urgent" @change="changeData('urgent', -1)" placeholder="请选择" clearable
+                :style='{ "width": "100%" }' :options="urgentOptions" :props="urgentProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="消息状态" prop="messageStatus">
-              <JnpfSelect v-model="dataForm.messageStatus" @change="changeData('messageStatus',-1)" placeholder="请选择"
-                clearable :style='{"width":"100%"}' :options="messageStatusOptions" :props="messageStatusProps">
+              <JnpfSelect v-model="dataForm.messageStatus" @change="changeData('messageStatus', -1)" placeholder="请选择"
+                clearable :style='{ "width": "100%" }' :options="messageStatusOptions" :props="messageStatusProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="故障原因" prop="causeOmalfunction">
-              <JnpfTextarea v-model="dataForm.causeOmalfunction" @change="changeData('causeOmalfunction',-1)"
-                placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}'>
+              <JnpfTextarea v-model="dataForm.causeOmalfunction" @change="changeData('causeOmalfunction', -1)"
+                placeholder="请输入" :style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="故障照片" prop="faultPhotos">
-              <JnpfUploadImg v-model="dataForm.faultPhotos" @change="changeData('faultPhotos',-1)" :fileSize="10"
+              <JnpfUploadImg v-model="dataForm.faultPhotos" @change="changeData('faultPhotos', -1)" :fileSize="10"
                 sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
               </JnpfUploadImg>
             </jnpf-form-tip-item>
@@ -88,19 +88,19 @@
         </template>
       </el-form>
       <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-        @select="addForSelect" @close="selectDialogVisible=false" />
+        @select="addForSelect" @close="selectDialogVisible = false" />
     </el-row>
     <span slot="footer" class="dialog-footer">
       <div class="upAndDown-button" v-if="dataForm.id">
         <el-button @click="prev" :disabled='prevDis'>
-          {{'上一条'}}
+          {{ '上一条' }}
         </el-button>
         <el-button @click="next" :disabled='nextDis'>
-          {{'下一条'}}
+          {{ '下一条' }}
         </el-button>
       </div>
       <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
-        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
+        {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
       <el-button @click="visible = false"> 取 消</el-button>
       <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
     </span>
@@ -109,488 +109,488 @@
 
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getDefaultCurrentValueUserId
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentId
-  } from '@/api/permission/organize'
-  import {
-    getDateDay,
-    getLaterData,
-    getBeforeData,
-    getBeforeTime,
-    getLaterTime
-  } from '@/components/Generator/utils/index.js'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  export default {
-    components: {},
-    props: [],
-    data() {
-      return {
-        dataFormSubmitType: 0,
-        continueBtnLoading: false,
-        index: 0,
-        prevDis: false,
-        nextDis: false,
-        allList: [],
-        visible: false,
-        loading: false,
-        btnLoading: false,
-        formRef: 'formRef',
-        setting: {},
-        eventType: '',
-        userBoxVisible: false,
-        selectDialogVisible: false,
-        currTableConf: {},
-        dataValueAll: {},
-        addTableConf: {},
-        //可选范围默认值
-        ableAll: {},
-        tableRows: {},
-        Vmodel: "",
-        currVmodel: "",
-        dataForm: {
-          repairNumber: undefined,
-          equipmentId: undefined,
-          equipmentNumber: undefined,
-          equipmentName: undefined,
-          spaceId: undefined,
-          repairName: undefined,
-          contractInformation: undefined,
-          repairTime: undefined,
-          urgent: "1",
-          messageStatus: "2",
-          causeOmalfunction: undefined,
-          faultPhotos: [],
-          spaceName: undefined,
-          regionId: undefined,
-          regionName: undefined,
-          version: 0,
-        },
-        tableRequiredData: {},
-        dataRule: {
-          equipmentId: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          spaceId: [{
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          }, ],
-          repairName: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          contractInformation: [{
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-              message: '请输入正确的联系方式',
-              trigger: 'blur'
-            },
-          ],
-          urgent: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          messageStatus: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          causeOmalfunction: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          faultPhotos: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-        },
-        equipmentIdcolumnOptions: [{
-          "label": "设备编码",
-          "value": "code"
-        }, {
-          "label": "设备名称",
-          "value": "name"
-        }, {
-          "label": "设备品牌",
-          "value": "brand"
-        }, {
-          "label": "设备型号",
-          "value": "model"
-        }, ],
-        spaceIdcolumnOptions: [{
-          "label": "空间编码",
-          "value": "code"
-        }, {
-          "label": "空间名称",
-          "value": "name"
-        }, {
-          "label": "所属区域",
-          "value": "areaName"
-        }, ],
-        urgentOptions: [{
-          "fullName": "非紧急",
-          "id": "1"
-        }, {
-          "fullName": "紧急",
-          "id": "2"
-        }],
-        urgentProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        messageStatusOptions: [{
-          "fullName": "已读",
-          "id": "1"
-        }, {
-          "fullName": "未读",
-          "id": "2"
-        }],
-        messageStatusProps: {
-          "label": "fullName",
-          "value": "id"
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getDefaultCurrentValueUserId
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentId
+} from '@/api/permission/organize'
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
+} from '@/components/Generator/utils/index.js'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {},
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {},
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        repairNumber: undefined,
+        equipmentId: undefined,
+        equipmentNumber: undefined,
+        equipmentName: undefined,
+        spaceId: undefined,
+        repairName: undefined,
+        contractInformation: undefined,
+        repairTime: undefined,
+        urgent: "1",
+        messageStatus: "2",
+        causeOmalfunction: undefined,
+        faultPhotos: [],
+        spaceName: undefined,
+        regionId: undefined,
+        regionName: undefined,
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule: {
+        equipmentId: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        spaceId: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },],
+        repairName: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        contractInformation: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         },
-        childIndex: -1,
-        isEdit: false,
-        interfaceRes: {
-          repairNumber: [],
-          equipmentId: [],
-          equipmentNumber: [],
-          equipmentName: [],
-          spaceId: [],
-          repairName: [],
-          contractInformation: [],
-          repairTime: [],
-          urgent: [],
-          messageStatus: [],
-          causeOmalfunction: [],
-          faultPhotos: [],
-          spaceName: [],
-          regionId: [],
-          regionName: [],
+        {
+          pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+          message: '请输入正确的联系方式',
+          trigger: 'blur'
         },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo'])
-    },
-    watch: {},
-    created() {
-      this.dataAll()
-      this.initDefaultData()
-      this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-    },
-    mounted() {},
-    methods: {
-      equipmentChangeData(var1, var2){
-        this.dataForm.equipmentNumber = var2.code
-        this.dataForm.equipmentName = var2.name
-      },
-      spaceChangeData(var1, var2){
-        this.dataForm.spaceName = var2.name
-        this.dataForm.regionId = var2.pid
-        this.dataForm.regionName = var2.areaName
-      },
-      prev() {
-        this.index--
-        if (this.index === 0) {
-          this.prevDis = true
-        }
-        this.nextDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+        ],
+        urgent: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        messageStatus: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        causeOmalfunction: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        faultPhotos: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
       },
-      next() {
-        this.index++
-        if (this.index === this.allList.length - 1) {
-          this.nextDis = true
-        }
-        this.prevDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+      equipmentIdcolumnOptions: [{
+        "label": "设备编码",
+        "value": "code"
+      }, {
+        "label": "设备名称",
+        "value": "name"
+      }, {
+        "label": "设备品牌",
+        "value": "brand"
+      }, {
+        "label": "设备型号",
+        "value": "model"
+      },],
+      spaceIdcolumnOptions: [{
+        "label": "空间编码",
+        "value": "code"
+      }, {
+        "label": "空间名称",
+        "value": "name"
+      }, {
+        "label": "所属区域",
+        "value": "areaName"
+      },],
+      urgentOptions: [{
+        "fullName": "非紧急",
+        "id": "1"
+      }, {
+        "fullName": "紧急",
+        "id": "2"
+      }],
+      urgentProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getInfo(id) {
-        request({
-          url: '/api/example/EquipmentRepairRecords/' + id,
-          method: 'get'
-        }).then(res => {
-          this.dataInfo(res.data)
-        });
+      messageStatusOptions: [{
+        "fullName": "已读",
+        "id": "1"
+      }, {
+        "fullName": "未读",
+        "id": "2"
+      }],
+      messageStatusProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      goBack() {
-        this.visible = false
-        this.$emit('refreshDataList', true)
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        repairNumber: [],
+        equipmentId: [],
+        equipmentNumber: [],
+        equipmentName: [],
+        spaceId: [],
+        repairName: [],
+        contractInformation: [],
+        repairTime: [],
+        urgent: [],
+        messageStatus: [],
+        causeOmalfunction: [],
+        faultPhotos: [],
+        spaceName: [],
+        regionId: [],
+        regionName: [],
       },
-      changeData(model, index) {
-        this.isEdit = false
-        this.childIndex = index
-        let modelAll = model.split("-");
-        let faceMode = "";
-        for (let i = 0; i < modelAll.length; i++) {
-          faceMode += modelAll[i];
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    equipmentChangeData(var1, var2) {
+      this.dataForm.equipmentNumber = var2.code
+      this.dataForm.equipmentName = var2.name
+    },
+    spaceChangeData(var1, var2) {
+      this.dataForm.spaceName = var2.name
+      this.dataForm.regionId = var2.pid
+      this.dataForm.regionName = var2.areaName
+    },
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        for (let key in this.interfaceRes) {
-          if (key != faceMode) {
-            let faceReList = this.interfaceRes[key]
-            for (let i = 0; i < faceReList.length; i++) {
-              if (faceReList[i].relationField == model) {
-                let options = 'get' + key + 'Options';
-                if (this[options]) {
-                  this[options]()
-                }
-                this.changeData(key, index)
-              }
-            }
-          }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-      },
-      changeDataFormData(type, data, model, index, defaultValue) {
-        if (!this.isEdit) {
-          if (type == 2) {
-            for (let i = 0; i < this.dataForm[data].length; i++) {
-              if (index == -1) {
-                this.dataForm[data][i][model] = defaultValue
-              } else if (index == i) {
-                this.dataForm[data][i][model] = defaultValue
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/example/EquipmentRepairRecords/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
               }
+              this.changeData(key, index)
             }
-          } else {
-            this.dataForm[data] = defaultValue
           }
         }
-      },
-      dataAll() {},
-      clearData() {
-        this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-      },
-      init(id, isDetail, allList) {
-        this.prevDis = false
-        this.nextDis = false
-        this.allList = allList || []
-        if (allList.length) {
-          this.index = this.allList.findIndex(item => item.id === id)
-          if (this.index == 0) {
-            this.prevDis = true
-          }
-          if (this.index == this.allList.length - 1) {
-            this.nextDis = true
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
           }
         } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() { },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
           this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
           this.nextDis = true
         }
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.$nextTick(() => {
-          if (this.dataForm.id) {
-            this.loading = true
-            request({
-              url: '/api/example/EquipmentRepairRecords/' + this.dataForm.id,
-              method: 'get'
-            }).then(res => {
-              this.dataInfo(res.data)
-              this.loading = false
-            });
-          } else {
-            this.clearData()
-            this.initDefaultData()
-          }
-        });
-        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-      },
-      //初始化默认数据
-      initDefaultData() {
-
-      },
-      // 表单提交
-      dataFormSubmit(type) {
-        this.dataFormSubmitType = type ? type : 0
-        this.$refs['formRef'].validate((valid) => {
-          if (valid) {
-            this.request()
-          }
-        })
-      },
-      request() {
-        let _data = this.dataList()
-        if (this.dataFormSubmitType == 2) {
-          this.continueBtnLoading = true
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/example/EquipmentRepairRecords/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
         } else {
-          this.btnLoading = true
+          this.clearData()
+          this.initDefaultData()
         }
-        if (!this.dataForm.id) {
-          request({
-            url: '/api/example/EquipmentRepairRecords',
-            method: 'post',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) {
-                  this.$nextTick(() => {
-                    this.clearData()
-                    this.initDefaultData()
-                  })
-                  this.continueBtnLoading = false
-                  return
-                }
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/example/EquipmentRepairRecords',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
               }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        } else {
-          request({
-            url: '/api/example/EquipmentRepairRecords/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/example/EquipmentRepairRecords/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        }
-      },
-      openSelectDialog(key) {
-        this.currTableConf = this.addTableConf[key]
-        this.currVmodel = key
-        this.selectDialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.selectDialog.init()
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
         })
-      },
-      addForSelect(data) {
-        for (let i = 0; i < data.length; i++) {
-          let t = data[i]
-          if (this['get' + this.currVmodel]) {
-            this['get' + this.currVmodel](t)
-          }
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
         }
-      },
-      dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-        let timeDataValue = null;
-        let timeValue = Number(timeValueData)
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = new Date().getTime()
-          } else if (timeType == 4) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getBeforeData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-            }
-          } else if (timeType == 5) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getLaterData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-            }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
           }
         }
-        return timeDataValue;
-      },
-      time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-        let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-        let timeDataValue = null
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue || '00:00:00'
-            if (timeDataValue.split(':').length == 3) {
-              timeDataValue = timeDataValue
-            } else {
-              timeDataValue = timeDataValue + ':00'
-            }
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = this.jnpf.toDate(new Date(), format)
-          } else if (timeType == 4) {
-            let previousDate = '';
-            previousDate = getBeforeTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
-          } else if (timeType == 5) {
-            let previousDate = '';
-            previousDate = getLaterTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
           }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
         }
-        return timeDataValue;
-      },
-      dataList() {
-        var _data = this.dataForm;
-        return _data;
-      },
-      dataInfo(dataAll) {
-        let _dataAll = dataAll
-        this.dataForm = _dataAll
-        this.isEdit = true
-        this.dataAll()
-        this.childIndex = -1
-      },
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
     },
-  }
+  },
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
index e3dc6d0..c259245 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
@@ -57,34 +57,34 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="repairNumber" label="报修单号" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"border>
+          <el-table-column prop="repairNumber" label="报修单号" align="center">
           </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 prop="equipmentName" label="设备名称" align="left">
+          <el-table-column prop="equipmentName" label="设备名称" align="center">
           </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 prop="causeOmalfunction" label="故障原因" align="left">
+          <el-table-column prop="causeOmalfunction" label="故障原因" align="center">
           </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 prop="contractInformation" label="联系方式" align="left">
+          <el-table-column prop="contractInformation" label="联系方式" align="center">
           </el-table-column>
-          <el-table-column label="是否紧急" prop="urgent" algin="left">
+          <el-table-column label="是否紧急" prop="urgent" align="center">
             <template slot-scope="scope">
               {{ scope.row.urgent}}
             </template>
           </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 label="消息状态" prop="messageStatus" algin="left">
+          <el-table-column label="消息状态" prop="messageStatus" align="center">
             <template slot-scope="scope">
               {{ scope.row.messageStatus}}
             </template>
           </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">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/Detail.vue
index d57ead0..7da1141 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/Detail.vue
@@ -1,231 +1,211 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
-        <div class="options">
-            <el-button @click="goBack">取 消</el-button>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" content="详情" />
+                <div class="options">
+                    <el-button @click="goBack">取 消</el-button>
+                </div>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
+                    <template v-if="!loading">
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备编码" prop="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>
-<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>
+    </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            equipmentCoding : '',
-                            deviceName : '',
-                            equipmentType : "",
-                            equipmentBrand : '',
-                            supplier : '',
-                            supplierPhone : '',
-                            equipmentWarranty : '',
-                            warrantyStartTime : '',
-                            warrantyEndTime : '',
-                            state : "1",
-                            deviceStatus : "1",
-                            deviceMacAddress : '',
-                            spaceId : "",
-                            regionName : '',
-                            spaceName : '',
-                            regionId : '',
-                            deviceDescription : '',
-                            installationTime : '',
-                            personInCharge : '',
-                            chargePhone : '',
-                            equipmentCode : '',
+                id: '',
+                equipmentCoding: '',
+                deviceName: '',
+                equipmentType: "",
+                equipmentBrand: '',
+                supplier: '',
+                supplierPhone: '',
+                equipmentWarranty: '',
+                warrantyStartTime: '',
+                warrantyEndTime: '',
+                state: "1",
+                deviceStatus: "1",
+                deviceMacAddress: '',
+                spaceId: "",
+                regionName: '',
+                spaceName: '',
+                regionId: '',
+                deviceDescription: '',
+                installationTime: '',
+                personInCharge: '',
+                chargePhone: '',
+                equipmentCode: '',
             },
-                            equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
-                        equipmentTypeProps:{"label":"fullName","value":"id"  },
-                            stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
-                        stateProps:{"label":"fullName","value":"id"  },
-                            deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
-                        deviceStatusProps:{"label":"fullName","value":"id"  },
+            equipmentTypeOptions: [{ "fullName": "类型1", "id": "10" }, { "fullName": "类型2", "id": "20" }],
+            equipmentTypeProps: { "label": "fullName", "value": "id" },
+            stateOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
+            stateProps: { "label": "fullName", "value": "id" },
+            deviceStatusOptions: [{ "fullName": "正常", "id": "1" }, { "fullName": "异常", "id": "2" }],
+            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() {},
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/ParkEquipment/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
                     })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/ParkEquipment/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue
index 00d2c2a..559e1ad 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue
@@ -77,7 +77,7 @@
                             </jnpf-form-tip-item>
                         </el-col>
                         <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="请输入" clearable :style='{ "width": "100%" }'>
                                 </JnpfInput>
@@ -93,7 +93,7 @@
                         </el-col>
 
                         <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)"
                                     :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@@ -104,7 +104,7 @@
                         </el-col>
 
                         <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)"
                                     :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@@ -121,7 +121,7 @@
                             </jnpf-form-tip-item>
                         </el-col>
                         <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)"
                                     placeholder="请选择" clearable :style='{ "width": "100%" }'
                                     :options="deviceStatusOptions" :props="deviceStatusProps">
@@ -129,7 +129,7 @@
                             </jnpf-form-tip-item>
                         </el-col>
                         <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"
                                     @change="changeData('deviceMacAddress', -1)" placeholder="请输入" clearable
                                     :style='{ "width": "100%" }'>
@@ -186,7 +186,7 @@
                             </jnpf-form-tip-item>
                         </el-col>
                         <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)"
                                     placeholder="请输入" clearable :style='{ "width": "100%" }'>
                                 </JnpfInput>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue
index 617903f..1c88524 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue
@@ -1,63 +1,54 @@
-
-
-
-
-
-
-
 <template>
     <div class="JNPF-common-layout">
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="设备类型">
-                                        <JnpfSelect v-model="query.equipmentType" placeholder="请选择" clearable
-                                                    :options="equipmentTypeOptions"
-                                                    :props="equipmentTypeProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备品牌">
-                                        <el-input v-model="query.equipmentBrand" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备编码">
-                                        <el-input v-model="query.equipmentCoding" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="设备名称">
-                                                <el-input v-model="query.deviceName" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="状态">
-                                                <JnpfSelect v-model="query.state" placeholder="请选择" clearable
-                                                            :options="stateOptions"
-                                                            :props="stateProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="所属区域">
-                                                <el-input v-model="query.regionId" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="设备类型">
+                            <JnpfSelect v-model="query.equipmentType" placeholder="请选择" clearable
+                                :options="equipmentTypeOptions" :props="equipmentTypeProps" multiple>
+                            </JnpfSelect>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备品牌">
+                            <el-input v-model="query.equipmentBrand" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备编码">
+                            <el-input v-model="query.equipmentCoding" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="设备名称">
+                                <el-input v-model="query.deviceName" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="状态">
+                                <JnpfSelect v-model="query.state" placeholder="请选择" clearable :options="stateOptions"
+                                    :props="stateProps" multiple>
+                                </JnpfSelect>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="所属区域">
+                                <el-input v-model="query.regionId" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </template>
                     <el-col :span="6">
                         <el-form-item>
                             <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 type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
+                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+                                展开
+                            </el-button>
+                            <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                                收起
+                            </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -65,499 +56,457 @@
             <div class="JNPF-common-layout-main JNPF-flex-main">
                 <div class="JNPF-common-head">
                     <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
+                        <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+                        </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
+                        <el-tooltip content="高级查询" placement="top" v-if="true">
+                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                @click="openSuperQuery()" />
+                        </el-tooltip>
+                        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                @click="initData()" />
+                        </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="equipmentCoding"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceName"
- label="设备名称"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="状态"  prop="state" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.state}}
-                                            </template>
-                                        </el-table-column>
-                                        <el-table-column label="设备类型"  prop="equipmentType" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.equipmentType}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="equipmentBrand"
- label="设备品牌"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="supplier"
- label="供应商"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="supplierPhone"
- label="供应商联系电话"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="设备状态(正常、异常)"  prop="deviceStatus" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.deviceStatus}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="equipmentWarranty"
- label="设备保修期"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="warrantyStartTime"
- label="保修开始时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="warrantyEndTime"
- label="保修结束时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceMacAddress"
- label="设备MAC地址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="spaceId"
- label="空间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="regionId"
- label="所属区域"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceDescription"
- label="设备描述"  align="left"
- >
-                                                </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>
+                <el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod" border>
+                    <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                    <el-table-column prop="equipmentCoding" label="设备编码" align="center"width="150"fixed="left">
+                    </el-table-column>
+                    <el-table-column prop="deviceName" label="设备名称" align="center"width="150"fixed="left">
+                    </el-table-column>
+                    <el-table-column label="状态" prop="state" align="center"width="150"fixed="left">
+                        <template slot-scope="scope">
+                            {{ scope.row.state }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="设备类型" prop="equipmentType" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.equipmentType }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="equipmentBrand" label="设备品牌" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="supplier" label="供应商" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="supplierPhone" label="联系电话" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column label="设备状态" prop="deviceStatus" align="center"width="150">
+                        <template slot-scope="scope">
+                            {{ scope.row.deviceStatus }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="equipmentWarranty" label="设备保修期" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="warrantyStartTime" label="保修开始时间" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="warrantyEndTime" label="保修结束时间" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="deviceMacAddress" label="设备MAC地址" align="center" width="200">
+                    </el-table-column>
+                    <el-table-column prop="spaceId" label="空间" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="regionId" label="所属区域" align="center"width="150">
+                    </el-table-column>
+                    <el-table-column prop="deviceDescription" label="设备描述" align="center"width="200">
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="150" align="center">
+                        <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>
+                </el-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData" />
+            </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
         <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" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
+        <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+            @superQuery="superQuery" />
     </div>
 </template>
 
 <script>
 
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+import columnList from './columnList'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
+export default {
+    components: {
+        JNPFForm,
+        Detail,
+        ExportBox, ToFormDetail, SuperQuery
+    },
+    data() {
+        return {
 
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
+            keyword: '',
+            expandsTree: true,
+            refreshTree: true,
+            toFormDetailVisible: false,
+            expandObj: {},
+            columnOptions: [],
+            mergeList: [],
+            exportList: [],
+            columnList,
 
-                    showAll: false,
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        equipmentType:undefined,
-                        equipmentBrand:undefined,
-                        equipmentCoding:undefined,
-                        deviceName:undefined,
-                        state:undefined,
-                        regionId:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                equipmentType: undefined,
+                equipmentBrand: undefined,
+                equipmentCoding: undefined,
+                deviceName: undefined,
+                state: undefined,
+                regionId: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "",
+                sidx: "",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
-                        equipmentTypeProps:{"label":"fullName","value":"id"  },
-                            stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
-                        stateProps:{"label":"fullName","value":"id"  },
-                            deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
-                        deviceStatusProps:{"label":"fullName","value":"id"  },
+            equipmentTypeOptions: [{ "fullName": "类型1", "id": "10" }, { "fullName": "类型2", "id": "20" }],
+            equipmentTypeProps: { "label": "fullName", "value": "id" },
+            stateOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
+            stateProps: { "label": "fullName", "value": "id" },
+            deviceStatusOptions: [{ "fullName": "正常", "id": "1" }, { "fullName": "异常", "id": "2" }],
+            deviceStatusProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
-                        spaceId:[] ,
-                },
-            }
-        },
-        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)
-                    })
-                })
+                spaceId: [],
             },
-            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.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } 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
-                            }
-                        }
+            })
+        },
+        toggleTreeExpand(expands) {
+            this.refreshTree = false
+            this.expandsTree = expands
+            this.$nextTick(() => {
+                this.refreshTree = true
+                this.$nextTick(() => {
+                    this.$refs.treeBox.setCurrentKey(null)
+                })
+            })
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data[this.treeProps.label].indexOf(value) !== -1;
+        },
+        loadNode(node, resolve) {
+            const nodeData = node.data
+            const config = {
+                treeInterfaceId: "",
+                treeTemplateJson: []
+            }
+            if (config.treeInterfaceId) {
+                //这里是为了拿到参数中关联的字段的值，后端自行拿
+                if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                    for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                        const element = config.treeTemplateJson[i];
+                        element.defaultValue = nodeData[element.relationField] || ''
                     }
                 }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            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]
-                    }
+                //参数
+                let query = {
+                    paramList: config.treeTemplateJson || [],
                 }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        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
-                                })
-                            }
-                        })
+                //接口
+                getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                    let data = res.data
+                    if (Array.isArray(data)) {
+                        resolve(data);
                     } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
+                        resolve([]);
                     }
                 })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
+            }
+        },
+        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
                         }
-                    } else {
-                        exportList.push(list[i])
                     }
                 }
-                this.exportList = exportList
-            },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            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:'582564179701929029',
-                    type:1,
-                };
-                request({
-                    url: `/api/example/ParkEquipment/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({
-                        url: `/api/example/ParkEquipment/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
+            }
+            this.getMergeList(list)
+            this.getExportList(list)
+            return list
+        },
+        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) {
+            let newList = JSON.parse(JSON.stringify(list))
+            newList.forEach(item => {
+                if (item.children && item.children.length) {
+                    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
+                            })
+                        }
                     })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","example/ParkEquipment")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
+                } else {
+                    this.mergeList.push({
+                        prop: item.prop,
+                        rowspan: 1,
+                        colspan: 1
                     })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    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}
+                }
+            })
+        },
+        getExportList(list) {
+            let exportList = []
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].jnpfKey === 'table') {
+                    for (let j = 0; j < list[i].children.length; j++) {
+                        exportList.push(list[i].children[j])
+                    }
+                } else {
+                    exportList.push(list[i])
+                }
+            }
+            this.exportList = exportList
+        },
+        goDetail(id) {
+            this.detailVisible = true
+            this.$nextTick(() => {
+                this.$refs.Detail.init(id)
+            })
+        },
+        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: '582564179701929029',
+                type: 1,
+            };
+            request({
+                url: `/api/example/ParkEquipment/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({
-                    url: `/api/example/ParkEquipment/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/example/ParkEquipment/${id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            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()
-            },
-        }
+            }).catch(() => {
+            });
+        },
+        handelUpload() {
+            this.uploadBoxVisible = true
+            this.$nextTick(() => {
+                this.$refs.UploadBox.init("", "example/ParkEquipment")
+            })
+        },
+        openSuperQuery() {
+            this.superQueryVisible = true
+            this.$nextTick(() => {
+                this.$refs.SuperQuery.init()
+            })
+        },
+        superQuery(queryJson) {
+            this.listQuery.superQueryJson = queryJson
+            this.listQuery.currentPage = 1
+            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/ParkEquipment/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>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/person/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/person/Detail.vue
index 0240ccc..39086c4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/person/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/person/Detail.vue
@@ -1,149 +1,138 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<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="userCode"  >
-                        <p>{{dataForm.userCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="用户名"  
- prop="userName"  >
-                        <p>{{dataForm.userName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="身份证号"  
- prop="idCard"  >
-                        <p>{{dataForm.idCard}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系电话"  
- prop="phone"  >
-                        <p>{{dataForm.phone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="人员归属"  
- prop="userAscription"  >
-                         <p>{{ dataForm.userAscription }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="有效开始时间"  
- prop="effectiveStartTime"  >
-                        <p>{{dataForm.effectiveStartTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="有效结束时间"  
- prop="effectiveEndTime"  >
-                        <p>{{dataForm.effectiveEndTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="出入码"  
- prop="entryCodes"  >
-                        <p>{{dataForm.entryCodes}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户"  
- prop="merchantId"  >
-                        <p>{{dataForm.merchantId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-    </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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="userCode">
+                            <p>{{ dataForm.userCode }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="用户名" prop="userName">
+                            <p>{{ dataForm.userName }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系电话" prop="phone">
+                            <p>{{ dataForm.phone }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="人员归属" prop="userAscription">
+                            <p>{{ dataForm.userAscription }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="身份证号" prop="idCard">
+                            <p>{{ dataForm.idCard }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="有效开始时间" prop="effectiveStartTime">
+                            <p>{{ dataForm.effectiveStartTime }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="有效结束时间" prop="effectiveEndTime">
+                            <p>{{ dataForm.effectiveEndTime }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="出入码" prop="entryCodes">
+                            <p>{{ dataForm.entryCodes }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="商户" prop="merchantId">
+                            <p>{{ dataForm.merchantId }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                </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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            userCode : '',
-                            userName : '',
-                            idCard : '',
-                            phone : '',
-                            userAscription : "1",
-                            effectiveStartTime : '',
-                            effectiveEndTime : '',
-                            entryCodes : '',
-                            merchantId : "",
+                id: '',
+                userCode: '',
+                userName: '',
+                idCard: '',
+                phone: '',
+                userAscription: "1",
+                effectiveStartTime: '',
+                effectiveEndTime: '',
+                entryCodes: '',
+                merchantId: "",
             },
-                            userAscriptionOptions:[{"fullName":"商户","id":"1"},{"fullName":"公司","id":"2"}],
-                        userAscriptionProps:{"label":"fullName","value":"id"  },
+            userAscriptionOptions: [{ "fullName": "商户", "id": "1" }, { "fullName": "公司", "id": "2" }],
+            userAscriptionProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Person/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/Person/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
index 8f2354a..c4ffdf1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
@@ -20,13 +20,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </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">
             <jnpf-form-tip-item label="联系电话" prop="phone">
               <JnpfInput v-model="dataForm.phone" @change="changeData('phone',-1)" placeholder="请输入" clearable
@@ -41,9 +35,15 @@
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
-
           <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)"
                 :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
                 :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
@@ -52,7 +52,7 @@
           </el-col>
 
           <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)"
                 :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
                 :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
@@ -207,12 +207,12 @@
           }, ],
           effectiveStartTime: [{
             required: true,
-            message: '请选择',
+            message: '请选择身份证有效开始时间',
             trigger: 'change'
           }, ],
           effectiveEndTime: [{
             required: true,
-            message: '请选择',
+            message: '请选择身份证有效结束时间',
             trigger: 'change'
           }, ],
           entryCodes: [{
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
index 0a149e2..18b0964 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
@@ -37,10 +37,10 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="userCode" label="用户编码" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+          <el-table-column prop="userCode" label="用户编码" align="center">
           </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 prop="userAscription" label="归属" align="center" width="150">
             <template slot-scope="scope">
@@ -48,23 +48,23 @@
               <el-tag type="success" v-else-if="scope.row.userAscription == 2">公司</el-tag>
             </template>
           </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 prop="phone" label="联系电话" align="left">
+          <el-table-column prop="phone" label="联系电话" align="center">
           </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 prop="effectiveStartTime" label="有效开始时间" align="left">
+          <el-table-column prop="effectiveStartTime" label="有效开始时间" align="center">
             <template slot-scope="scope">
               {{ scope.row.effectiveStartTime | toDate("yyyy-MM-dd HH:mm:ss") }}
             </template>
           </el-table-column>
-          <el-table-column prop="effectiveEndTime" label="有效结束时间" align="left">
+          <el-table-column prop="effectiveEndTime" label="有效结束时间" align="center">
             <template slot-scope="scope">
               {{ scope.row.effectiveEndTime | toDate("yyyy-MM-dd HH:mm:ss") }}
             </template>
           </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">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
index 6a7a07d..4d6872d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
@@ -1,161 +1,148 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<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="vehicleNumber"  >
-                        <p>{{dataForm.vehicleNumber}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="车辆类型"  
- prop="vehicleType"  >
-                         <p>{{ dataForm.vehicleType }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="车辆品牌"  
- prop="vehicleBrand"  >
-                        <p>{{dataForm.vehicleBrand}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="车辆颜色"  
- prop="vehicleColor"  >
-                        <p>{{dataForm.vehicleColor}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系人"  
- prop="contactsName"  >
-                        <p>{{dataForm.contactsName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系电话"  
- prop="contactsPhone"  >
-                        <p>{{dataForm.contactsPhone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="车辆照片"  
- prop="vehiclePhotos"  >
-                    <JnpfUploadImg    v-model="dataForm.vehiclePhotos"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
-                </JnpfUploadImg>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="车辆归属"  
- prop="vehicleAscription"  >
-                         <p>{{ dataForm.vehicleAscription }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="归属"  
- prop="ascriptionId"  >
-                        <p>{{dataForm.ascriptionId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="vehicleNumber">
+                            <p>{{ dataForm.vehicleNumber }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="车辆类型" prop="vehicleType">
+                            <p>{{ dataForm.vehicleType }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="车辆品牌" prop="vehicleBrand">
+                            <p>{{ dataForm.vehicleBrand }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="车辆颜色" prop="vehicleColor">
+                            <p>{{ dataForm.vehicleColor }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系人" prop="contactsName">
+                            <p>{{ dataForm.contactsName }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系电话" prop="contactsPhone">
+                            <p>{{ dataForm.contactsPhone }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="车辆照片" prop="vehiclePhotos">
+                            <JnpfUploadImg v-model="dataForm.vehiclePhotos" disabled detailed :fileSize="10"
+                                sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                            </JnpfUploadImg>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="车辆归属" prop="vehicleAscription">
+                            <p>{{ dataForm.vehicleAscription }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="归属" prop="ascriptionId">
+                            <p>{{ dataForm.ascriptionId }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            vehicleNumber : '',
-                            vehicleType : "",
-                            vehicleBrand : '',
-                            vehicleColor : '',
-                            contactsName : '',
-                            contactsPhone : '',
-                            vehiclePhotos : [],
-                            vehicleAscription : "1",
-                            ascriptionId : '',
-                            ascriptionName : "",
+                id: '',
+                vehicleNumber: '',
+                vehicleType: "",
+                vehicleBrand: '',
+                vehicleColor: '',
+                contactsName: '',
+                contactsPhone: '',
+                vehiclePhotos: [],
+                vehicleAscription: "1",
+                ascriptionId: '',
+                ascriptionName: "",
             },
-                            vehicleTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-                        vehicleTypeProps:{"label":"fullName","value":"id"  },
-                            vehicleAscriptionOptions:[{"fullName":"商户","id":"1"},{"fullName":"公司","id":"2"}],
-                        vehicleAscriptionProps:{"label":"fullName","value":"id"  },
+            vehicleTypeOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+            vehicleTypeProps: { "label": "fullName", "value": "id" },
+            vehicleAscriptionOptions: [{ "fullName": "商户", "id": "1" }, { "fullName": "公司", "id": "2" }],
+            vehicleAscriptionProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Vehicle/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/Vehicle/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
index 5119c96..9b52b23 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
@@ -39,8 +39,8 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="vehicleNumber" label="车牌号" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+          <el-table-column prop="vehicleNumber" label="车牌号" align="center">
           </el-table-column>
           <el-table-column prop="vehicleType" label="车辆类型" align="center" width="150">
             <template slot-scope="scope">
@@ -48,17 +48,17 @@
               <el-tag type="success" v-else-if="scope.row.vehicleType == 2">类型2</el-tag>
             </template>
           </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 prop="vehicleColor" label="车辆颜色" align="left">
+          <el-table-column prop="vehicleColor" label="车辆颜色" align="center">
           </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 prop="contactsPhone" label="联系电话" align="left">
+          <el-table-column prop="contactsPhone" label="联系电话" align="center">
           </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 label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="150"align="center">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/Detail.vue
index 2934395..73b67e3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/Detail.vue
@@ -1,159 +1,147 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<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="applicationNumber"  >
-                        <p>{{dataForm.applicationNumber}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户名称"  
- prop="merchantId"  >
-                        <p>{{dataForm.merchantId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="空间名称"  
- prop="spaceId"  >
-                        <p>{{dataForm.spaceId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="开始时间"  
- prop="startTime"  >
-                        <p>{{dataForm.startTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="结束时间"  
- prop="endTime"  >
-                        <p>{{dataForm.endTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系人"  
- prop="contacts"  >
-                        <p>{{dataForm.contacts}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="联系电话"  
- prop="contactsPhone"  >
-                        <p>{{dataForm.contactsPhone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="预约人数"  
- prop="reservationsNumber"  >
-                        <p>{{dataForm.reservationsNumber}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="预约事由"  
- prop="reservationsThing"  >
-                        <p>{{dataForm.reservationsThing}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <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="applicationNumber">
+                            <p>{{ dataForm.applicationNumber }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="商户名称" prop="merchantId">
+                            <p>{{ dataForm.merchantId }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="空间名称" prop="spaceId">
+                            <p>{{ dataForm.spaceId }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="开始时间" prop="startTime">
+                            <p>{{ dataForm.startTime }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="结束时间" prop="endTime">
+                            <p>{{ dataForm.endTime }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系人" prop="contacts">
+                            <p>{{ dataForm.contacts }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="联系电话" prop="contactsPhone">
+                            <p>{{ dataForm.contactsPhone }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="预约人数" prop="reservationsNumber">
+                            <p>{{ dataForm.reservationsNumber }}</p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="预约进度" prop="usageProgress">
+                            <p>{{ dataForm.usageProgress }} </p>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <jnpf-form-tip-item label="预约事由" prop="reservationsThing">
+                            <p>{{ dataForm.reservationsThing }}</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>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
 
             dataForm: {
-                id :'',
-                            applicationNumber : '',
-                            merchantId : "",
-                            spaceId : "",
-                            startTime : '',
-                            endTime : '',
-                            contacts : '',
-                            contactsPhone : '',
-                            reservationsNumber : '',
-                            reservationsThing : '',
-                            usageProgress : "1",
-                            creationTime : "",
-                            spaceName : '',
-                            merchantName : '',
+                id: '',
+                applicationNumber: '',
+                merchantId: "",
+                spaceId: "",
+                startTime: '',
+                endTime: '',
+                contacts: '',
+                contactsPhone: '',
+                reservationsNumber: '',
+                reservationsThing: '',
+                usageProgress: "1",
+                creationTime: "",
+                spaceName: '',
+                merchantName: '',
             },
-                            usageProgressOptions:[{"fullName":"预约中","id":"1"},{"fullName":"已结束","id":"2"}],
-                        usageProgressProps:{"label":"fullName","value":"id"  },
+            usageProgressOptions: [{ "fullName": "预约中", "id": "1" }, { "fullName": "已结束", "id": "2" }],
+            usageProgressProps: { "label": "fullName", "value": "id" },
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    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)
-                    })
+    },
+    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
-            },
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/VenueReservationRecord/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/VenueReservationRecord/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/form.vue
index 21610d1..4728e62 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/form.vue
@@ -77,14 +77,6 @@
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </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">
                         <jnpf-form-tip-item label="预约进度" prop="usageProgress">
                             <JnpfSelect v-model="dataForm.usageProgress" @change="changeData('usageProgress', -1)"
@@ -93,6 +85,14 @@
                             </JnpfSelect>
                         </jnpf-form-tip-item>
                     </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>
             </el-form>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/index.vue
index f551014..b5fa704 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/index.vue
@@ -62,31 +62,31 @@
                     </div>
                 </div>
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod">
-                    <el-table-column prop="applicationNumber" label="申请单号" align="left">
+                    :span-method="arraySpanMethod" border>
+                    <el-table-column prop="applicationNumber" label="申请单号" align="center">
                     </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 prop="spaceId" label="空间名称" align="left">
+                    <el-table-column prop="spaceId" label="空间名称" align="center">
                     </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 prop="contactsPhone" label="联系电话" align="left">
+                    <el-table-column prop="contactsPhone" label="联系电话" align="center">
                     </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 prop="reservationsNumber" label="预约人数" align="left">
+                    <el-table-column prop="reservationsNumber" label="预约人数" align="center">
                     </el-table-column>
-                    <el-table-column label="预约进度" prop="usageProgress" algin="left">
+                    <el-table-column label="预约进度" prop="usageProgress" align="center">
                         <template slot-scope="scope">
                             {{ scope.row.usageProgress }}
                         </template>
                     </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 prop="endTime" label="结束时间" align="left">
+                    <el-table-column prop="endTime" label="结束时间" align="center">
                     </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">
                             <el-button type="text"  v-show="scope.row.usageProgress === '预约中'" @click="addOrUpdateHandle(scope.row)">编辑
                             </el-button>