diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index ab39e0243..7723c44be 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -10,6 +10,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; +import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.vo.ParamsInfoVO; @@ -136,7 +137,8 @@ public class ParamsInfoEOController extends JeroController add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) { + if (StringUtils.isEmpty(paramsInfoEO.getCertCategory()) + && !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) { return Result.error("认证类别不能为空！"); } boolean isSuccess = paramsInfoEOService.add(paramsInfoEO); @@ -158,7 +160,8 @@ public class ParamsInfoEOController extends JeroController edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) { + if (StringUtils.isEmpty(paramsInfoEO.getCertCategory()) + && !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) { return Result.error("认证类别不能为空！"); } boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index fded8057a..176b3acdd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1171,7 +1171,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl stringMessage = new ArrayList<>(); List nioNumberImport = new ArrayList<>(); // 记录导入的nio编号 - int i = 1; //记录行号 + int i = 2; //记录行号 //循环验证数据 for (ParamsInfoCnImport dto : paramsInfoEOList) { //判断此行数据是否全部为空,是则不读取 @@ -1278,13 +1278,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号 - int j = 1; + int j = 2; for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(ccDto)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java index ef2defe57..c90019735 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java @@ -97,7 +97,7 @@ public class CountryCardTempEOController extends JeroController edit(@Validated @RequestBody CountryCardTempEO countryCardTempEO) { countryCardTempEOService.editById(countryCardTempEO); return Result.OK("编辑成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java index ce1d9a4e4..08c335414 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java @@ -167,4 +167,14 @@ public class CountryCardTempItemEOController extends JeroController deleteByCountryCardTempId(@RequestParam(name="countryCardTempId",required=true) String countryCardTempId) { + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(CountryCardTempItemEO::getCountryCardTempId,countryCardTempId); + this.countryCardTempItemEOService.remove(deleteWrapper); + return Result.OK("删除成功!"); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java index 6881d81b4..2fafd7125 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java @@ -69,8 +69,14 @@ public interface ICountryCardTempEOService extends IService { void disposeData(List datas, String cut); /** - * 设置排序号 + * 设置编辑时排序号 * @param countryCardTempEO */ - void setOrderNum(CountryCardTempEO countryCardTempEO); + void setEditOrderNum(CountryCardTempEO countryCardTempEO); + + /** + * 设置新增时的排序号 + * @param countryCardTempEO + */ + void setAddOrderNum(CountryCardTempEO countryCardTempEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index e19bd2024..730e25e30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -44,15 +44,15 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("order_num"); List countryCardTempEOList = this.list(queryWrapper); - Integer orderNumData = countryCardTempEOList.stream().filter(e -> e.getId().equals(countryCardTempEO.getId())) - .map(e -> e.getOrderNum()).collect(Collectors.toList()).get(0); + if(CollectionUtils.isNotEmpty(countryCardTempEOList)){ + Integer orderNumData = countryCardTempEOList.stream().filter(e -> e.getId().equals(countryCardTempEO.getId())) + .map(e -> e.getOrderNum()).collect(Collectors.toList()).get(0); + queryWrapper.eq("order_num", inputOrderNum); + Integer orderNumCount = this.baseMapper.selectCount(queryWrapper); + //有重复展示顺序的,后面的号全+1 + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) { + + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("order_num", inputOrderNum) + .orderByAsc("order_num"); + List geOrderNumList = this.list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if(i+1 >= geOrderNumList.size()){ + break; + }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getOrderNum(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setOrderNum(e.getOrderNum() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } + } + + @Override + public void setAddOrderNum(CountryCardTempEO countryCardTempEO) { + Integer inputOrderNum = countryCardTempEO.getOrderNum(); + if(inputOrderNum != null) { + //查询展示顺序相同的 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("order_num"); queryWrapper.eq("order_num", inputOrderNum); Integer orderNumCount = this.baseMapper.selectCount(queryWrapper); //有重复展示顺序的,后面的号全+1 - if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) { - + if (orderNumCount > 0) { //设置排序 QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); orderNumQueryWrapper.ge("order_num", inputOrderNum) .orderByAsc("order_num"); - List geOrderNumList = this.list(orderNumQueryWrapper); + List geOrderNumList = list(orderNumQueryWrapper); //判断相邻的序号,去掉不邻的 for (int i = 0; i < geOrderNumList.size(); i++) { if (geOrderNumList.size() == 1) { break; - } else if(i+1 >= geOrderNumList.size()){ + }else if(i+1 >= geOrderNumList.size()){ break; - }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { + } else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { int deleteStart = geOrderNumList.get(i + 1).getOrderNum(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList()); break; diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b49b90765..3d055af07 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -603,9 +603,9 @@ module.exports = { verificationAndConformityconfirmation: 'Validation Compliance Check', StandardImplementationDate: 'New Type Execution Date', regulatoryEngineer: 'Regulation Engineer', - certifiedEngineer: 'Homologation Engineer', + certifiedEngineer: 'Homo Engineer', regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer Or Homologation Engineer', - engineeringInterfacePerson: 'Engineering Interface', + engineeringInterfacePerson: 'Eng. Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', entryName: 'Project Name', @@ -671,7 +671,7 @@ module.exports = { standardName: 'Standard Name', initiateListConfirmation: 'Initiate List Confirmation', initiateTaskConfirmation: 'Initiate Task Confirmation', - alteration: 'Change', + alteration: 'Modify', fixedPlate: 'Fix the version ', taskAffirmStatus: 'Task Confirmation Status', taskAffirm: 'Task Confirmation', @@ -725,7 +725,7 @@ module.exports = { timeOperation: 'You have permission to operate this button.', NiOnumberis: 'NiO number is', NoOperationPermissionForthisbutton: 'No Operation permission for this button', - Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', + Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ', Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', Datastatusis: 'Datastatusis', Dropdownradio: 'Drop Down Radio', @@ -734,7 +734,7 @@ module.exports = { positiveInteger: 'Positive Integer', // 参数收集开始 MaintainConfigureInfo: 'Maintain Configuration Information', - ParameteItemCollectionList: 'Parameter item collection list', + ParameteItemCollectionList: 'Parameter Collection List', ParameterViewPage: 'Parameter View Page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', @@ -766,27 +766,27 @@ module.exports = { operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', referenceparameter: 'Reference Parameter', - tempSave: 'Temp Save', - Assignedby: 'Assignedby', - CompulsoryWithdrawal: 'CompulsoryWithdrawal', - SynchronousReportLibrary: 'Synchronous Report Library', + tempSave: 'Save', + Assignedby: 'Assign', + CompulsoryWithdrawal: 'Revoke', + SynchronousReportLibrary: 'Sync to the Library', FreezeConfiguration: 'Freeze Configuration', - distributionAndCollection: 'Distribution And Collection', + distributionAndCollection: 'Distribute & Collect', OneclickCollection: 'One-click Collection', deleteConfiguration: 'Delete Configuration', addConfiguration: 'Add Configuration', - electricMachinery: 'ElectricMachinery', + electricMachinery: 'E-motor', Battery: 'Battery', Model: 'Model', configurationName: 'Configuration Name', historicalVersion: 'Historical Version', - configure: 'Configure', + configure: 'Configuration', parameter: 'Parameter', changeExtension: 'Change Extension', addDetailList: 'Add', detailedList: 'DetailedList', copyParamDetailList: 'Copy Parameter List', - collectionCompletionTime: 'Collection Completion Time', + collectionCompletionTime: 'Collection Completed', parameterTemplateName: 'Parameter Template Name', onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces', templateName: 'Template Name', @@ -794,9 +794,9 @@ module.exports = { templateCopy: 'Template Copy', NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', attachmentTemplate: 'Attachment Template', - controlAlternatives: 'Control Alternatives', - controlVerification: 'Control Verification', - controlType: 'Control Type', + controlAlternatives: 'Control Component', + controlVerification: 'Validate Component', + controlType: 'Control Component', certificationCategory: 'Certification Category', parameterBatch: 'Parameter Batch', releaseVersion: 'Release Version', @@ -819,7 +819,7 @@ module.exports = { OperationNode: 'Operation Node', taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', selectInquiry: 'Select Inquiry', - sendBack: 'Send Back', + sendBack: 'Reject', taskConfirmationProcess: 'Task confirmation process', notFinished: 'Assigned', Finished: 'Complete', @@ -843,7 +843,7 @@ module.exports = { technicalEvaluationResults: 'Technical Evaluation Results', engineeringConfirmation: 'Engineering Deliverables', feedbackFromTheEngineer: 'Engineer Comment', - completedBy: 'SdtPeople', + completedBy: 'Filled by', completedTime: 'Completed Time', replyFromProjectContactPerson: 'Assignee Reply', answer: 'Answer', @@ -957,14 +957,14 @@ module.exports = { reportNotUploaded: 'Report not uploaded', position: 'Position', // 认证权限状态 - CollectionInitiated: 'Wait Collect', - handledInterface: 'Wait Sdt', - ReturnedPerson: 'Sdt Back', - completed: 'Wait Fill', - Filledreturn: 'Dre Back', - Submitted: 'Submit', - ReturnedEngineer: 'Cert Back', - SynchronizedLibrary: 'Sync Report', + CollectionInitiated: 'To be collected', + handledInterface: 'To be processed by eng. interface', + ReturnedPerson: 'Rejected by eng. interface', + completed: 'To be filled', + Filledreturn: 'Rejected by the applicant', + Submitted: 'Submitted', + ReturnedEngineer: 'Rejected by homo engineer', + SynchronizedLibrary: 'Synced to library', Statusis: 'Statusis', toHavePermission: 'To Have Permission', and: 'And', @@ -1050,12 +1050,12 @@ module.exports = { NNiONumber: 'NIO Number', ParameterNo: 'Number', NRequired: 'Is Must', - NParameterName: 'Params Name', + NParameterName: 'Para Name', NtechnicalField: 'Tech field', NparameterBatch: 'Params Batch', - NareaOfResponsibility: 'Duty Territory', + NareaOfResponsibility: 'Responsible Field', NParameterDescription: 'Description', - NcertificationCategory: 'Cert Category', + NcertificationCategory: 'Cert', NcontrolType: 'Control Type', NcontrolVerification: 'Control Verify', NcontrolAlternatives: 'Control Values', @@ -1092,7 +1092,7 @@ module.exports = { pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected', TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be empty', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', - bringInTheProjectInterface: 'Bring in the project interface', + bringInTheProjectInterface: 'Assign to Owner', theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved', defaultTemplate: 'Default Template', newRequestCommentListTemplate: 'New request for comment list template', @@ -1246,4 +1246,10 @@ module.exports = { updated:'Updated', OpenOne:'Open', Privacy:'Privacy', + Paraname: 'Para Name', + Parabatch: 'Para Batch', + freeze:'Please select the configuration you want to freeze', + optionDropDownBox:'Option drop - down box', + attachmentUpload:'file', + textInput:'Text Input', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 427f67d80..ca601c3ca 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1349,4 +1349,10 @@ module.exports = { punctuationmark:'只能输入除#号和逗号外的英文标点符号', created: '创建时间', updated:'更新时间', + optionDropDownBox:'下拉选择', + attachmentUpload:'附件上传', + textInput:'文本输入', + Paraname: '参数名称', + Parabatch: '参数批次', + freeze:'请选择冻结配置', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 9fbf99930..15a8814fc 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -91,7 +91,7 @@ }, { title: this.$t('personCharge'), - dataIndex: 'chargePersonName', + dataIndex: 'chargePersonIdName', align: 'center', width: 240, ellipsis: true diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 837eb9a93..e4ec51484 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -71,7 +71,7 @@ {{$t('view')}} - {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}} + {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} @@ -120,8 +120,8 @@ pageSize: 10, pageNo: 1, url: { - list: '', - deleteBatch: '' + list: '/problemKnowledgeBase/countryCardManageReleaseEO/page', + deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch' }, selectedRowKeys: [], columns: [ @@ -149,6 +149,7 @@ }, mounted() { document.title = 'Country Card-' + this.$t('managePublishing') + this.getList() }, methods: { searchQuery() { @@ -226,8 +227,31 @@ edit() { this.$refs.countryCardReleaseAddRef.edit() }, - subscribe() { - + subscribe(record) { + let _this = this + this.$confirm({ + content: record.releaseStatus == 'Draft' ? _this.$t('confirmRelease') : _this.$t('confirmWithdraw'), + onOk() { + let releaseCondition = '' + if (record.releaseStatus == 'Draft') { + releaseCondition = 'Have released' + } else { + releaseCondition = 'Draft' + } + let query = { + releaseStatus: releaseCondition, + ids: record.id + } + postAction('/problemKnowledgeBase/countryCardManageReleaseEO/batchUpdateReleaseStatus', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) }, viewClick() { let newUrl = this.$router.resolve({ diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 122175961..164da146a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -9,6 +9,31 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> + + + +
+
+ * + {{$t('applicableMarket')}} +
+ + + + + {{ item.title}} + + + + +
+ + +
-
- -
@@ -80,15 +93,23 @@ deleteOne: '' }, title: '', + formInline: {}, + rules: { + applyMarket: [ + { + required: true, + message: this.$t('LabelType') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, visible: false, selectedRowKeys: [], dataList: [{}], loading: false, - pageNo: 1, - pageSize: 10, - total: 0, confirmLoading: false, index: '', + applyMarketList: [], columns: [ { title: this.$t('LabelName'), @@ -118,10 +139,21 @@ add() { this.visible = true this.title = this.$t('newlyAdded') + this.getApplyMarketList() }, edit() { this.visible = true this.title = this.$t('edit') + this.getApplyMarketList() + }, + getApplyMarketList() { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => { + if (res.success) { + this.applyMarketList = res.result || [] + } else { + this.applyMarketList = [] + } + }) }, clickButtonToUpload(item, index) { this.$refs.uploadFile.perentHandleFunc() @@ -152,31 +184,20 @@ this.visible = false }, handleSubmit() { + this.$refs.ruleForm.validate(valid => { + if (valid) { - }, - onChange(page, pageSize) { - this.pageNo = page - this.replacePage() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.replacePage() + } + }) }, replacePage() { - let query = { - pageNo: this.pageNo, - pageSize: this.pageSize - } this.loading = true - postAction(this.url.list, query).then((res) => { + postAction(this.url.list, {}).then((res) => { if (res.success) { - this.dataList = res.result.records || [] - this.total = res.result.total + this.dataList = res.result || [] this.loading = false } else { this.dataList = [] - this.total = 0 this.loading = false } }) @@ -204,21 +225,6 @@ border-radius: 0 0 2px 2px; } - .box-title { - width: 100%; - text-align: right; - margin-bottom: 20px; - } - - .operator-text { - cursor: pointer; - margin-right: 13px; - font-size: 14px; - font-weight: 400; - color: #040B29; - display: inline-block; - } - .button-text { height: 38px; width: 100%; @@ -227,4 +233,45 @@ border: 1px #00B3BE solid; color: #00B3BE; } + + .box-title-text { + line-height: 1.4; + display: flex; + } + + .title-text { + width: 84px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 42px; + } + + .box-input { + display: inline-block; + height: 38px; + width: 100%; + } + + .itemModel { + width: calc(100% - 130px); + display: inline-block; + margin-top: 2px; + } + + .title-text-text { + margin-top: 9px; + } + + .Required { + color: red; + margin-right: 4px; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue index 986380fcd..9f4811cac 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -24,7 +24,12 @@ :loading="loading"> {{$t('edit')}} - {{$t('delete')}} + {{$t('delete')}} + + + {{$t('optionDropDownBox')}} + {{$t('attachmentUpload')}} + {{$t('textInput')}}
@@ -51,7 +56,7 @@