修改

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java

@@ -87,11 +87,11 @@ public class PoundlistController {
         //处理id字段转名称，若无需转或者为空可删除
     for(PoundlistEntity 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));
+            entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap));
             Map<String,Object> licenseNoMap = new HashMap<>();
-            entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap));
+            entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap));
             entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
             entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
 						Map<String,Object> purchaseNameMap = new HashMap<>();

SC-web/src/views/scm/basicInformation/poundlist/Form.vue

@@ -7,11 +7,11 @@
 				<template v-if="!loading">
 					<el-col :span="12">
 						<el-form-item label="物料编码" prop="materialCode">
-							<relationForm v-model="dataForm.materialCode" placeholder="请选择" clearable
+							<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable
-								field="materialCode" modelId="294090217084722181"
+								field="materialCode" interfaceId="381037852907038533"  :columnOptions="materialCodecolumnOptions" propsValue="id" relationField="item_code" popupType="dialog"
-								:columnOptions="materialCodecolumnOptions" relationField="selectField121">
+                            popupTitle="选择数据"  popupWidth="800px">
 
-							</relationForm>
+							</popup-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -24,11 +24,11 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="销售合同" prop="salesName">
-							<relationForm v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
+							<popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
-								modelId="294090217084722181" :columnOptions="salesNamecolumnOptions"
+              interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
-								relationField="selectField121">
+              popupTitle="选择数据"  popupWidth="800px">
 
-							</relationForm>
+							</popup-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -74,11 +74,11 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车号" prop="licenseNo">
-							<relationForm v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
+							<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
-								modelId="294090217084722181" :columnOptions="licenseNocolumnOptions"
+              interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
-								relationField="selectField122">
+              popupTitle="选择数据"  popupWidth="800px">
 
-							</relationForm>
+							</popupSelect>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -339,14 +339,26 @@
 						trigger: ["blur", "change"]
 					}, ],
 				},
-				materialCodecolumnOptions: [{
+        materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
-					"label": "事件等级",
+          {"label":"物料名称","value":"description"},
-					"value": "selectField121"
+          {"label":"库存组织","value":"organization_id"},
-				}, ],
+          {"label":"默认库区","value":"areaname"},],
         salesNamecolumnOptions: [{
-					"label": "事件等级",
+          "label": "合同编码",
-					"value": "selectField121"
+          "value": "contract_code"
-				}, ],
+        },
+          {
+            "label": "合同名称",
+            "value": "contract_name"
+          },
+          {
+            "label": "合同类型",
+            "value": "contract_type"
+          },
+          {
+            "label": "供应商/客户名称",
+            "value": "name"
+          },],
 				advanceOptions: [{
 					"fullName": "是",
 					"id": "1"
@@ -365,9 +377,29 @@
 					"id": "2"
 				}],
 				licenseNocolumnOptions:  [{
-					"label": "事件级别",
+          "label": "车牌号",
-					"value": "selectField122"
+          "value": "ticketno"
-				}, ],
+        },
+          {
+            "label": "司机",
+            "value": "drivername"
+          },
+          {
+            "label": "车辆照片",
+            "value": "vehiclephotos"
+          },
+          {
+            "label": "手机号",
+            "value": "contact"
+          },
+          {
+            "label": "创建人",
+            "value": "f_creatorusername"
+          },
+          {
+            "label": "创建时间",
+            "value": "f_creatortime"
+          },],
 				purchaseNamecolumnOptions: [{
 					"label": "事件等级",
 					"value": "selectField121"