diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index f5eb6678b..5b62f98bc 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -249,7 +249,7 @@
-
+
@@ -291,7 +291,7 @@
show-quick-jumper
show-size-changer
:page-size.sync="pageSizehistory"
- :total="total"
+ :total="historytotal"
:current="pageNohistory"
@change="onChangehistory"
@showSizeChange="SizeChangehistory"
@@ -378,6 +378,7 @@ export default {
checkedList: [],
serialNumber: '',
total: 0,
+ historytotal: 0,
pageSize: 10,
pageNo: 1,
pageNohistory: 1,
@@ -397,7 +398,7 @@ export default {
columnshistory: [
{
title: this.$t('OperationDetails'),
- dataIndex: 'logContent',
+ dataIndex: 'content',
align: 'left',
width: 320,
ellipsis: true,
@@ -1098,22 +1099,21 @@ export default {
let query = {
pageNo: this.pageNohistory,
pageSize: this.pageSizehistory,
- paramsManifestId: this.$route.query.id,
- paramsCollectManifestId: this.paramsReportDetailId
+ applyId: this.paramsReportDetailId
}
- this.loading = true
- getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
+ // this.loading = true
+ getAction('/ota/otaManageHistory/page', query).then((res) => {
if (res.success) {
this.dataSourcehistory = res.result.records
if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
this.dataSourcehistory.forEach(val => {
- val.logContent = val.logContent.replace(/\"/g, '"')
+ val.content = val.content.replace(/\"/g, '"')
})
}
- this.total = res.result.total
- this.loading = false
+ this.historytotal = res.result.total
+ // this.loading = false
} else {
- this.loading = false
+ // this.loading = false
}
})
},
@@ -1200,6 +1200,15 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
}
},
+ msgForm(data){
+ if(data && data.length !== 0){
+ this.NotSelectedRowKeysValue = data
+ this.visibleoperationFailed = true
+ }else{
+ this.selectedRowKeys = []
+ this.getList()
+ }
+ },
// 备注编辑
getremark(item){
this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item)))
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
index d7e8fc903..8eb00e75b 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
@@ -106,7 +106,8 @@ export default {
this.visible = false
this.confirmLoading = false
this.ids = []
- this.$emit('getList')
+ this.$emit('msgForm',res.result.msgList)
+ // this.$emit('getList')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false