@@ -62,8 +62,8 @@
data() {
return {
url: {
- list: '',
- deleteOne: ''
+ list: '/problemKnowledgeBase/countryCardTempItemEO/page',
+ deleteOne: '/problemKnowledgeBase/countryCardTempItemEO/deleteBatch'
},
visible: false,
selectedRowKeys: [],
@@ -72,6 +72,7 @@
pageNo: 1,
pageSize: 10,
total: 0,
+ dataId: '',
columns: [
{
title: this.$t('name'),
@@ -104,8 +105,11 @@
mounted() {
},
methods: {
- getData() {
+ getData(id) {
+ this.dataId = id
+ this.pageNo = 1
this.visible = true
+ this.replacePage()
},
handleCancel() {
this.visible = false
@@ -115,9 +119,10 @@
this.replacePage()
},
addLabelClick() {
- this.$refs.optionMaintenanceAddRef.add()
+ this.$refs.optionMaintenanceAddRef.add(this.dataId)
},
edit(val) {
+ val.dataId = this.dataId
this.$refs.optionMaintenanceAddRef.edit(JSON.parse(JSON.stringify(val)))
},
deleteData(val) {
@@ -125,10 +130,10 @@
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
- deleteAction(_this.url.deleteOne, { id: val.id }).then((res) => {
+ deleteAction(_this.url.deleteOne, { ids: val.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
- _this.getList()
+ _this.replacePage()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
@@ -148,10 +153,11 @@
replacePage() {
let query = {
pageNo: this.pageNo,
- pageSize: this.pageSize
+ pageSize: this.pageSize,
+ countryCardTempId: this.dataId
}
this.loading = true
- postAction(this.url.list, query).then((res) => {
+ getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataList = res.result.records || []
this.total = res.result.total
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
index 8b6f1d610..1459b87f5 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
@@ -88,6 +88,7 @@
confirmLoading: false,
formInline: {},
disabled: false,
+ dataId: '',
rules: {
name: [
{
@@ -128,21 +129,27 @@
}
]
},
- title: ''
+ title: '',
+ url: {
+ add: '/problemKnowledgeBase/countryCardTempItemEO/add',
+ edit: '/problemKnowledgeBase/countryCardTempItemEO/edit'
+ }
}
},
mounted() {
},
methods: {
- add() {
+ add(id) {
this.visible = true
this.title = this.$t('newlyAdded')
this.$nextTick(() => {
this.formInline = {}
this.$refs.ruleForm.clearValidate()
})
+ this.dataId = id
},
edit(data) {
+ this.dataId = data.id
this.visible = true
this.title = this.$t('edit')
this.$nextTick(() => {
@@ -157,7 +164,24 @@
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
-
+ let url = ''
+ if (this.formInline.id) {
+ url = this.url.edit
+ } else {
+ url = this.url.add
+ }
+ this.formInline.countryCardTempId = this.dataId
+ postAction(url, this.formInline).then((res) => {
+ if (res.success) {
+ this.$message.success(this.$t('OperationSuccessful'))
+ this.visible = false
+ this.confirmLoading = false
+ this.$emit('countryCardReleaseModelAddForm')
+ } else {
+ this.confirmLoading = false
+ this.$message.warning(this.$t('operationFailed'))
+ }
+ })
}
})
},
diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
index 06eac92d7..00e59eb5d 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
@@ -142,6 +142,7 @@
},
getData() {
this.visible = true
+ this.commentContent = ''
this.getList()
},
handleSubmit() {
@@ -162,7 +163,7 @@
this.loading = true
getAction(this.url.list, {
id: this.$route.query.id,
- commentContent: this.commentContent
+ str: this.commentContent
}).then((res) => {
if (res.success) {
this.loading = false
diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
index 1c21d9b8a..cc41ad401 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
@@ -169,7 +169,10 @@
checkAll: false,
isDisplay: false,
fullCheckbox: false,
- resultData: {}
+ resultData: {},
+ url: {
+ exportData: '/compare/sarFileCompareItemComment/exportResXls'
+ }
}
},
mounted() {
@@ -190,7 +193,20 @@
this.$refs.commentListRef.getData()
},
exportComparisonReportClick() {
-
+ let checkboxList = JSON.parse(JSON.stringify(this.checkboxList))
+ let fullCheckbox = this.fullCheckbox
+ let query = {
+ selectIds: checkboxList.join(','),
+ includeComments: fullCheckbox,
+ infoId: this.$route.query.id
+ }
+ downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + '.xls', query, this.Deselect)
+ },
+ Deselect() {
+ this.checkboxList = []
+ this.fullCheckbox = false
+ this.indeterminate = false
+ this.checkAll = false
},
getData() {
let query = {
From ea7999c5e2e1e9cbe16173403749f8a3ebea39c8 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Tue, 9 Aug 2022 10:50:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=A1=B9-=E6=A0=87=E9=A2=98=E7=B1=BB=E5=9E=8B=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/ParamsInfoEOServiceImpl.java | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
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)) {