设备库存，园区设备管理，设备保修信息提交

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")

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;
 }

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="所属区域"  
+                <jnpf-form-tip-item  label="区域名称"  
- prop="regionId"  >
+ prop="regionName"  >
-                        <p>{{dataForm.regionId}}</p>
+                        <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"  },