From 38e932d7d2b6ea6ec24a69a34ae2ff3bca660429 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 14 May 2024 19:17:53 +0800 Subject: [PATCH] rev:pm --- .../hd/.idea/sonarlint/issuestore/index.pb | 10 +- .../controller/BmFormStrucController.java | 16 +- .../service/IBmFormStrucService.java | 1 + .../service/impl/BmFormStrucServiceImpl.java | 2 +- .../controller/PmFormDataController.java | 11 +- .../form_data/service/IPmFormDataService.java | 5 + .../form_data/service/dao/PmFormData.java | 6 +- .../service/dao/mapper/PmFormDataMapper.java | 7 + .../dao/mapper/xml/PmFormDataMapper.xml | 38 +++ .../form_data/service/dto/FormDataQuery.java | 3 + .../service/impl/PmFormDataServiceImpl.java | 113 ++++++--- .../wms/pm_manage/form_data/ViewDialog.vue | 226 ++++++++++++++++++ .../views/wms/pm_manage/form_data/formData.js | 16 +- .../views/wms/pm_manage/form_data/index.vue | 93 ++++--- 14 files changed, 467 insertions(+), 80 deletions(-) create mode 100644 wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index 5abd183d..926684a2 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -135,8 +135,6 @@ m cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854 ’ bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java,a/4/a44b52a4bc649baab711c5bd57004aa22cc2206b -w -Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 p @nladmin-system/src/main/java/org/nl/common/enums/QueryTEnum.java,f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d t @@ -159,11 +157,13 @@ unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/node nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java,a/3/a3a5a2860090b68804b8fad26d512236f3eae5b4 ˆ Xnladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java,2/0/20d3f5ca66f748f0a2bada36023b0308d4d552c0 -Š -Znladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java,9/0/90cde14dd61225ba9c416f9d10269bab669cd1ad – fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 – fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6 ž -nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09 \ No newline at end of file +nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09 +Ÿ +onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3 + +]nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java,0/3/03deb92a49c3f6457dfffe6f76373226a7d40537 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java index 3c6c6c0f..214826e0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java @@ -59,9 +59,10 @@ public class BmFormStrucController { @GetMapping public ResponseEntity queryAll(FormStrucQuery query, PageQuery pageQuery){ //å‚数判读，å‚数解æžï¼Œè°ƒç”¨å‚数入库 - Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); - return new ResponseEntity<>(TableDataInfo.build(page),HttpStatus.OK); + //Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); + return new ResponseEntity<>(iBmFormStrucService.queryAll(query,pageQuery),HttpStatus.OK); } + @PostMapping public ResponseEntity save(@RequestBody JSONObject param){ //å‚数判读，å‚数解æžï¼Œè°ƒç”¨å‚数入库 @@ -93,6 +94,17 @@ public class BmFormStrucController { return new ResponseEntity<>(list,HttpStatus.OK); } + @GetMapping("/getParentFormTypes") + public ResponseEntity getParentFormTypes(){ + //å‚数判读，å‚数解æžï¼Œè°ƒç”¨å‚数入库 + List> select = iBmFormStrucService.listMaps(new QueryWrapper().select("form_type", "form_name").isNull("parent_id").groupBy("form_type")); + List list = new ArrayList<>(); + for (Map map : select) { + list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type"))); + } + return new ResponseEntity<>(list,HttpStatus.OK); + } + /** * @ONLY:动æ€è¡¨å•è¡¨å¤´ä¿¡æ¯ * æ•°æ®ç»“æž„:{"type":xxx,"name":xxx,"desc":xxx,"item":{"desc":"æè¿°"}} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java index 49437f1d..7248e384 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java @@ -18,4 +18,5 @@ public interface IBmFormStrucService extends IService { BmFormStruc getFormType(String form_type); Object queryAll(FormStrucQuery query, PageQuery pageQuery); + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java index fccd183d..fd7a1cbf 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java @@ -52,7 +52,7 @@ public class BmFormStrucServiceImpl extends ServiceImpl records) { for (BmFormStruc record : records) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(BmFormStruc::getParent_id, record.getForm_type()); + lambdaQueryWrapper.eq(BmFormStruc::getParent_id, record.getId()); List list = this.list(lambdaQueryWrapper); if (CollectionUtil.isNotEmpty(list)) { record.setHasChildren(true); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index ba6daf7e..d2dde30f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -36,9 +36,14 @@ public class PmFormDataController { @GetMapping() public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { -// Page result = formDataService.page(page.build(), query.build()); -// Object o = formDataService.queryAll(query,page); - return new ResponseEntity<>(TableDataInfo.build(formDataService.page(page.build(),query.build())), HttpStatus.CREATED); + return new ResponseEntity<>(formDataService.queryAll(query,page), HttpStatus.CREATED); + } + + @GetMapping("/getSonFormData/{id}") + public ResponseEntity getSonDtlFormData(@PathVariable String id){ + //å‚数判读，å‚数解æžï¼Œè°ƒç”¨å‚数入库 + //Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); + return new ResponseEntity<>(formDataService.getSonDtlFormData(id),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java index 8acf2ac5..d4af142f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java @@ -1,7 +1,9 @@ package org.nl.wms.pm_manage.form_data.service; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; import java.util.List; @@ -20,4 +22,7 @@ public interface IPmFormDataService extends IService { List syncAnalyse(SyncFormMapping mapping, String dataString); + Object queryAll(FormDataQuery query, PageQuery page); + + Object getSonDtlFormData(String id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java index 252219d4..d94c3d77 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java @@ -5,6 +5,7 @@ import java.math.BigDecimal; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.util.List; @@ -23,7 +24,7 @@ import org.nl.common.enums.StatusEnum; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "pm_form_data",autoResultMap = true) +@TableName(value = "pm_form_data", autoResultMap = true) public class PmFormData implements Serializable { private static final long serialVersionUID = 1L; @@ -115,5 +116,8 @@ public class PmFormData implements Serializable { */ private String parent_id; + @TableField(exist = false) + private Boolean hasChildren = false; + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java index 025fe94c..55142dcf 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java @@ -1,7 +1,11 @@ package org.nl.wms.pm_manage.form_data.service.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; + +import java.util.List; /** *

@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PmFormDataMapper extends BaseMapper { + List query(@Param("query") FormDataQuery query); + +// List query(@Param("id") String id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index 0c7aaafd..ba7e1df1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -2,4 +2,42 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java index 817ab372..19c3b0a4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java @@ -4,6 +4,8 @@ import lombok.Data; import org.nl.common.domain.entity.BaseQuery; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; +import java.util.Map; + /* * @author ZZQ * @Date 2024/5/11 17:46 @@ -12,4 +14,5 @@ import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; public class FormDataQuery extends BaseQuery { private String form_type; + private Map form_query; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index 177aa14a..42b2fd22 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -1,18 +1,26 @@ package org.nl.wms.pm_manage.form_data.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.*; import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper; import org.nl.wms.pm_manage.form_data.service.IPmFormDataService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; import org.nl.wms.sync_manage.service.form_mapping.ISyncFormMappingService; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; import org.springframework.beans.factory.annotation.Autowired; @@ -25,15 +33,15 @@ import java.util.*; /** *

* 表å•ä¿¡æ¯è¡¨ æœåŠ¡å®žçŽ°ç±» - * 表å•ç»“æž„ - * ---------------BmFormStruc--------------- - * /\ - * / \ - * / \ - * 表å•æ•°æ® / \表å•åŒæ­¥é…置表 - * PmFormData BmFormSync - * 表å•å›žæ˜¾æ—¶ï¼šè‡ªå®šä¹‰å­—段通过表å•ç»“构获å–lebel - * 表å•åŒæ­¥è®¾ç½®æ—¶ï¼šé€šè¿‡è¡¨å•ç»“构获å–所有字段，进行é…置字段映射，或者classå¤„ç† + * 表å•ç»“æž„ + * ---------------BmFormStruc--------------- + * /\ + * / \ + * / \ + * 表å•æ•°æ® / \表å•åŒæ­¥é…置表 + * PmFormData BmFormSync + * 表å•å›žæ˜¾æ—¶ï¼šè‡ªå®šä¹‰å­—段通过表å•ç»“构获å–lebel + * 表å•åŒæ­¥è®¾ç½®æ—¶ï¼šé€šè¿‡è¡¨å•ç»“构获å–所有字段，进行é…置字段映射，或者classå¤„ç† *

* * @author generator @@ -51,11 +59,11 @@ public class PmFormDataServiceImpl extends ServiceImpl().eq("form_type", form_type)); - if (syncFormMapping == null){ + if (syncFormMapping == null) { throw new BadRequestException("当å‰è¡¨å•æ— åŒæ­¥é…置信æ¯"); } List pmFormDatas = this.syncAnalyse(syncFormMapping, dataString); @@ -66,15 +74,15 @@ public class PmFormDataServiceImpl extends ServiceImpl syncAnalyse(SyncFormMapping formMapping, String sourceString) { BmFormStruc one = formStrucService.getOne(new QueryWrapper().eq("form_type", formMapping.getForm_type())); - if (one==null){ - throw new BadRequestException("当å‰è¡¨å•æ— é…置信æ¯"+formMapping.getForm_type()); + if (one == null) { + throw new BadRequestException("当å‰è¡¨å•æ— é…置信æ¯" + formMapping.getForm_type()); } List result = new ArrayList<>(); JSONObject sourceData = JSONObject.parseObject(sourceString); - if (StringUtils.isNotEmpty(one.getConvert_json())){ + if (StringUtils.isNotEmpty(one.getConvert_json())) { sourceData = sourceData.getJSONObject(one.getConvert_json()); } - JSONObject target = mappingParse(formMapping.getMapping_json(), one,sourceData ); + JSONObject target = mappingParse(formMapping.getMapping_json(), one, sourceData); Object items = target.remove("item"); target.put("id", IdUtil.getStringId()); target.put("code", CodeUtil.getNewCode(formMapping.getForm_type())); @@ -82,7 +90,7 @@ public class PmFormDataServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("create_time DESC"); + List pmFormData = this.baseMapper.query(query); + TableDataInfo build = TableDataInfo.build(pmFormData); + List content = build.getContent(); + for (PmFormData formData : content) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(PmFormData::getParent_id, formData.getId()); + List list = this.baseMapper.selectList(lqw); + if (CollectionUtil.isNotEmpty(list)) { + formData.setHasChildren(true); + } + } + build.setTotalElements(page.getTotal()); + return build; + } - if (CollectionUtils.isEmpty(sourceData)){ + @Override + public Object getSonDtlFormData(String id) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(PmFormData::getParent_id, id); + return this.list(lqw); +// List pmFormData = this.baseMapper.query(id); +// TableDataInfo build = TableDataInfo.build(pmFormData); +// List content = build.getContent(); +// for (PmFormData formData : content) { +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// lqw.eq(PmFormData::getParent_id, formData.getId()); +// List list = this.baseMapper.selectList(lqw); +// if (CollectionUtil.isNotEmpty(list)) { +// formData.setHasChildren(true); +// } +// } +// build.setTotalElements(page.getTotal()); +// return build; + } + + + private JSONObject mappingParse(JSONArray mapping_json, BmFormStruc formStruc, JSONObject sourceData) { + + if (CollectionUtils.isEmpty(sourceData)) { throw new BadRequestException("当å‰ä¸šåŠ¡æ•°æ®ä¸ºç©º"); } //æš‚æ—¶åªæœ‰ä¸¤å±‚ - JSONArray mst_mapping_json = mapping_json.size()>1?(JSONArray)mapping_json.remove(0):mapping_json.getJSONArray(0); + JSONArray mst_mapping_json = mapping_json.size() > 1 ? (JSONArray) mapping_json.remove(0) : mapping_json.getJSONArray(0); Map fieldMapping = mst_mapping_json.stream().collect(HashMap::new, (formMap, o) -> { JSONObject item = (JSONObject) o; formMap.put(item.getString("value"), item); @@ -114,11 +162,11 @@ public class PmFormDataServiceImpl extends ServiceImpl().eq("parent_id", formStruc.getId())); JSONArray sourceDtls = sourceData.getJSONArray(itemStruc.getConvert_json()); @@ -126,28 +174,29 @@ public class PmFormDataServiceImpl extends ServiceImpl fields, Map fieldMapping, JSONObject sourceData){ + + private JSONObject fieldMapping(Set fields, Map fieldMapping, JSONObject sourceData) { Map SpelMap = new HashMap<>(); JSONObject data = new JSONObject(); for (String field : fields) { - if (StringUtils.isNotEmpty(field)){ + if (StringUtils.isNotEmpty(field)) { JSONObject itemMappingConfig = fieldMapping.get(field); - if (itemMappingConfig == null){ + if (itemMappingConfig == null) { throw new BadRequestException(String.format("当å‰è¡¨å•æ²¡æœ‰é…置字段:%s 映射", new String[]{field})); } - if (StringUtils.isNotEmpty(itemMappingConfig.getString("skipExpression"))){ + if (StringUtils.isNotEmpty(itemMappingConfig.getString("skipExpression"))) { //el表达å¼è§£æž - SpelMap.put(field,itemMappingConfig.getString("skipExpression")); - }else { - data.put(field,sourceData.getString(itemMappingConfig.getString("mapping_field"))); + SpelMap.put(field, itemMappingConfig.getString("skipExpression")); + } else { + data.put(field, sourceData.getString(itemMappingConfig.getString("mapping_field"))); } } } - if (!CollectionUtils.isEmpty(SpelMap)){ + if (!CollectionUtils.isEmpty(SpelMap)) { Map parse = SpelUtil.parse(sourceData, SpelMap); data.putAll(parse); } diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue new file mode 100644 index 00000000..1b6f6794 --- /dev/null +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue @@ -0,0 +1,226 @@ + + + + + + diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/formData.js b/wms_pro/qd/src/views/wms/pm_manage/form_data/formData.js index f22c78d8..dc84c7ca 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/formData.js +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/formData.js @@ -31,5 +31,19 @@ export function getFormType() { }) } +export function getParentFormTypes() { + return request({ + url: 'api/bmFormStruc/getParentFormTypes', + method: 'get', + }) +} -export default { add, edit, del, getFormType } +export function getSonFormData(id) { + return request({ + url: 'api/pmFormData/getSonFormData/' + id, + method: 'get', + }) +} + + +export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData} diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue index 98dcc42c..ca7176a4 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue @@ -27,24 +27,13 @@ :label="item.label" /> - - - - - - - - - - - - - - - - - + @@ -68,21 +57,38 @@ > 导入 + + + + + + + + + + + - + + + @@ -93,8 +99,9 @@ - - + + - +