From 7107f7cdecf8aabbc609fd2b49eeda319f837c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Sat, 7 Jan 2023 14:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialController.java         |  4 ++--
 .../controller/ReservoirareaController.java    |  2 +-
 .../scm/basicInformation/material/Form.vue     | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

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<String,Object> outAreaMap = new HashMap<>();
-            entity.setOutArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getOutArea(),"294012196529150981",outAreaMap));
+            entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
 						Map<String,Object> inAreaMap = new HashMap<>();
-            entity.setInArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getInArea(),"294012196529150981",inAreaMap));
+            entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
     }
 	List<MaterialListVO> 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<String,Object> 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 @@
             <el-col :span="12" >
                 <el-form-item  label="默认出库区"  
  prop="outArea" >
-                    <relationForm    v-model="dataForm.outArea"
- placeholder="请选择"  clearable  field="outArea" modelId ="294012196529150981"  :columnOptions="outAreacolumnOptions" relationField="comInputField102"   >
+                    <popupSelect    v-model="dataForm.outArea"
+ placeholder="请选择"  clearable  field="outArea" interfaceId="381404161809350213"  :columnOptions="outAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
+    popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
                 <el-form-item  label="默认入库区"  
  prop="inArea" >
-                    <relationForm    v-model="dataForm.inArea"
- placeholder="请选择"  clearable  field="inArea" modelId ="294012196529150981"  :columnOptions="inAreacolumnOptions" relationField="comInputField102"   >
+                    <popupSelect    v-model="dataForm.inArea"
+ placeholder="请选择"  clearable  field="inArea" interfaceId="381404161809350213"  :columnOptions="inAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog" 
+   popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -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"}],