diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java index a3e07eb..2e0b9bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java @@ -85,6 +85,9 @@ public class PointDto implements Serializable { /** 来源标识 */ private Long source_id; + /** 是否有光电 */ + private String is_light; + /** 是否启用 */ private String is_used; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index cdae978..50ef193 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 2d9f38c..56a35e0 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -289,6 +289,15 @@ <el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code"> <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" /> </el-form-item> + <el-form-item label="有无光电"> + <el-switch + v-model="form.is_light" + active-value="1" + inactive-value="0" + active-color="#409EFF" + inactive-color="#C0CCDA" + /> + </el-form-item> <el-form-item label="备注"> <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" /> </el-form-item> @@ -326,6 +335,11 @@ <el-table-column prop="vehicle_code" label="载具编码" min-width="120"/> <el-table-column prop="vehicle_qty" label="载具数量" /> <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip /> + <el-table-column prop="is_used" label="是否有光电" min-width="100"> + <template slot-scope="scope"> + {{ scope.row.is_light == '1' ? '是' : '否' }} + </template> + </el-table-column> <el-table-column prop="is_used" label="是否启用"> <template slot-scope="scope"> {{ scope.row.is_used == '1' ? '是' : '否' }} @@ -379,6 +393,7 @@ const defaultForm = { vehicle_code: null, source_id: null, remark: null, + is_light: '0', is_used: null, is_delete: null, create_id: null,