|
|
|
@ -122,10 +122,13 @@ |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="100" |
|
|
|
fixed="right" |
|
|
|
width="180" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" @click="showDetailDialog(scope.row)">查看详情</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.processStatus === 'PENDING'" @click="handleRetry(scope.row)">重试</a> |
|
|
|
<!-- <a type="text" size="small" v-if="scope.row.processStatus === 'PENDING'" @click="closeRetry(scope.row)">忽略</a>--> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -153,7 +156,7 @@ |
|
|
|
<!-- 基本信息 - rqrq --> |
|
|
|
<el-row> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="站点："> |
|
|
|
<el-form-item label="工厂编码："> |
|
|
|
<span>{{ currentRow.site }}</span> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
@ -209,44 +212,48 @@ |
|
|
|
<el-form-item label="错误信息："> |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
:rows="4" |
|
|
|
:rows="6" |
|
|
|
resize='none' |
|
|
|
v-model="currentRow.errorMessage" |
|
|
|
readonly> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- 请求数据 - rqrq --> |
|
|
|
<el-form-item label="请求数据："> |
|
|
|
<el-form-item label="请求数据：" style="margin-top: 105px"> |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
:rows="6" |
|
|
|
resize='none' |
|
|
|
v-model="currentRow.requestData" |
|
|
|
readonly> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- 响应数据 - rqrq --> |
|
|
|
<el-form-item label="响应数据："> |
|
|
|
<el-form-item label="响应数据：" style="margin-top: 105px"> |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
:rows="6" |
|
|
|
:rows="4" |
|
|
|
resize='none' |
|
|
|
v-model="currentRow.responseData" |
|
|
|
readonly> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- 处理备注 - rqrq --> |
|
|
|
<el-form-item label="处理备注："> |
|
|
|
<el-form-item label="处理备注：" style="margin-top: 70px"> |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
:rows="3" |
|
|
|
resize='none' |
|
|
|
v-model="processRemark" |
|
|
|
placeholder="请输入处理说明（标记为已处理或已忽略时必填）"> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<div slot="footer" class="dialog-footer" style="margin-top: 35px"> |
|
|
|
<el-button |
|
|
|
type="success" |
|
|
|
@click="markAsProcessed" |
|
|
|
@ -275,7 +282,7 @@ import { |
|
|
|
markErrorAsProcessed, |
|
|
|
markErrorAsIgnored, |
|
|
|
getUserAuthorizedSites, |
|
|
|
retryIfsCall |
|
|
|
retryIfsCall,closeIfsCall |
|
|
|
} from '@/api/warehouse/ifsCallErrorLog.js' |
|
|
|
|
|
|
|
export default { |
|
|
|
@ -310,7 +317,7 @@ export default { |
|
|
|
columnProp: "site", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "站点", |
|
|
|
columnLabel: "工厂", |
|
|
|
columnWidth: 60, |
|
|
|
columnSortable: false, |
|
|
|
showOverflowTooltip: true, |
|
|
|
@ -456,16 +463,7 @@ export default { |
|
|
|
showOverflowTooltip: true, |
|
|
|
fixed: "" |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: "operate", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "操作", |
|
|
|
columnWidth: 300, |
|
|
|
columnSortable: false, |
|
|
|
showOverflowTooltip: true, |
|
|
|
fixed: "right" |
|
|
|
} |
|
|
|
|
|
|
|
], |
|
|
|
// 数据列表 - rqrq |
|
|
|
dataList: [], |
|
|
|
@ -645,6 +643,29 @@ export default { |
|
|
|
this.markIgnoredLoading = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
closeRetry(row){ |
|
|
|
this.$confirm('确定要忽略此记录的IFS接口调用吗？', '确认重试', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
const params = { |
|
|
|
id: row.id |
|
|
|
} |
|
|
|
|
|
|
|
closeIfsCall(params).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.$message.success('忽略成功') |
|
|
|
// 刷新列表 - rqrq |
|
|
|
this.getDataList() |
|
|
|
} else { |
|
|
|
this.$message.error(data.msg || '忽略失败') |
|
|
|
// 刷新列表（更新重试次数）- rqrq |
|
|
|
this.getDataList() |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 手工重试IFS接口调用 - rqrq |
|
|
|
handleRetry(row) { |
|
|
|
|
