diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b298be65c..5417c8271 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -159,3 +159,12 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937' + +-- 项目库置顶 2023-1-12 未同步生产环境 +CREATE TABLE `laws_weilai`.`top_project` ( + `id` varchar(36) NOT NULL COMMENT 'id', + `project_library_base_id` varchar(36) NULL COMMENT '项目id', + `flag` varchar(255) NULL COMMENT '置顶标识', + `sort` varchar(255) NULL COMMENT '置顶排序', + PRIMARY KEY (`id`) +); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java index 0d6a0843b..c29c47fc1 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java @@ -524,6 +524,10 @@ public class QueryGenerator { //update-end-author:taoyan date:20200909 for:【bug】in 类型多值查询 不适配postgresql #1671 break; case LIKE: + //由于适用地区数据字典的问题，所以对于适用地区条件查询单独进行处理（由于美国和澳大利亚都包含US，所以不能直接用like） + if("region".equals(name)){ + name = " binary " + name; + } queryWrapper.like(name, value); break; case LEFT_LIKE: diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3d958f539..59ca072fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4153,7 +4153,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parent_id = '' or parent_id is null - order by plb.sort desc, plb.create_time desc + order by plb.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 45e9778aa..1b393189d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -52,6 +52,8 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; +import com.jero.modules.top.entity.TopProjectEO; +import com.jero.modules.top.service.ITopProjectEOService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -74,6 +76,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -157,6 +160,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + //置顶 + List idList = result.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList()); + List topProjectEOList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(idList)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort); + topProjectEOList = iTopProjectEOService.list(wrapper); + } + for(ProjectLibraryBase projectLibraryBase: result){ + //置顶处理 + if(ObjectUtils.isNotEmpty(topProjectEOList)){ + List collect = topProjectEOList.stream() + .filter(e -> projectLibraryBase.getId().equals(e.getProjectLibraryBaseId()) + && loginUser.getUsername().equals(e.getCreateBy())) + .collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + projectLibraryBase.setFlag(collect.get(0).getFlag()); + projectLibraryBase.setSort(collect.get(0).getSort()); + }else{ + projectLibraryBase.setSort("0"); + } + }else{ + projectLibraryBase.setSort("0"); + } //目标市场 String targetMarket = getMarket(params, targetMarketList, projectLibraryBase); //主项目的版本号 @@ -809,6 +839,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl() { + @Override + public int compare(ProjectLibraryBase o1, ProjectLibraryBase o2) { + return -o1.getSort().compareTo(o2.getSort()); + } + }); + } + //所有主项目 List projectLibraryBaseListParent = projectLibraryBaseMapper.queryMaimList(); disposeData(projectLibraryBaseListParent,"",false); @@ -1665,32 +1705,64 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort); - List list = this.list(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).orderByDesc(TopProjectEO::getSort); + List list = iTopProjectEOService.list(wrapper); if(list.size() != 0){ - String sort = list.get(list.size() - 1).getSort(); + String sort = list.get(0).getSort(); int sortTemp = Integer.valueOf(sort) + 1; - projectLibraryBase.setSort(String.valueOf(sortTemp)); + topProjectEO.setSort(String.valueOf(sortTemp)); }else{ //首个置顶的项目排序为1 - projectLibraryBase.setSort("1"); + topProjectEO.setSort("1"); } - projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue()); - this.updateById(projectLibraryBase); + iTopProjectEOService.save(topProjectEO); }else{ //取消置顶 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ProjectLibraryBase::getId,id); - updateWrapper.set(ProjectLibraryBase::getSort,null).set(ProjectLibraryBase::getFlag,null); - this.update(projectLibraryBase,updateWrapper); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,id); + iTopProjectEOService.remove(wrapper); } } +// @Override +// public void top(String id, String flag) { +// ProjectLibraryBase projectLibraryBase = this.getById(id); +// //置顶的时候将取消置顶标识传过来即:flag=1 +// if(TopEnum.TOP_CANCEL.getValue().equals(flag)){ +// //置顶 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort); +// List list = this.list(wrapper); +// if(list.size() != 0){ +// String sort = list.get(list.size() - 1).getSort(); +// int sortTemp = Integer.valueOf(sort) + 1; +// projectLibraryBase.setSort(String.valueOf(sortTemp)); +// }else{ +// //首个置顶的项目排序为1 +// projectLibraryBase.setSort("1"); +// } +// projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue()); +// this.updateById(projectLibraryBase); +// +// }else{ +// //取消置顶 +// LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); +// updateWrapper.in(ProjectLibraryBase::getId,id); +// updateWrapper.set(ProjectLibraryBase::getSort,null).set(ProjectLibraryBase::getFlag,null); +// this.update(projectLibraryBase,updateWrapper); +// } +// } @Override public List getVersionsInfo(String id) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/entity/TopProjectEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/entity/TopProjectEO.java new file mode 100644 index 000000000..7179b572d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/entity/TopProjectEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.top.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 项目库置顶关联表 + * @Author: jero-boot + * @Date: 2023-01-12 + * @Version: V1.0 + */ +@Data +@TableName("top_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="top_project对象", description="项目库置顶关联表") +public class TopProjectEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectLibraryBaseId; + + /**置顶标识*/ + @Excel(name = "置顶标识", width = 15) + @ApiModelProperty(value = "置顶标识") + private java.lang.String flag; + + /**置顶排序*/ + @Excel(name = "置顶排序", width = 15) + @ApiModelProperty(value = "置顶排序") + private java.lang.String sort; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/TopProjectEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/TopProjectEOMapper.java new file mode 100644 index 000000000..12dd3b6ed --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/TopProjectEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.top.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.top.entity.TopProjectEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目库置顶关联表 + * @Author: jero-boot + * @Date: 2023-01-12 + * @Version: V1.0 + */ +public interface TopProjectEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/xml/TopProjectEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/xml/TopProjectEOMapper.xml new file mode 100644 index 000000000..3b74c28d9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/mapper/xml/TopProjectEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/ITopProjectEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/ITopProjectEOService.java new file mode 100644 index 000000000..face0aac6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/ITopProjectEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.top.service; + +import com.jero.modules.top.entity.TopProjectEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 项目库置顶关联表 + * @Author: jero-boot + * @Date: 2023-01-12 + * @Version: V1.0 + */ +public interface ITopProjectEOService extends IService { + + /** + * 保存 + * + * @param topProjectEO + * @return + */ + void add(TopProjectEO topProjectEO); + + /** + * 更新 + * + * @param topProjectEO + * @return + */ + void editById(TopProjectEO topProjectEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + TopProjectEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/impl/TopProjectEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/impl/TopProjectEOServiceImpl.java new file mode 100644 index 000000000..d8473fc8c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/top/service/impl/TopProjectEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.top.service.impl; + +import com.jero.modules.top.entity.TopProjectEO; +import com.jero.modules.top.mapper.TopProjectEOMapper; +import com.jero.modules.top.service.ITopProjectEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 项目库置顶关联表 + * @Author: jero-boot + * @Date: 2023-01-12 + * @Version: V1.0 + */ +@Service +public class TopProjectEOServiceImpl extends ServiceImpl implements ITopProjectEOService { + + /** + * 保存 + * + * @param topProjectEO + * @return + */ + @Override + public void add(TopProjectEO topProjectEO) { + Date now = new Date(); + topProjectEO.setCreateTime(now); + topProjectEO.setUpdateTime(now); + save(topProjectEO); + } + + /** + * 更新 + * + * @param topProjectEO + * @return + */ + @Override + public void editById(TopProjectEO topProjectEO) { + Date now = new Date(); + topProjectEO.setUpdateTime(now); + saveOrUpdate(topProjectEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public TopProjectEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 25ca4a443..3e2b9e7ca 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1369,7 +1369,7 @@ module.exports = { CuiBan:'CuiBan', brand:'Brand', allsubitemsitem:'Whether to delete all subitems under this item', - contactTheFounder:'Contact the founder', + contactTheFounder:'Contact author', certificationCategoryNumber: 'certification Category Number', historicalrecord:'historical Record', Referenceparametercolumn:'Reference Parameter Column', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ecda6ea34..bf6a67de7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1476,7 +1476,7 @@ module.exports = { columnforced:'确认强制撤回?', brand:'品牌', allsubitemsitem:'该项目下拥有子项目，是否全部删除', - contactTheFounder:'联系创建人', + contactTheFounder:'联系作者', customize:'自定义表头', customColumn:'自定义列', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 82a1b8faf..ac400b983 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -95,16 +95,26 @@ + {{$t('beEqualTo')}} - {{$t('contain')}} - {{$t('withStart')}} - {{$t('withEnd')}} - {{$t('in')}} + + {{$t('contain')}} + + {{$t('withStart')}} + + {{$t('withEnd')}} + + {{$t('in')}} + {{$t('notEqual')}} - {{$t('granter')}} - {{$t('greaterOrEqual')}} - {{$t('less')}} - {{$t('lessOrEqual')}} + + {{$t('granter')}} + + {{$t('greaterOrEqual')}} + + {{$t('less')}} + + {{$t('lessOrEqual')}} diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 5484a236d..709235e41 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -885,7 +885,7 @@ } ::v-deep .ant-table-body { - background: transparent !important; + //background: transparent !important; } .textfield { diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue index 3c60725cf..68a324b9a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue @@ -31,7 +31,10 @@ - + + {{$t('query')}} {{$t('reset')}} @@ -42,7 +45,7 @@ import { getAction, postAction } from '@/api/manage' +import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' export default { name: 'transferList', - components: {}, + components: { + globalAdvancedQuery + }, props: ['url'], data() { return { + toggleSearchStatus: false, visible: false, queryParam: {}, confirmLoading: false, @@ -86,29 +93,161 @@ export default { columns: [ { title: this.$t('standard'), - align: 'center', + align: 'left', dataIndex: 'serialNumber', + width: 100, + fixed: 'left', scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), - align: 'center', + align: 'left', dataIndex: 'title', + width: 100, + fixed: 'left', scopedSlots: { customRender: 'titleName' } }, { title: this.$t('subtitle'), - align: 'center', + align: 'left', dataIndex: 'subtitle', + ellipsis: true, + width: 150 + }, + { + title: this.$t('zoneOfApplication'), + align: 'left', + dataIndex: 'region_dictText', + width: 150, + ellipsis: true + }, + { + title: this.$t('correspondingStandard'), + align: 'left', + dataIndex: 'correspondingStandard', + width: 150, + ellipsis: true + }, + { + title: this.$t('implementationCategory'), + align: 'left', + dataIndex: 'implementType_dictText', + width: 150, + ellipsis: true + }, + { + title: this.$t('ImplementationDate'), + align: 'left', + width: 200, + dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + ellipsis: true + }, + { + title: this.$t('vehicleInProductionDate'), + align: 'left', + width: 220, + dataIndex: 'implementTime', + ellipsis: true + }, + { + title: this.$t('certificationType'), + align: 'left', + dataIndex: 'attestationType_dictText', + width: 180, + ellipsis: true + }, + { + title: this.$t('certificationLevel'), + align: 'left', + dataIndex: 'attestationRank_dictText', + width: 180, + ellipsis: true + }, + { + title: this.$t('applicableSupplement'), + align: 'left', + width: 220, + dataIndex: 'applicableSupplement', + ellipsis: true + }, + { + title: 'WVTA ID', + align: 'left', + dataIndex: 'wvtaId', + width: 180, ellipsis: true }, { title: this.$t('areaOfResponsibility'), - align: 'center', + align: 'left', ellipsis: true, - dataIndex: 'dutyTerritory_dictText' + dataIndex: 'dutyTerritory_dictText', + width: 180 }, ], + fieldList: [ + { + type: 'string', + value: 'subtitle', + text: this.$t('subtitle') + }, + { + type: '', + value: 'region', + text: this.$t('zoneOfApplication'), + dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + { + type: 'string', + value: 'correspondingStandard', + text: this.$t('correspondingStandard') + }, + { + type: '', + value: 'implementType', + text: this.$t('implementationCategory'), + dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + { + type: 'date', + value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + text: this.$t('ImplementationDate') + }, + { + type: 'date', + value: 'implementTime', + text: this.$t('vehicleInProductionDate') + }, + { + type: '', + value: 'attestationType', + text: this.$t('certificationType'), + dictCode: 'attestation_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + { + type: '', + value: 'attestationRank', + text: this.$t('certificationLevel'), + dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + { + type: 'string', + value: 'applicableSupplement', + text: this.$t('applicableSupplement') + }, + { + type: 'string', + value: 'wvtaId', + text: 'WVTA ID' + }, + { + type: '', + value: 'dutyTerritory', + text: this.$t('areaOfResponsibility'), + dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + + ], dataList: [], content: [], loading: false, @@ -122,6 +261,9 @@ export default { }, methods: { + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, transferModel(id) { this.visible = true this.dummyInventoryBaseId = id @@ -137,6 +279,9 @@ export default { this.pageNo = 1 this.queryParam = {} this.replacePage() + this.$refs.globalAdvancedQueryRef.resetLine() + this.$refs.globalAdvancedQueryRef.emitCallback() + }, onChange(page, pageSize) { this.pageNo = page @@ -147,10 +292,24 @@ export default { this.pageSize = pageSize this.replacePage() }, + handleSuperQuery(params, matchType) { + let sqp = {} + if (!params || (params && params.length == 0)) { + sqp['superQueryParams'] = '' + this.$refs.globalAdvancedQueryRef.superQueryFlag = false + } else { + this.$refs.globalAdvancedQueryRef.superQueryFlag = true + sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) + sqp['superQueryMatchType'] = matchType + } + this.queryParamQuery = sqp + this.replacePage() + }, replacePage() { let query = { // pageNo: this.pageNo, // pageSize: this.pageSize, + ...this.queryParamQuery, ...this.queryParam, dummyInventoryBaseId: this.dummyInventoryBaseId } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 63f07166b..26bb62de4 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1130,9 +1130,9 @@ overflow: visible; } - ::v-deep .ant-table-body { - padding-bottom: 7px; - } + //::v-deep .ant-table-body { + // padding-bottom: 7px; + //} ::v-deep .ant-table-body-inner { padding-bottom: 16px; diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 72665522f..3803677fd 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -748,7 +748,7 @@ .box-input { display: inline-block; - width: calc(100% - 64px); + width: calc(100% - 126px); height: 38px; margin-top: 2px; } diff --git a/jero-web/src/views/projectManagement/components/batchModel.vue b/jero-web/src/views/projectManagement/components/batchModel.vue index ae997e367..8d93615c4 100644 --- a/jero-web/src/views/projectManagement/components/batchModel.vue +++ b/jero-web/src/views/projectManagement/components/batchModel.vue @@ -33,7 +33,7 @@ {{$t('remarks')}} - + - +
{{$t('standard')}} @@ -22,7 +22,7 @@