diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEquipmentEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEquipmentEntity.java
index d51f8d0..bdb4d0f 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEquipmentEntity.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEquipmentEntity.java
@@ -16,14 +16,6 @@ import java.util.Date;
 public class ParkEquipmentEntity  {
     @TableId(value ="ID"  )
     private String id;
-    @TableField("CREATE_BY")
-    private String createBy;
-    @TableField("CREATION_TIME")
-    private Date creationTime;
-    @TableField("UPDATE_BY")
-    private String updateBy;
-    @TableField("UPDATE_TIME")
-    private Date updateTime;
     @TableField(value = "EQUIPMENT_CODING" , updateStrategy = FieldStrategy.IGNORED)
     private String equipmentCoding;
     @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@@ -32,8 +24,6 @@ public class ParkEquipmentEntity  {
     private String equipmentType;
     @TableField(value = "EQUIPMENT_BRAND" , updateStrategy = FieldStrategy.IGNORED)
     private String equipmentBrand;
-    @TableField("EQUIPMENT_MODEL")
-    private String equipmentModel;
     @TableField(value = "SUPPLIER" , updateStrategy = FieldStrategy.IGNORED)
     private String supplier;
     @TableField(value = "SUPPLIER_PHONE" , updateStrategy = FieldStrategy.IGNORED)
@@ -66,22 +56,10 @@ public class ParkEquipmentEntity  {
     private String deviceMacAddress;
     @TableField(value = "STATE" , updateStrategy = FieldStrategy.IGNORED)
     private String state;
-    @TableField("EQUIPMENT_WARRANTY_PERIOD")
-    private String equipmentWarrantyPeriod;
     @TableField("EQUIPMENT_CODE")
     private String equipmentCode;
     @TableField("REMARKS")
     private String remarks;
-    @TableField("OPTIMISTIC_LOCK")
-    private Integer optimisticLock;
-    @TableField("CELETE_TAGS")
-    private Integer celeteTags;
-    @TableField("COMPANY")
-    private String company;
-    @TableField("DEPARTMENT")
-    private String department;
-    @TableField("ORGANIZATION")
-    private String organization;
     @TableField("F_CREATOR_TIME")
     private Date creatorTime;
     @TableField("F_CREATOR_USER_ID")
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentForm.java
index 3a3bbc0..06b4376 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentForm.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentForm.java
@@ -50,7 +50,7 @@ public class ParkEquipmentForm  {
     /** 状态 **/
     @JsonProperty("state")
     private Object state;
-    /** 设备状态(正常、异常) **/
+    /** 设备状态 **/
     @JsonProperty("deviceStatus")
     private Object deviceStatus;
     /** 设备MAC地址 **/
@@ -62,7 +62,25 @@ public class ParkEquipmentForm  {
     /** 所属区域 **/
     @JsonProperty("regionId")
     private String regionId;
+    /** 空间 **/
+    @JsonProperty("spaceName")
+    private String spaceName;
+    /** 所属区域 **/
+    @JsonProperty("regionName")
+    private String regionName;
     /** 设备描述 **/
     @JsonProperty("deviceDescription")
     private String deviceDescription;
+    /** 安装时间 **/
+    @JsonProperty("installationTime")
+    private String installationTime;
+    /** 负责人 **/
+    @JsonProperty("personInCharge")
+    private String personInCharge;
+    /** 负责人联系电话 **/
+    @JsonProperty("chargePhone")
+    private String chargePhone;
+    /** 设备码 **/
+    @JsonProperty("equipmentCode")
+    private String equipmentCode;
 }
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 2ecba6a..d57ead0 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
@@ -91,9 +91,9 @@
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8"  >
-                <jnpf-form-tip-item  label="所属区域"  
- prop="regionId"  >
-                        <p>{{dataForm.regionId}}</p>
+                <jnpf-form-tip-item  label="区域名称"  
+ prop="regionName"  >
+                        <p>{{dataForm.regionName}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
@@ -102,6 +102,30 @@
                         <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>
@@ -139,8 +163,14 @@
                             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"  },
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 783c1eb..00d2c2a 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
@@ -1,185 +1,228 @@
-
-
-
-    <template>
-            <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <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>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
+<template>
+    <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 ? '新建' : '编辑'" />
+                <div class="options">
+                    <el-dropdown class="dropdown" placement="bottom">
+                        <el-button style="width:70px">
+                            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <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>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+                        :disabled='continueBtnLoading'> 保
+                        存</el-button>
+                    <el-button @click="goBack"> 取 消</el-button>
                 </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备编码"   prop="equipmentCoding" >
-        <JnpfInput   v-model="dataForm.equipmentCoding" @change="changeData('equipmentCoding',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备名称"   prop="deviceName" >
-        <JnpfInput   v-model="dataForm.deviceName" @change="changeData('deviceName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备类型"   prop="equipmentType" >
-        <JnpfSelect   v-model="dataForm.equipmentType" @change="changeData('equipmentType',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="equipmentTypeOptions" :props="equipmentTypeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备品牌"   prop="equipmentBrand" >
-        <JnpfInput   v-model="dataForm.equipmentBrand" @change="changeData('equipmentBrand',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="供应商"   prop="supplier" >
-        <JnpfInput   v-model="dataForm.supplier" @change="changeData('supplier',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="供应商联系电话"   prop="supplierPhone" >
-        <JnpfInput   v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备保修期"   prop="equipmentWarranty" >
-        <JnpfInput   v-model="dataForm.equipmentWarranty" @change="changeData('equipmentWarranty',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+                    label-position="right">
+                    <template v-if="!loading">
+                        <!-- 具体表单 -->
+                        <el-col :span="24">
+                            <div style="padding:15px 0px">
+                                <span style="color: #409EFF;">▋</span>
+                                <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备编码" prop="equipmentCoding">
+                                <JnpfInput v-model="dataForm.equipmentCoding"
+                                    @change="changeData('equipmentCoding', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备名称" prop="deviceName">
+                                <JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备类型" prop="equipmentType">
+                                <JnpfSelect v-model="dataForm.equipmentType" @change="changeData('equipmentType', -1)"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }'
+                                    :options="equipmentTypeOptions" :props="equipmentTypeProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备品牌" prop="equipmentBrand">
+                                <JnpfInput v-model="dataForm.equipmentBrand" @change="changeData('equipmentBrand', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="供应商" prop="supplier">
+                                <JnpfInput v-model="dataForm.supplier" @change="changeData('supplier', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="供应商联系电话" prop="supplierPhone">
+                                <JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备保修期" prop="equipmentWarranty">
+                                <JnpfInput v-model="dataForm.equipmentWarranty"
+                                    @change="changeData('equipmentWarranty', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <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" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+                        <el-col :span="8">
+                            <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">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <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" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="状态"   prop="state" >
-        <JnpfSelect   v-model="dataForm.state" @change="changeData('state',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="stateOptions" :props="stateProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <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" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="设备MAC地址"   prop="deviceMacAddress" >
-        <JnpfInput   v-model="dataForm.deviceMacAddress" @change="changeData('deviceMacAddress',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="空间"   prop="spaceId" >
-        <JnpfPopupSelect   v-model="dataForm.spaceId" @change="changeData('spaceId',-1)" 
- :rowIndex="null"  :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%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="所属区域"   prop="regionId" >
-        <JnpfInput   v-model="dataForm.regionId" @change="changeData('regionId',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="设备描述"   prop="deviceDescription" >
-        <JnpfTextarea   v-model="dataForm.deviceDescription" @change="changeData('deviceDescription',-1)" 
- placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
-    </div>
+                        <el-col :span="8">
+                            <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">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="状态" prop="state">
+                                <JnpfSelect v-model="dataForm.state" @change="changeData('state', -1)" placeholder="请选择"
+                                    clearable :style='{ "width": "100%" }' :options="stateOptions" :props="stateProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <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">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备MAC地址" prop="deviceMacAddress">
+                                <JnpfInput v-model="dataForm.deviceMacAddress"
+                                    @change="changeData('deviceMacAddress', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="空间" prop="spaceId">
+                                <JnpfPopupSelect v-model="dataForm.spaceId" @change="spaceChange" :rowIndex="null"
+                                    :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%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属区域" prop="regionName">
+                                <JnpfInput v-model="dataForm.regionName" @change="changeData('regionName', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }' :disabled="true">
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="设备描述" prop="deviceDescription">
+                                <JnpfTextarea v-model="dataForm.deviceDescription"
+                                    @change="changeData('deviceDescription', -1)" placeholder="请输入"
+                                    :style='{ "width": "100%" }' true type="textarea"
+                                    :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                                </JnpfTextarea>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <div style="padding:15px 0px">
+                                <span style="color: #409EFF;">▋</span>
+                                <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">安装信息</span>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="安装时间" prop="installationTime">
+                                <JnpfDatePicker v-model="dataForm.installationTime"
+                                    @change="changeData('installationTime', -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="personInCharge">
+                                <JnpfInput v-model="dataForm.personInCharge" @change="changeData('personInCharge', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="负责人联系电话" prop="chargePhone">
+                                <JnpfInput v-model="dataForm.chargePhone" @change="changeData('chargePhone', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备码" prop="equipmentCode">
+                                <JnpfInput v-model="dataForm.equipmentCode" @change="changeData('equipmentCode', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </div>
     </transition>
-    </template>
+</template>
 
 
 <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() {
+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,
@@ -191,431 +234,479 @@
             loading: false,
             btnLoading: false,
             formRef: 'formRef',
-            setting:{},
+            setting: {},
             eventType: '',
-            userBoxVisible:false,
+            userBoxVisible: false,
             selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
             },
             //可选范围默认值
-            ableAll:{
+            ableAll: {
             },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
             dataForm: {
-                                equipmentCoding : undefined,
-                                deviceName : undefined,
-                                    equipmentType : undefined,
-                                equipmentBrand : undefined,
-                                supplier : undefined,
-                                supplierPhone : undefined,
-                                equipmentWarranty : undefined,
-                                warrantyStartTime : undefined,
-                                warrantyEndTime : undefined,
-                                    state : "1",
-                                    deviceStatus : "1",
-                                deviceMacAddress : undefined,
-                                    spaceId : undefined,
-                                regionId : undefined,
-                                deviceDescription : undefined,
-                    version: 0,
+                equipmentCoding: undefined,
+                deviceName: undefined,
+                equipmentType: undefined,
+                equipmentBrand: undefined,
+                supplier: undefined,
+                supplierPhone: undefined,
+                equipmentWarranty: undefined,
+                warrantyStartTime: undefined,
+                warrantyEndTime: undefined,
+                state: "1",
+                deviceStatus: "1",
+                deviceMacAddress: undefined,
+                spaceId: undefined,
+                spaceName: undefined,
+                regionId: undefined,
+                regionName: undefined,
+                deviceDescription: undefined,
+                version: 0,
+                installationTime: undefined,
+                personInCharge: undefined,
+                chargePhone: undefined,
+                equipmentCode: undefined,
             },
             tableRequiredData: {},
             dataRule:
             {
-                            equipmentCoding: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            deviceName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            equipmentType: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            equipmentBrand: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            supplierPhone: [
-                                    {
-                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-                                        message: '请输入正确的联系方式',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            equipmentWarranty: [
-                                    {
-                                        pattern: /^\d+$/,
-                                        message: '请输入正确的数字',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            deviceMacAddress: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^\d+$/,
-                                        message: '请输入正确的数字',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            spaceId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            regionId: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
+                equipmentCoding: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                deviceName: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                equipmentType: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                equipmentBrand: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                supplierPhone: [
+                    {
+                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+                        message: '请输入正确的联系方式',
+                        trigger: 'blur'
+                    },
+                ],
+                equipmentWarranty: [
+                    {
+                        pattern: /^\d+$/,
+                        message: '请输入正确的数字',
+                        trigger: 'blur'
+                    },
+                ],
+                deviceMacAddress: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^\d+$/,
+                        message: '请输入正确的数字',
+                        trigger: 'blur'
+                    },
+                ],
+                spaceId: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                regionId: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                installationTime: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                personInCharge: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                chargePhone: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+                        message: '请输入正确的联系方式',
+                        trigger: 'blur'
+                    },
+                ],
+                equipmentCode: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
             },
-                            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"  },
-                    spaceIdcolumnOptions:[ {"label":"园区编码","value":"code"}, {"label":"园区名称","value":"name"}, {"label":"空间面积","value":"space_area"}, {"label":"空间类型","value":"space_type"}, {"label":"租赁开始时间","value":"lease_start_time"}, {"label":"租赁结束时间","value":"lease_end_ime"},],
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        equipmentCoding:[] ,
-                        deviceName:[] ,
-                        equipmentType:[] ,
-                        equipmentBrand:[] ,
-                        supplier:[] ,
-                        supplierPhone:[] ,
-                        equipmentWarranty:[] ,
-                        warrantyStartTime:[] ,
-                        warrantyEndTime:[] ,
-                        state:[] ,
-                        deviceStatus:[] ,
-                        deviceMacAddress:[] ,
-                        spaceId:[] ,
-                        regionId:[] ,
-                        deviceDescription:[] ,
+            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" },
+            spaceIdcolumnOptions: [{ "label": "园区编码", "value": "code" }, { "label": "园区名称", "value": "name" }, { "label": "空间面积", "value": "space_area" }, { "label": "空间类型", "value": "space_type" }, { "label": "租赁开始时间", "value": "lease_start_time" }, { "label": "租赁结束时间", "value": "lease_end_ime" },],
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                equipmentCoding: [],
+                deviceName: [],
+                equipmentType: [],
+                equipmentBrand: [],
+                supplier: [],
+                supplierPhone: [],
+                equipmentWarranty: [],
+                warrantyStartTime: [],
+                warrantyEndTime: [],
+                state: [],
+                deviceStatus: [],
+                deviceMacAddress: [],
+                spaceId: [],
+                regionId: [],
+                deviceDescription: [],
+                installationTime: [],
+                personInCharge: [],
+                chargePhone: [],
+                equipmentCode: [],
             },
         }
+    },
+    computed: {
+        ...mapGetters(['userInfo'])
+    },
+    watch: {},
+    created() {
+        this.dataAll()
+        this.initDefaultData()
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        spaceChange(var1, var2) {
+            this.dataForm.spaceName = var2.name;
+            this.dataForm.regionId = var2.pid;
+            this.dataForm.regionName = var2.areaName;
         },
-        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)
-                    }
+        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)
                 }
-            },
-            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)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/example/ParkEquipment/'+ 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];
+            }
+        },
+        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)
                 }
-                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)
+            }
+        },
+        getInfo(id) {
+            request({
+                url: '/api/example/ParkEquipment/' + 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)
                         }
                     }
                 }
-            },
-            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
-                            }
+            }
+        },
+        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(){
-            },
-                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
                     }
                 } else {
+                    this.dataForm[data] = defaultValue
+                }
+            }
+        },
+        dataAll() {
+        },
+        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/ParkEquipment/'+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/ParkEquipment/' + 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/ParkEquipment',
-                        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/ParkEquipment',
+                    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/ParkEquipment/'+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/ParkEquipment/' + 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>