|
@@ -6,28 +6,33 @@
|
|
|
<a-form layout="inline" id="erpMessageManagement-form" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="同步时间">
|
|
|
+ <a-form-item label="校验时间">
|
|
|
<rangeDate ref="rangeDate" id="erpMessageManagement-rangeDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="处理状态">
|
|
|
- <a-select placeholder="请选择处理状态" id="erpMessageManagement-handleResult" v-model="queryParam.handleResult">
|
|
|
- <a-select-option value="finish" id="erpMessageManagement-handleResult-finish">
|
|
|
- 处理成功
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="校验结果">
|
|
|
+ <a-select placeholder="请选择校验结果" id="erpMessageManagement-checkResult" v-model="queryParam.resultType">
|
|
|
+ <a-select-option value="right" id="erpMessageManagement-checkResult-success">
|
|
|
+ 成功
|
|
|
</a-select-option>
|
|
|
- <a-select-option value="fail" id="erpMessageManagement-handleResult-fail">
|
|
|
- 处理失败
|
|
|
+ <a-select-option value="error" id="erpMessageManagement-checkResult-fail">
|
|
|
+ 失败
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="业务编码">
|
|
|
- <a-input id="erpMessageManagement-bizId" v-model.trim="queryParam.bizId" allowClear placeholder="请输入完整的业务编码"/>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="业务编号">
|
|
|
+ <a-input id="erpMessageManagement-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务编号"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="业务名称">
|
|
|
+ <a-input id="erpMessageManagement-bizName" v-model.trim="queryParam.bizName" allowClear placeholder="请输入业务名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
|
+ <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="erpMessageManagement-refresh">查询</a-button>
|
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="erpMessageManagement-reset">重置</a-button>
|
|
|
</a-col>
|
|
@@ -50,24 +55,29 @@
|
|
|
:scroll="{ y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
- <!-- 同步状态 -->
|
|
|
+ <!-- 处理状态 -->
|
|
|
<template slot="syncStatus" slot-scope="text, record">
|
|
|
- <span v-if="record.handleResult&&record.handleResult=='finish'">处理成功</span>
|
|
|
- <span v-else-if="record.handleResult&&record.handleResult=='wait'">等待处理</span>
|
|
|
- <span v-else style="color:#ed1c24;">处理失败</span>
|
|
|
+ <span v-if="record.disposeType&&record.disposeType=='NO_DISPOSE'">未处理</span>
|
|
|
+ <span v-else-if="record.disposeType&&record.disposeType=='RUN_DISPOSE'">处理中</span>
|
|
|
+ <span v-else-if="record.disposeType&&record.disposeType=='YES_DISPOSE'">已处理</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 错误信息 -->
|
|
|
<template slot="errInfo" slot-scope="text, record">
|
|
|
- <div v-if="record.errInfo">
|
|
|
+ <div v-if="record.resultInfo">
|
|
|
<a-popover trigger="hover">
|
|
|
<template slot="content">
|
|
|
- {{ record.errInfo }}
|
|
|
+ {{ record.resultInfo }}
|
|
|
</template>
|
|
|
- <div>{{ record.errInfo }}</div>
|
|
|
+ <div>{{ record.resultInfo }}</div>
|
|
|
</a-popover>
|
|
|
</div>
|
|
|
<div v-else>--</div>
|
|
|
</template>
|
|
|
+ <!-- 验证结果 -->
|
|
|
+ <template slot="resultType" slot-scope="text, record">
|
|
|
+ <span :style="{color:text=='right'?'green':'red'}">{{ text=='right'?'成功':'失败' }}</span>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<div>
|
|
@@ -78,6 +88,7 @@
|
|
|
@click="handleCli(record)"
|
|
|
:id="'erpMessageManagement-handle-btn'+record.id">处理</a-button>
|
|
|
<a-button
|
|
|
+ v-if="record.bizNo"
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-info"
|
|
@@ -89,7 +100,7 @@
|
|
|
</a-spin>
|
|
|
</a-card>
|
|
|
<!-- 新增/编辑 -->
|
|
|
- <editModal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @close="closeModal" />
|
|
|
+ <editModal :openModal="openModal" :nowData="nowData" @close="closeModal" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -100,7 +111,7 @@ import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import editModal from './editModal.vue'
|
|
|
// 接口
|
|
|
-import { queryReceivePage, handle } from '@/api/mqmsg'
|
|
|
+import { queryCheckResultPage, datacheckReset } from '@/api/mqmsg'
|
|
|
export default {
|
|
|
name: 'DataValidManagementList',
|
|
|
mixins: [commonMixin],
|
|
@@ -112,33 +123,32 @@ export default {
|
|
|
tableHeight: 0, // 列表高度
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
- createDateStart: '', // 同步开始时间
|
|
|
- createDateEnd: '', // 同步结束时间
|
|
|
- handleResult: undefined, // 处理状态
|
|
|
- bizType: 'KdMidSpareInputs', // 业务类型
|
|
|
- bizId: undefined// 业务编码
|
|
|
+ beginDate: '', // 开始时间
|
|
|
+ endDate: '', // 结束时间
|
|
|
+ resultType: undefined, // 校验结果
|
|
|
+ bizName: '', // 业务名称
|
|
|
+ bizNo: '' // 业务编号
|
|
|
},
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
|
|
|
- { title: '业务编号', dataIndex: 'bizId', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '校验时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '业务名称', dataIndex: 'lastHandleDate0', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '错误信息', scopedSlots: { customRender: 'errInfo' }, width: '15%', align: 'center', ellipsis: true },
|
|
|
- { title: '校验内容', dataIndex: 'lastHandleDate1', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '校验结果', dataIndex: 'lastHandleDate2', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '校验内容', dataIndex: 'lastHandleDate3', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '处理状态', scopedSlots: { customRender: 'syncStatus' }, width: '10%', align: 'center' },
|
|
|
- { title: '处理描述', dataIndex: 'lastHandleDate4', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '处理时间', dataIndex: 'lastHandleDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
|
|
|
+ { title: '业务名称', dataIndex: 'bizName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '校验内容', dataIndex: 'checkContent', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务编号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '校验结果', dataIndex: 'resultType', scopedSlots: { customRender: 'resultType' }, width: '6%', align: 'center' },
|
|
|
+ { title: '错误信息', scopedSlots: { customRender: 'errInfo' }, width: '14%', align: 'center', ellipsis: true },
|
|
|
+ { title: '校验时间', dataIndex: 'checkDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '处理状态', scopedSlots: { customRender: 'syncStatus' }, width: '6%', align: 'center' },
|
|
|
+ { title: '处理描述', dataIndex: 'disposeDesc', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '处理时间', dataIndex: 'disposeDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
// 获取列表数据 有分页
|
|
|
- return queryReceivePage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return queryCheckResultPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -154,32 +164,41 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
openModal: false, // 新增编辑调拨类型 弹框
|
|
|
- itemSn: '', // 当前sn
|
|
|
nowData: null // 当前记录数据
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
// 同步时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.createDateStart = date[0] ? date[0] : ''
|
|
|
- this.queryParam.createDateEnd = date[1] ? date[1] : ''
|
|
|
+ this.queryParam.beginDate = date[0] ? date[0] : ''
|
|
|
+ this.queryParam.endDate = date[1] ? date[1] : ''
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.handleResult = undefined
|
|
|
- this.queryParam.createDateStart = ''
|
|
|
- this.queryParam.createDateEnd = ''
|
|
|
- this.queryParam.bizId = undefined
|
|
|
+ this.queryParam = {
|
|
|
+ beginDate: '', // 开始时间
|
|
|
+ endDate: '', // 结束时间
|
|
|
+ resultType: undefined, // 校验结果
|
|
|
+ bizName: '', // 业务名称
|
|
|
+ bizNo: '' // 业务编号
|
|
|
+ }
|
|
|
this.$refs.rangeDate.resetDate()
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
// 处理
|
|
|
handleCli (row) {
|
|
|
- this.itemSn = row ? row.id : null
|
|
|
this.nowData = row
|
|
|
this.openModal = true
|
|
|
},
|
|
|
- // 重新同步
|
|
|
+ // 处理完成
|
|
|
+ closeModal (flag) {
|
|
|
+ this.nowData = null
|
|
|
+ this.openModal = false
|
|
|
+ if (flag) {
|
|
|
+ this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 重新验证
|
|
|
handleAgainVeriy (row) {
|
|
|
const _this = this
|
|
|
this.$confirm({
|
|
@@ -188,7 +207,7 @@ export default {
|
|
|
centered: true,
|
|
|
onOk () {
|
|
|
_this.spinning = true
|
|
|
- handle({ id: row.id }).then(res => {
|
|
|
+ datacheckReset({ bizName: row.bizName, bizNo: row.bizNo, nodeCode: row.nodeCode }).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
_this.$message.success(res.message)
|
|
|
_this.$refs.table.refresh()
|
|
@@ -208,7 +227,7 @@ export default {
|
|
|
// 计算表格高度
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 200
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 190
|
|
|
}
|
|
|
},
|
|
|
watch: {
|