diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java index 4fe9f8fc..b726a466 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java @@ -87,9 +87,9 @@ public class MaterialController { //处理id字段转名称,若无需转或者为空可删除 for(MaterialEntity entity:list){ Map outAreaMap = new HashMap<>(); - entity.setOutArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getOutArea(),"294012196529150981",outAreaMap)); + entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap)); Map inAreaMap = new HashMap<>(); - entity.setInArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getInArea(),"294012196529150981",inAreaMap)); + entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap)); } List listVO=JsonUtil.getJsonToList(list,MaterialListVO.class); for(MaterialListVO materialVO:listVO){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java index 454263d9..bb9869f3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java @@ -87,7 +87,7 @@ public class ReservoirareaController { //处理id字段转名称,若无需转或者为空可删除 for(ReservoirareaEntity entity:list){ Map warehouseIdMap = new HashMap<>(); - entity.setWarehouseId(generaterSwapUtil.swapRelationFormValue("comInputField109",entity.getWarehouseId(),"294090217084722181",warehouseIdMap)); + entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("380988259175524165","id","name",entity.getWarehouseId(),warehouseIdMap)); entity.setOrgnizeId(generaterSwapUtil.comSelectValues(entity.getOrgnizeId())); entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); } diff --git a/SC-web/src/views/scm/basicInformation/material/Form.vue b/SC-web/src/views/scm/basicInformation/material/Form.vue index 359b3492..e7141d90 100644 --- a/SC-web/src/views/scm/basicInformation/material/Form.vue +++ b/SC-web/src/views/scm/basicInformation/material/Form.vue @@ -74,19 +74,21 @@ - + - + - + - + @@ -233,8 +235,8 @@ }, purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], - outAreacolumnOptions:[ {"label":"购药人","value":"comInputField102"},], - inAreacolumnOptions:[ {"label":"姓名","value":"comInputField102"},], + outAreacolumnOptions:[ {"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},], + inAreacolumnOptions:[{"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},], effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],