diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java index 4e0dd880d..30446c9fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java @@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -192,6 +193,7 @@ public class ProblemKnowledgeBaseCollectEOController extends JeroController collectEOQueryWrapper = new QueryWrapper<>(); collectEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseCollectEO::getCollectUserId,currentUser.getId()); + collectEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseCollectEO::getCollectStatus, CollectStatusEnum.COLLECT.getValue()); List collectEOList = this.problemKnowledgeBaseCollectEOService.list(collectEOQueryWrapper); if(CollectionUtils.isNotEmpty(collectEOList)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 5ad385a16..7211ba4ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -463,6 +463,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map map25 = new HashMap<>(); Map map45 = new HashMap<>(); map25.put("query", selectValue); + map25.put("fields", fieldList.toArray()); map25.put("allow_leading_wildcard", false); //禁用了前置通配符 map45.put("query_string", map25); queryMapJson.add(map45); @@ -490,6 +491,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map map25 = new HashMap<>(); Map map45 = new HashMap<>(); map25.put("query", selectValue); + map25.put("fields", fieldList.toArray()); map25.put("allow_leading_wildcard", false); //禁用了前置通配符 map45.put("query_string", map25); queryMapJson.add(map45); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java index d4fea43f6..179f3e0b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -118,6 +118,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea Map map25 = new HashMap<>(); Map map45 = new HashMap<>(); map25.put("query", selectValue); + map25.put("fields", fieldList.toArray()); map25.put("allow_leading_wildcard", false); map45.put("query_string", map25); queryMapJsonTwo.add(map45); @@ -248,9 +249,9 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea Map map31 = new HashMap<>(); Map map41 = new HashMap<>(); if("title".equals(field)){ - map31.put("boost",1); + map31.put("boost",10); }else if("content".equals(field)){ - map31.put("boost",0.01); + map31.put("boost",2); } map31.put("value", selectValue); map21.put(field + ".keyword", map31); @@ -262,9 +263,9 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea Map map32 = new HashMap<>(); Map map42 = new HashMap<>(); if("title".equals(field)){ - map32.put("boost",1); + map32.put("boost",10); }else if("content".equals(field)){ - map32.put("boost",0.01); + map32.put("boost",2); } map32.put("query", selectValue); map22.put(field, map32); @@ -274,7 +275,15 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea // match分词匹配查询 // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 Map map23 = new HashMap<>(); + Map map33 = new HashMap<>(); Map map43 = new HashMap<>(); + if("title".equals(field)){ + map33.put("boost",10); + }else if("content".equals(field)){ + map33.put("boost",2); + } + map33.put("query", selectValue); + map23.put(field, map33); map23.put(field, selectValue); map43.put("match", map23); queryMapJson.add(map43); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 44b400025..fd8b1d8e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -165,12 +165,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } if (StringUtils.isNotEmpty(p.getNumLevelText()) && p.getNumLevelText().indexOf(".") > 0) { @@ -682,12 +692,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } // if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) { @@ -864,12 +884,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } // if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) { @@ -1056,12 +1086,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } // if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) { @@ -1418,12 +1458,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } // if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) { @@ -1613,12 +1663,22 @@ public class FileSpiltService { paragraphString = paragraphString.trim(); } if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.trim(); if(StringUtils.isEmpty(paragraphString)){ + // 处理当前段落仅为图片的情况 + List imageBundleList = readImageInParagraph((XWPFParagraph) p); + if (CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } continue; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 5f0c328d1..6b37ba8b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1702,8 +1702,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') this.$emit('addFormClick') } else { this.$message.warning(this.$t(res.message)) diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 55dabd96e..ea4f0014d 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -147,6 +147,7 @@ beforeDestroy(){ eventBUs.$off('searchQuery') eventBUs.$off('searchReset') + eventBUs.$off('searchGetData') }, methods: { diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 25849e0dc..5b4fbcdeb 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -141,6 +141,7 @@ beforeDestroy(){ eventBUs.$off('searchQuery') eventBUs.$off('searchReset') + eventBUs.$off('searchGetData') }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 90f7add64..73fae7f9f 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -335,7 +335,7 @@ if (this.formInline.id) { eventBUs.$emit('searchGetData') } else { - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } this.$emit('addFormClick') diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 8234abf2b..ceb4c999a 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -132,6 +132,7 @@ beforeDestroy() { eventBUs.$off('searchQuery') eventBUs.$off('searchReset') + eventBUs.$off('searchGetData') }, methods: { rowClassName(record) { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 50b3336ed..4252096b5 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -228,6 +228,9 @@ id: this.queryForm.praiseEO ? this.queryForm.praiseEO.id : undefined } putAction('/problemKnowledgeBase/problemKnowledgeBasePraiseEO/edit', query).then((res) => { + if (!this.queryForm.collectEO || !this.queryForm.collectEO.id) { + this.queryById() + } }) }, starClick() { @@ -247,6 +250,9 @@ id: this.queryForm.collectEO ? this.queryForm.collectEO.id : undefined } putAction('/problemKnowledgeBase/problemKnowledgeBaseCollectEO/edit', query).then((res) => { + if (!this.queryForm.collectEO || !this.queryForm.collectEO.id) { + this.queryById() + } }) }, clickButtonToUpload(item) { diff --git a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue index b998e89aa..8d9566e23 100644 --- a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue @@ -35,9 +35,9 @@
-
+
- +
@@ -117,7 +117,7 @@ if (value.length > 0) { this.conList.forEach(val => { value.forEach(res => { - if (res === val.id) { + if (res === val.collectEO.id) { val.checked = true } }) @@ -183,7 +183,7 @@ this.$confirm({ content: _this.$t('confirmCancelCollection'), onOk() { - deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { + deleteAction(_this.url.deleteBatch, { ids: val.collectEO.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -216,13 +216,13 @@ } this.loading = true getAction(this.url.getInfoList, query).then((res) => { - if (res.success) { + if (res.success && res.result) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.conList = res.result.records + this.conList = res.result ? res.result.records : [] if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { if (val.content) { @@ -233,7 +233,7 @@ if (this.checkboxList && this.checkboxList.length > 0) { let contentList = [] for (let j = 0; j < this.conList.length; j++) { - contentList.push(this.conList[j].id) + contentList.push(this.conList[j].collectEO.id) } this.checkboxList = this.checkboxList.filter(val => { return !contentList.join(',').includes(val) diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue index 48e2e80e8..f0b0627ab 100644 --- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue @@ -225,7 +225,7 @@ postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') this.visible = false; this.$emit('visible',false) } else { diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index b5637ac12..760ce1dfd 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -302,7 +302,7 @@ // console.log('res,res',res) if (res.data.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { this.$message.warning(res.data.message) } diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index e32f15a33..585526a2e 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -283,7 +283,7 @@ }).then(res => { if (res.data.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') this.visible = false; this.$emit('visible',false) }else{ diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 8e8654af8..38a09b877 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -775,7 +775,7 @@ info_id: this.infoId, } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) // eventBUs.$emit('searchReset') this.$emit('sumber') }else{ diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 2504c6a8f..0c5a95218 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -723,7 +723,7 @@ info_id: this.infoId } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) // eventBUs.$emit('searchReset') } else { this.$message.warning(this.$t('operationFailed')) @@ -771,7 +771,7 @@ } this.loadMenuData() - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) } let attIdList = [] if (data && data.length > 0) { diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index db7c64dfc..e62ec4b42 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -238,7 +238,7 @@ postAction(`split/sarFileSplitInfo/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') this.visible = false; this.$emit('visible', false) } else { diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 7ef96c8bb..0734ca5ae 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -206,7 +206,7 @@ :title="$t('Administrativeprivileges')">{{$t('Administrativeprivileges')}}
- {{$t('Checkthepermissions')}}
- { if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) this.form = {} this.loadMenuData() } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }).finally(() => { this.flag = false diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 2ff41bc7f..48adc3d86 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -10,7 +10,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > @@ -41,31 +41,36 @@ title: this.$t('OperationContent'), dataIndex: 'taskDefinitionKeyName', align: 'center', - width: '20%' + width: '20%', + ellipsis: true }, { title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'center', - width: '20%' + width: '20%', + ellipsis: true }, { title: this.$t('Operator'), dataIndex: 'createBy', align: 'center', - width: '20%' + width: '20%', + ellipsis: true }, { title: this.$t('role'), dataIndex: 'operatorRoleName', align: 'center', - width: '20%' + width: '20%', + ellipsis: true }, { title: this.$t('OperationTime'), dataIndex: 'createTime', align: 'center', width: '20%', + ellipsis: true, customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index cc254ac6e..db3de9707 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -187,7 +187,7 @@ let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) let data = JSON.stringify(json).replace(/\"/g, '\'') Object.keys(data).forEach(res => { - if (data[res] && data[res] instanceof String) { + if (data[res] && typeof data[res] == 'string') { data[res] = data[res].replace(/\"/g, '“') data[res] = data[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue index b249d372e..5c3d172af 100644 --- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue +++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue @@ -13,7 +13,8 @@
- +
@@ -33,7 +34,8 @@ }, data() { return { - processStep: null + processStep: null, + isTrue: false } }, created() { @@ -41,6 +43,11 @@ }, mounted() { this.processNum() + if (this.$route.query.prcType == '6') { + this.isTrue = true + } else { + this.isTrue = false + } }, methods: { back() { diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 38b7f34f6..9d45f7dec 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -804,6 +804,49 @@
+
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -907,7 +950,8 @@ verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], - userInfoQuery: {} + userInfoQuery: {}, + rejectCauseList: [] } }, mounted() { @@ -916,6 +960,18 @@ }, methods: { ...mapGetters(['userInfo']), + getRejectCause(id) { + let query = { + projectLawsInventoryId: id + } + getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { + if (res.success) { + this.rejectCauseList = res.result + } else { + this.rejectCauseList = [] + } + }) + }, getDeliverableTree() { getAction('/sys/category/getDeliverableTree', {}).then((res) => { if (res.success) { @@ -1110,6 +1166,7 @@ item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] + this.getRejectCause(item.id) if (item.dutyTerritory) { this.queryPersonByProject(item) } else { @@ -1400,6 +1457,15 @@ margin-top: 2px; } + .itemModel-reject { + width: calc(100% - 130px); + display: inline-block; + font-size: 16px; + word-break: break-all; + color: #040B29; + padding-top: 11px; + } + .Required { color: red; margin-right: 4px; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8b943d1a5..4a01f7b1e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -220,6 +220,11 @@ @click="edit(record)"> {{ $t('edit') }} + + {{$t('view')}} + @@ -229,10 +234,13 @@ @click="resultReportedClick(record)"> {{$t('resultReported')}} - + + + + {{$t('view')}} - + @@ -745,6 +753,13 @@ fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } + }, + { + title: this.$t('operation'), + align: 'center', + fixed: 'right', + width: 140, + scopedSlots: { customRender: 'operationOne' } } ], columnsFileAll: [ @@ -1014,7 +1029,14 @@ let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) if (!this.isRoleSwitching) { for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation')) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) { + columnResult.splice(i, 1) + i-- + } + } + } else if (this.isRoleSwitching) { + for (var i = 0; i < columnResult.length; i++) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) { columnResult.splice(i, 1) i-- } @@ -2019,15 +2041,18 @@ if (valid) { let url = '/project/projectCommentEO/add' let content = [] + let ids = [] if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { this.rowKeysSuccessList.forEach(res => { content.push(res.serialNumber) + ids.push(res.id) }) } let query = { commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent, projectLibraryId: this.$route.query.id } + this.rejectCauseAdd(this.formInlineComment.commentContent,ids) this.confirmLoadingComment = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.updateStatusBatch(1, selectedRowKeys) @@ -2042,6 +2067,19 @@ } }) }, + rejectCauseAdd(rejectCause,ids) { + let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + rejectUserId:this.userInfo().id, + rejectTime:rejectTime, + rejectCause:rejectCause, + projectLawsInventoryId:ids.join(','), + rejectType:'0', + } + postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { + + }) + }, handleCancelComment() { this.visibleComment = false }, @@ -2368,7 +2406,7 @@ } ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 1642cae03..d95bdb5cc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,46 +433,49 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -486,7 +489,7 @@