修改设备

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStaffDeviceEntity.java

@@ -53,7 +53,6 @@ public class RecycleStaffDeviceEntity  {
     private String address;
     @TableField("DEVICE_NAME")
     private String deviceName;
-
     @TableField("DEVICE_ID")
     private String deviceId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclestationstaff/RecycleStaffDeviceModel.java

@@ -35,7 +35,7 @@ public class RecycleStaffDeviceModel  {
     @JSONField(name = "address")
     private String address;
 
-    @JSONField(name = "deviceId ")
+    @JSONField(name = "deviceId")
     private String deviceId;
 
 }

jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue

@@ -126,9 +126,9 @@
                       </JnpfPopupSelect>
                     </template>
                   </el-table-column> -->
-                  <el-table-column label="设备名称" prop="deviceCode">
+                  <el-table-column label="设备编码" prop="deviceCode">
                     <template slot="header" v-if="false">
-                      <span class="required-sign">*</span>设备名称
+                      <span class="required-sign">*</span>设备编码
                     </template>
 
                     <template slot-scope="scope">
@@ -324,7 +324,10 @@ export default {
           address: e.address,
           // hasSchedule: e.hasSchedule,
           // recycleAddress: e.recycleAddress,
+          
         };
+        console.log(item)
+
         this.dataForm.recycleStaffDeviceList.push(item);
       }
     },
@@ -557,6 +560,7 @@ export default {
         deviceCode: '',
         creatorUserId: undefined,
         creatorTime: undefined,
+        deviceId: undefined,
       }
       this.getrecyclestaffdeviceList(item)
     },