diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java index ed02455d1..16e65f8fc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java @@ -1,5 +1,6 @@ package com.jero.common.system.vo; +import java.io.Serializable; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; @@ -21,7 +22,8 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class LoginUser { +public class LoginUser implements Serializable { + private static final long serialVersionUID = 1L; /** * 登录人id diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java index d3cb3f15a..dcae1773d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java @@ -24,6 +24,7 @@ import com.jero.common.util.SpringContextUtils; import com.jero.common.util.oConvertUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.data.redis.serializer.SerializationException; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -128,7 +129,12 @@ public class ShiroRealm extends AuthorizingRealm { // 查询用户信息 log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token); - LoginUser loginUser = commonAPI.getUserByName(username); + LoginUser loginUser = null; + try { + loginUser = commonAPI.getUserByName(username); + }catch (SerializationException e){ + throw e; + } if (loginUser == null) { LoginException.loginException(401,"用户不存在!"); return null; 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 208c6412b..88ebd0a3f 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 @@ -488,13 +488,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getHeader(String flag, String cut, String searchFlag) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { + String titleEn = ""; //过滤列表字段(is_show_list-->列表是否显示0否 1是) if ("search".equals(searchFlag)) { fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowSearch()))).collect(Collectors.toList()); } else { - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fieldList) { + if(CutEnum.EN.getValue().equals(cut) && "title_en".equals(onlCgformField.getDbFieldName())){ + titleEn = onlCgformField.getDbFieldEnName(); + break; + } + } + for (OnlCgformField onlCgformField : fieldList) { + if(CutEnum.EN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){ + onlCgformField.setDbFieldEnName(titleEn); + break; + } + } + fieldList = fieldList.stream() + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList())) + && !"title_en".equals(e.getDbFieldName())) + .collect(Collectors.toList()); } } + //过滤掉英文标题字段 + List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -3015,6 +3033,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl idList = new ArrayList<>(); List fileIdLidt = new ArrayList<>(); for (Map record : records) { + //处理标题 + if(CutEnum.EN.getValue().equals(cut)){ + record.put("title",record.get("title_en")); + } Map record1 = (Map) record; idList.add((String) record1.get("id")); for (Map.Entry entry : record1.entrySet()) { @@ -3119,15 +3141,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl - List queryConditionVOList = (List) parameter.get("queryConditionVOList"); - if(ObjectUtils.isNotEmpty(queryConditionVOList)){ - String queryCondition = sqlJoint(queryConditionVOList); - if(StringUtils.isNotBlank(queryCondition)){ - conditionSb.append(queryCondition); + if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ + String queryConditionVOListStr = (String) parameter.get("queryConditionVOList"); + List queryConditionVOList = JSONObject.parseArray(queryConditionVOListStr, QueryConditionVO.class); + if(ObjectUtils.isNotEmpty(queryConditionVOList)){ + String queryCondition = sqlJoint(queryConditionVOList); + if(StringUtils.isNotBlank(queryCondition)){ + conditionSb.append(" and " + queryCondition); + } } } - //处理列表表头排序 if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) { conditionSb.append(" order by " + (String) parameter.get("orderByField")); @@ -5067,6 +5091,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListNew = new ArrayList<>(); fieldListNew.add("id"); @@ -5123,6 +5148,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl特殊处理) if(val.contains(",")){ StringBuilder sbTemp = new StringBuilder(); @@ -5140,10 +5173,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1){ sb.append(type + " "); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 7a9a244a0..291cceac3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -5,7 +5,6 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.jero.modules.system.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -195,7 +194,7 @@ public class ProjectRelatedPersonnelController extends JeroController queryCertificationEngineer(@RequestParam(name="projectId",required=true) String projectId){ - List certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); + List certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); return Result.OK(certificationEngineerList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 02839a265..e4940671a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 7455c6f05..273981bd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -2,7 +2,6 @@ package com.jero.modules.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.system.entity.SysUser; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.springframework.web.multipart.MultipartFile; @@ -87,5 +86,5 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); + List queryCertificationEngineer(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 7c3ce10d4..9d1c62ef2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.common.util.RedisUtil; import com.jero.common.util.TokenUtils; import com.jero.modules.dummy.service.impl.DummyInventoryInfoEOServiceImpl; import com.jero.modules.enums.DictCodeEnum; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; @@ -83,6 +84,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl0 && StringUtils.isNotBlank(row.getCell(k).getStringCellValue())) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("填写说明列数不对,请严格按照模板文件导入数据"); + } else { + throw new JeroBootException("The number of columns of filling explanation is wrong. Please import data strictly according to the template file."); + } } } - } if (i > 1) {//读取数据 //获取每一行数据 @@ -762,7 +767,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl可以 + }else if(StringUtils.isBlank(lawEngineerName) || StringUtils.isBlank(engineeringInterfacePersonName) || StringUtils.isBlank(certificationEngineerName)) { + //除了责任领域,其他的可以全为空->可以 projectRelatedPersonnel.setLawEngineerName(""); projectRelatedPersonnel.setEngineeringInterfacePersonName(""); projectRelatedPersonnel.setCertificationEngineerName(""); - }else {//除了责任领域,备注,有一个为空都报错 + }/*else {//除了责任领域,备注,有一个为空都报错 if(CutEnum.CN.getValue().equals(cut)){ throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行"); }else{ throw new JeroBootException("Please fill in the required fields marked with * .Please check line" + (i+1)); } - } + }*/ String remark = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); if(StringUtils.isNotEmpty(row.getCell(4).toString())) { @@ -803,7 +808,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryCertificationEngineer(String projectId) { + public List queryCertificationEngineer(String projectId) { QueryWrapper queryWrapper = new QueryWrapper<>(); List list = list(queryWrapper.eq("project_id",projectId)); - List certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList()); - StringBuilder userIdBuilder=new StringBuilder(); - List certificationEngineerUsers = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(certificationEngineerList)){ - for(String certificationEngineerId :certificationEngineerList){ - if(StringUtils.isNotBlank(certificationEngineerId)) { - userIdBuilder.append(certificationEngineerId).append(","); - } + //查询基础表认证工程师的值 + QueryWrapper baseQueryWrapper = new QueryWrapper<>(); + List baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId)); + String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); + + if(StringUtils.isNotBlank(baseCertificationEngineer)) { + for (ProjectRelatedPersonnel projectRelatedPersonnel : list) { + projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer); } - String userId = userIdBuilder.substring(0, userIdBuilder.toString().length() - 1); - List userIdList = Arrays.asList(userId.split(",")); - userIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", userIdList); - certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); } - return certificationEngineerUsers; + disposeData(list); + List certificationEngineerList = new ArrayList<>(); + + for(ProjectRelatedPersonnel personnel : list){ + ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel(); + relatedPersonnel.setCertificationEngineer(personnel.getCertificationEngineer()); + relatedPersonnel.setCertificationEngineerName(personnel.getCertificationEngineerName()); + certificationEngineerList.add(relatedPersonnel); + } + certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList()); + return certificationEngineerList; } diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 14054444d..259e77428 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -10,7 +10,7 @@ - + {{ item.text || item.label }} @@ -118,7 +118,7 @@ } - + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index e35c7bc11..d33dc24ac 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -1398,6 +1398,6 @@ .box-input .ant-select-selection__rendered { line-height: 32px; height: 32px; - overflow-y: auto; + /*overflow-y: auto;*/ } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 21a28ed58..9bdb376a6 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -3,41 +3,56 @@
- - + +
- - - - + +
+
+ {{$t('standard')}} +
+ +
- - - - + +
+
+ {{$t('title')}} +
+ +
- - - - - - - - {{$t('query')}} - {{$t('reset')}} - + +
+
+ {{$t('status')}} +
+ +
+ + + {{$t('query')}} + {{$t('reset')}} + + - +
- + {{ $t('SubscriptionManagement') }}
- + {{ $t('BatchCancellation') }}
@@ -53,13 +68,13 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" > - {{record.serialNumber}} + {{record.serialNumber}} - {{record.title}} + {{record.title}} - {{$t('CancelSubscribe')}} + {{$t('CancelSubscribe')}}
@@ -82,196 +97,199 @@ \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 0c35ad402..43db7c4dd 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -39,16 +39,16 @@ :wrapper-col="wrapperCol" > - + - + - + @@ -58,7 +58,7 @@ - + @@ -99,11 +99,11 @@ rules:{ name:[ { required: true, message: this.$t('enterName'), trigger: 'blur' }, - { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], itemText:[ { required: true, message: this.$t('enterName'), trigger: 'blur' }, - { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], // itemValue:[ // { required: true, message: this.$t('enterDataValue'), trigger: 'blur' }, @@ -111,7 +111,7 @@ // ], enName:[ { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' }, - { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], description:[ // { required: true, message: this.$t('PleaseEnterDescription'), trigger: 'blur' }, diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue index 7b2a1b614..c80c9e953 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue @@ -36,13 +36,13 @@ - + - + diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 77bc79f24..a33437abd 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -1,93 +1,101 @@ @@ -97,137 +105,136 @@ // import tabTable from './tabTable' import DicList from '../dialog/DicList' import Vue from 'vue' - import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types" + import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types' + export default { name: 'tagContent', - components:{ + components: { // tabTable, DicList }, - data(){ - return{ + data() { + return { title: this.$t('add'), - total:0, - queryParams:{ - pageNo:1, - pageSize:10 + total: 0, + queryParams: { + pageNo: 1, + pageSize: 10 }, - ids:[], - loading:false, + ids: [], + loading: false, selectedRowKeys: [], - contentVisible:false, - tableData:[], + contentVisible: false, + tableData: [], columns: [ { title: this.$t('LabelName'), dataIndex: 'dictName', key: 'dictName', - align: "center", + align: 'center', ellipsis: true, - width: 100, + width: 100 }, { title: this.$t('LabelType'), - align: "center", + align: 'center', width: 100, - dataIndex: 'attributeTypeName', + dataIndex: 'attributeTypeName' }, { title: this.$t('describe'), - align: "center", + align: 'center', dataIndex: 'description', ellipsis: true, - width:300 + width: 300 }, { title: this.$t('operation'), dataIndex: 'action', - scopedSlots: {customRender: 'action'}, - align: "center", + scopedSlots: { customRender: 'action' }, + align: 'center', width: 170 } ], - labelCol: { span:6 }, + labelCol: { span: 6 }, wrapperCol: { span: 16 }, - form:{}, - rules:{ - dictName:[{ required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' }, - { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },], - attributeType:[ - { required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' }, + form: {}, + rules: { + dictName: [{ required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' }, + { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }], + attributeType: [ + { required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' } ], - description:[ - { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, + description: [ + { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' } ] }, // typeVisible:{}, - dicVisible:false, - dictVal:'list', + dicVisible: false, + dictVal: 'list', record: {}, - isEdit:1, - flag:false, //表单提交标识 + isEdit: 1, + flag: false //表单提交标识 } }, - computed:{ - - }, + computed: {}, mounted() { - this.loadData(); + this.loadData() }, - methods:{ + methods: { //获取列表数据 - loadData(param){ - this.loading=true - let params={ + loadData(param) { + this.loading = true + let params = { ...this.queryParams, - isTagDict:1, + isTagDict: 1 } // sys/dict/tagDictPage // sys/dict/page - postAction(`sys/dict/tagDictPage`,params).then(res=>{ - if(res.success){ - this.total=res.result.total - this.tableData=[...res.result.records] + postAction(`sys/dict/tagDictPage`, params).then(res => { + if (res.success) { + this.total = res.result.total + this.tableData = [...res.result.records] } - }).finally(()=>{ - this.loading=false + }).finally(() => { + this.loading = false }) }, //查询 - searchQuery(){ - this.queryParams.pageNo=1 + searchQuery() { + this.queryParams.pageNo = 1 this.loadData() }, - searchReset(){ - this.queryParams={ - pageNo:1, + searchReset() { + this.queryParams = { + pageNo: 1, pageSize: 10 } this.loadData() }, - handleAdd(){ - this.title=this.$t('add') - this.isEdit=1 - this.contentVisible=true - this.form={} + handleAdd() { + this.title = this.$t('add') + this.isEdit = 1 + this.contentVisible = true + this.form = {} }, - hideModal(){ - let params={ - ...this.form, + hideModal() { + let params = { + ...this.form } - this.$refs.ruleForm.validate((valid)=>{ + this.$refs.ruleForm.validate((valid) => { // console.log('valide',valide) - if(valid){ + if (valid) { - if(!this.flag){ - this.flag=true - if(this.isEdit==1){ + if (!this.flag) { + this.flag = true + if (this.isEdit == 1) { - params.id='' - params.isTagDict=1 - params.isReadOnly=0 - postAction(`sys/dict/add`,params).then(res=> { + params.id = '' + params.isTagDict = 1 + params.isReadOnly = 0 + postAction(`sys/dict/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.contentVisible = false @@ -244,26 +251,26 @@ } } - }).finally(()=>{ - this.flag=false - }) - }else if(this.isEdit==0){ - this.$delete(params,'isReadOnly') - this.$delete(params,'isTagDict') - // console.log('editparams',params) - putAction(`sys/dict/edit`,params).then(res=>{ - if(res.success){ - this.$message.success( this.$t('OperationSuccessful')) - this.reFresh() - this.loadData() - this.contentVisible=false - this.form={} - }else{ - this.$message.warning(this.$t('operationFailed')) - } - }).finally(()=>{ - this.flag=false - }) + }).finally(() => { + this.flag = false + }) + } else if (this.isEdit == 0) { + this.$delete(params, 'isReadOnly') + this.$delete(params, 'isTagDict') + // console.log('editparams',params) + putAction(`sys/dict/edit`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.reFresh() + this.loadData() + this.contentVisible = false + this.form = {} + } else { + this.$message.warning(this.$t('operationFailed')) + } + }).finally(() => { + this.flag = false + }) } } } @@ -271,7 +278,7 @@ }, //刷新缓存 - reFresh(){ + reFresh() { getAction('sys/dict/refleshCache').then((res) => { if (res.success) { //重新加载缓存 @@ -286,17 +293,17 @@ console.log('刷新失败', e) }) }, - cancelModel(){ - this.contentVisible=false - this.form={} + cancelModel() { + this.contentVisible = false + this.form = {} }, - onCellChange(){ + onCellChange() { }, //删除 - onDelete(val){ - let param={ - id:val.id + onDelete(val) { + let param = { + id: val.id } this.$confirm({ title: this.$t('ConfirmDelete'), @@ -307,12 +314,12 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.reFresh() - if(this.tableData&&this.tableData.length==1&&this.queryParams.pageNo!=1){ - this.queryParams.pageNo=this.queryParams.pageNo-1 + if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) { + this.queryParams.pageNo = this.queryParams.pageNo - 1 } this.loadData() - }else{ - this.$message.warning(this.$t('operationFailed')); + } else { + this.$message.warning(this.$t('operationFailed')) } }) } @@ -320,16 +327,16 @@ }, onSelectChange(selectedRowKeys) { // console.log('selectedRowKeys changed: ', selectedRowKeys); - this.selectedRowKeys = selectedRowKeys; - this.ids = this.selectedRowKeys; - console.log('selRows',selectedRowKeys) + this.selectedRowKeys = selectedRowKeys + this.ids = this.selectedRowKeys + console.log('selRows', selectedRowKeys) }, //批量删除 - batDelete(){ - let params={ - ids:this.ids.join(',') + batDelete() { + let params = { + ids: this.ids.join(',') } - if(this.ids&&this.ids.length>0){ + if (this.ids && this.ids.length > 0) { this.$confirm({ title: this.$t('ConfirmDelete'), content: '', @@ -339,46 +346,45 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.reFresh() - this.selectedRowKeys=[] - if(this.ids.length==this.tableData.length&&this.queryParams.pageNo!=1){ - this.queryParams.pageNo=this.queryParams.pageNo-1 + this.selectedRowKeys = [] + if (this.ids.length == this.tableData.length && this.queryParams.pageNo != 1) { + this.queryParams.pageNo = this.queryParams.pageNo - 1 } this.loadData() - // postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal - // `,{}).then(res=>{ - // }) - }else{ + // postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal + // `,{}).then(res=>{ + // }) + } else { this.$message.warning(this.$t('operationFailed')) } }) } }) - } - else{ + } else { this.$message.warning(this.$t('selectLeastOne')) } }, //编辑 - actionEdit(val){ - this.title=this.$t('edit') - this.isEdit=0 - this.form={...val} - this.contentVisible=true + actionEdit(val) { + this.title = this.$t('edit') + this.isEdit = 0 + this.form = { ...val } + this.contentVisible = true }, //字典配置 - handleDicPop(record){ - this.record=record - if(record.attributeType=='1'){ + handleDicPop(record) { + this.record = record + if (record.attributeType == '1') { // console.log('attribu',record.attributeType,record.attributeType=='1') // this.typeVisible[record.id]=false - this.dictVal='list' - this.dicVisible=true + this.dictVal = 'list' + this.dicVisible = true - }else if(record.attributeType=='2'){ + } else if (record.attributeType == '2') { // this.typeVisible[record.id]=false - this.dictVal='tree' - this.dicVisible=true + this.dictVal = 'tree' + this.dicVisible = true } }, afterDicVisibleChange(val) { @@ -387,69 +393,107 @@ }, //字典列表关闭 onDicClose() { - this.dicVisible = false; + this.dicVisible = false }, //点击页数 - onChangePage(page,pageSize){ - console.log('page',page) + onChangePage(page, pageSize) { + console.log('page', page) this.queryParams.pageNo = page this.loadData() }, //一页显示条数 - SizeChange(page,pageSize){ + SizeChange(page, pageSize) { this.queryParams.pageSize = pageSize - this.queryParams.pageNo=1 + this.queryParams.pageNo = 1 this.loadData() - }, + } } } - + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index fcd00fd36..de4062fdb 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -1,256 +1,279 @@ @@ -264,7 +286,7 @@ position: absolute; bottom: 0; width: 100%; - z-index:100; + z-index: 100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 8a14878c9..b01d9b6c0 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -42,6 +42,7 @@ {{$t('listSubclauses')}}
+
@@ -80,6 +81,7 @@ +
@@ -260,7 +262,8 @@ } ], url: { - addModelList: '/project/projectLawsInventoryEO/queryPageInfoBussDocument', + addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy', + queryConditionInventory:'/dummy/dummyInventoryInfoEO/queryConditionInventory', list: '/dummy/dummyInventoryInfoEO/list', addModel: '/dummy/dummyInventoryInfoEO/add', editModel: '/dummy/dummyInventoryInfoEO/edit', diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 66d090504..f731a5ab4 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -1,6 +1,7 @@