From 9c70b9a6b54fff31eb4fcdf88686bd7cfc90e597 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:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TradeuploadController.java     |  2 +-
 .../scm/basicInformation/tradeupload/Form.vue | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
index fdc42bc5..2080cb4e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
@@ -87,7 +87,7 @@ public class TradeuploadController {
         //处理id字段转名称，若无需转或者为空可删除
     for(TradeuploadEntity entity:list){
 						Map<String,Object> materialCodeMap = new HashMap<>();
-            entity.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getMaterialCode(),"294090217084722181",materialCodeMap));
+            entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap));
 						Map<String,Object> salesNameMap = new HashMap<>();
             entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap));
 						Map<String,Object> licenseNoMap = new HashMap<>();
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index ca93b29a..3e8aa186 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -9,13 +9,14 @@
             <el-col :span="12" >
                 <el-form-item  label="物料编码"
  prop="materialCode" >
-                    <relationForm    v-model="dataForm.materialCode"
- placeholder="请选择"  clearable  field="materialCode" modelId ="294090217084722181"  :columnOptions="materialCodecolumnOptions" relationField="selectField121"   >
+                    <popupSelect    v-model="dataForm.materialCode"
+ placeholder="请选择"  clearable  field="materialCode" interfaceId="381037852907038533"  :columnOptions="materialCodecolumnOptions" propsValue="id" relationField="item_code" popupType="dialog"
+	popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
+<!--            <el-col :span="12" >
                 <el-form-item  label="物料名称"
  prop="materialName" >
                     <el-input    v-model="dataForm.materialName"
@@ -23,7 +24,16 @@
 
                 </el-input>
                 </el-form-item>
-            </el-col>
+            </el-col> -->
+			            <el-col :span="12" >
+			                <el-form-item  label="物料名称"  
+			>
+			                    <popupAttr  
+			 relationField="materialCode"  showField="description" >
+			
+			                </popupAttr>
+			                </el-form-item>
+			            </el-col>
             <el-col :span="12" >
                 <el-form-item  label="销售合同"
  prop="salesName" >
@@ -280,7 +290,7 @@
                                 },
                         ],
             },
-                    materialCodecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
+                    materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"description"}, {"label":"库存组织","value":"organization_id"}, {"label":"默认库区","value":"areaname"},],
                     salesNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
                         advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
                         transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],