diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index 4ccc7a42f..a4ec13edc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -100,7 +100,7 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO); return Result.OK("编辑成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 2dd8d1757..339832758 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -103,6 +103,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); return pageInfo; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 151bfe9d2..c2c35988f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -30,6 +33,8 @@ import java.util.stream.Collectors; @Service public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportTitleTemplateEOService { + @Autowired + private LawsMonthlyReportWriteEOServiceImpl lawsMonthlyReportWriteEOService; /** * 保存 * @@ -98,7 +103,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + //标题下存在内容或子标题时不能删除 + //1. 判断是否存在子标题 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids); + List list = this.list(wrapper); + if(list.size() != 0){ + throw new JeroBootException("该标题下存在子标题,不能删除"); + } + //2. 判断是否存在内容 memories_chapter + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids); + List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper); + if(lawsMonthlyReportWriteEOS.size() != 0){ + throw new JeroBootException("该标题下存在新增内容,不能删除"); + } + removeByIds(ids); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8a2229740..4401d668d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; @@ -29,11 +30,14 @@ import com.jero.modules.report.service.INewStandardTemplateEOService; import com.jero.modules.report.util.WordUtil; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.ProjectRoleEnum; +import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.shiro.SecurityUtils; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -81,6 +85,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + //管理员查看全部数据,其余人只能查看自己的数据 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); + if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ + queryWrapper.in("create_by",currentUser.getUsername()); + } Page page = new Page(pageNo, pageSize); Page pageInfo = this.page(page, queryWrapper); //法规月报id @@ -522,6 +536,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index c8f892d6d..30a85b887 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -68,6 +68,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -91,6 +92,7 @@ export default { editId: '', visibleoperationFailed:false, newVisible: false, + textLoading:false, NotSelectedRowKeysValue:[], labelCol: { xs: { span: 24 }, @@ -220,6 +222,7 @@ export default { // _this.$message.success(this.$t('OperationSuccessful')) if(res.data.result.length == 0){ this.visibleoperationFailed = false + this.textLoading = false _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeflag', false) this.$emit('GetgetTableList') @@ -227,6 +230,7 @@ export default { }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTimeflag', false) diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 4a2538ec0..57802326e 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -69,6 +69,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -223,10 +224,12 @@ export default { _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeAll', false) this.$emit('GetgetTableList') + this.textLoading = false }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTime', false) diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index b27182372..510dc1a4c 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'], + props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -68,7 +68,7 @@ if (this.isMultiple) { this.multiple = false } - this.accept = this.restrictUploads ? '.docx,.doc' : '*.*' + this.accept = this.restrictUploads ? this.Uploadable : '*.*' // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { @@ -99,10 +99,10 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix == '.docx' || fileSuffix == '.doc') { + if (this.Uploadable.includes(fileSuffix)) { } else { - this.$message.warning(this.$t('onlyFilesUploaded')) + this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file')) return false } } diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 60fa6094d..bdaa64268 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
{{$t('export')}}
@@ -47,11 +47,11 @@ {{$t('filingExternalOpinions')}}:
- + {{$t('clickUpload')}}
- + {{$t('viewFile')}}
@@ -86,7 +86,7 @@ pageNo: 1, dataSource: [], formInline: {}, - userInfoQuery:{}, + userInfoQuery: {}, columns: [ { title: this.$t('relevantSections'), @@ -135,7 +135,7 @@ } }, mounted() { - this.userInfoQuery = this.userInfo() + this.userInfoQuery = this.userInfo() }, methods: { ...mapGetters(['userInfo']), @@ -178,8 +178,8 @@ //导出 handleExport() { let query = { - pageSize:this.pageSize, - pageNo:this.pageNo, + pageSize: this.pageSize, + pageNo: this.pageNo, lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId } @@ -201,7 +201,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -210,8 +210,8 @@ let query = { lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId, - pageSize:this.pageSize, - pageNo:this.pageNo + pageSize: this.pageSize, + pageNo: this.pageNo } this.loading = true getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index c7e910665..8201e8ed5 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -43,6 +43,7 @@
1) { this.selectedRowKeys.shift() } - this.selectedRowKeysRecord = record.filter(res=>{ + this.selectedRowKeysRecord = record.filter(res => { return res.id == this.selectedRowKeys[0] }) this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] @@ -297,14 +310,14 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, - getUUID(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + return str.join('') }, submit() { this.$refs.ruleForm.validate(valid => { @@ -338,7 +351,7 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) - }else{ + } else { this.JLoading = false } }) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index b5c89571c..173a0f4e2 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -92,7 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + + {{text}} + + {{$t('viewProcess')}} {{$t('evaluationResults')}} @@ -129,7 +132,7 @@ //url传参严格按照当前命名 url: { list: '/lawsOpinionGather/lawsOpinionGatherEO/page', - getSysCategoryTree: '/sys/category/getSysCategoryTree', + getSysCategoryTree: '/sys/category/getSysCategoryTree' }, loading: false, toggleSearchStatus: false, @@ -138,17 +141,17 @@ total: 0, pageSize: 10, pageNo: 1, - CategoryTreeList:[], - serialNumber:'', + CategoryTreeList: [], + serialNumber: '', queryParam: {}, - gatherResultList:[ + gatherResultList: [ { - value:'Underway', - name:this.$t('inProgress'), + value: 'Underway', + name: this.$t('Underway') }, { - value:'Completed', - name:this.$t('Finished'), + value: 'Completed', + name: this.$t('Finished') } ], columns: [ @@ -156,12 +159,15 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - width: 170 + ellipsis: true, + width: 170, + scopedSlots: { customRender: 'serialNumber' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170 }, { @@ -233,7 +239,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -248,7 +254,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'', + serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', ...queryParam } this.loading = true @@ -292,8 +298,8 @@ } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index ca1b2926e..04c9f615a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -185,7 +185,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index b10d4c466..a6b3cc5e1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -44,7 +44,7 @@ :columns="columns" > - {{text == 1?$t('chinese'):$t('English')}} + {{text == 1?$t('simplifiedChinese'):$t('English')}} {{text}} @@ -151,7 +151,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 240, scopedSlots: { customRender: 'operation' } } ] @@ -179,7 +179,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -220,9 +220,9 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { - if (item.createBy == this.userInfo().username){ + if (item.createBy == this.userInfo().username) { downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) - }else{ + } else { this.$message.warning(this.$t('theDoesNotSupportPreview')) } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 23ffd3f15..3ccb0896f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -249,11 +249,11 @@ + v-model="formInline.lawsContactName"/> @@ -382,6 +382,12 @@ } else { this.formInline.technologyTerritory = [] } + if (!this.formInline.useMethod) { + this.formInline.useMethod = undefined + } + if (!this.formInline.state) { + this.formInline.state = undefined + } this.formInline = { ...this.formInline } } else { this.formInline = {} @@ -443,6 +449,12 @@ formInline[res] = formInline[res].join(',') } }) + if (!formInline.state || formInline.state == '' || formInline.state == 'null') { + formInline.state = '' + } + if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') { + formInline.useMethod = '' + } callback && callback(formInline) } }) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index a93e3f426..df745bf88 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -97,7 +97,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 280, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index 15940fc5e..51b79e4d2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -51,6 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear + :disabled="isParentId" v-model="formInline.parentId"> { + this.isParentId = false this.formInline = {} this.$refs.ruleForm.clearValidate() }) @@ -139,8 +142,13 @@ this.title = this.$t('edit') this.visible = true this.getParent() + this.isParentId = false this.$nextTick(() => { this.formInline = row + if (!row.parentId) { + this.formInline.parentId = undefined + this.isParentId = true + } this.$refs.ruleForm.clearValidate() }) }, diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue index 9fb30c097..2fdbfc14e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue @@ -38,7 +38,6 @@ @@ -61,7 +60,8 @@ {{$t('submit')}} - + @@ -95,7 +95,7 @@ visible: false, languageList: [ { - text: this.$t('chinese'), + text: this.$t('simplifiedChinese'), value: 1 }, { @@ -275,7 +275,7 @@ .button-text { height: 38px; - width: calc(100% - 100px); + width: 100%; line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 63c70236c..08db600d4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -250,12 +250,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -335,7 +337,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue index e5eb0a45a..5b98162df 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue @@ -101,7 +101,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 3c1a9f42c..f9b4e5c45 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -306,7 +306,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 392dad7b4..934c99acc 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -210,7 +210,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index c13dbc0ca..4298fc61f 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -94,7 +94,7 @@ - + diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 2a35ee4cc..f1882ee91 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -249,7 +249,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 8c7c98df8..b237e6c53 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -5,7 +5,7 @@ {{title}} -
+
@@ -41,18 +41,15 @@
- * - {{$t('questionsSuggestions')}} + {{$t('enclosure')}}
- - + + + {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || + item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} +
@@ -63,26 +60,30 @@
{{$t('reason')}}
- - + +
- {{$t('enclosure')}} + * + {{$t('questionsSuggestions')}}
- - - {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || - item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - + +
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 84a15c57f..44ddc7ec6 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -9,7 +9,8 @@
-
+
{{item.title}} {{ $t('viewFile') }} - {{queryForm[item.value]}} @@ -58,14 +58,14 @@ type: Object, default: {} }, - title:{ - type:String, - default:'', - }, - isConfirmationDeadline:{ - type:Boolean, - default:false, + title: { + type: String, + default: '' }, + isConfirmationDeadline: { + type: Boolean, + default: false + } }, components: { viewFileModel @@ -77,6 +77,7 @@ }, mounted() { this.queryForm = this.standardContentQuery + this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方;公开地方领导反馈给东丽的反馈给管库给的给' }, methods: { urlClick(val) { @@ -147,5 +148,40 @@ cursor: pointer; } } + + .text-content-button-one { + width: 100%; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + float: left; + margin-top: 3px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: pre-wrap; + overflow: visible; + float: left; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + } + } } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 29935870b..503b8409d 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -88,7 +88,8 @@ {}, { title: this.$t('taskDescription'), - value: 'taskExplain' + value: 'taskExplain', + type:4, } // { // title: this.$t('remarks'), diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 81e4ef587..ecb9a4e6c 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -298,7 +298,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList()