Commit 61382757 by 无尘

fix: 修改审核接口

parent 296265b3
......@@ -4,11 +4,12 @@
* @Author: 无尘
* @Date: 2019-10-21 14:27:29
* @LastEditors: 无尘
* @LastEditTime: 2020-07-27 11:11:05
* @LastEditTime: 2020-08-03 18:26:13
-->
<!--
<review-result-detail
:auditIds="auditIds"
:detailShow="detailShow"
@hideDetailDialog="hideDetailDialog">
</review-result-detail>
......@@ -75,7 +76,7 @@ export default {
type: Boolean,
default: false
},
batchId: {
auditIds: {
type: String,
default() {
return '';
......@@ -127,7 +128,7 @@ export default {
getTableData() {
const that = this;
let para = {
batchId: that.batchId
auditIds: that.auditIds
};
getAuditDetail(para)
.then(res => {
......@@ -141,7 +142,7 @@ export default {
const that = this;
that.customDialog = newData;
},
batchId: function(newData, oldData) {
auditIds: function(newData, oldData) {
const that = this;
if (!!newData) {
that.getTableData();
......@@ -153,7 +154,7 @@ export default {
mounted() {
const that = this;
that.customDialog = that.detailShow;
if (!!that.batchId) {
if (!!that.auditIds) {
that.getTableData();
}
}
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-10-21 14:27:29
* @LastEditors: 无尘
* @LastEditTime: 2020-06-01 10:57:41
* @LastEditTime: 2020-08-03 19:00:13
-->
<!--
......@@ -17,22 +17,20 @@
import reviewResult from '@/components/review/review-result.vue'
-->
<template>
<div v-show="customDialog">
<el-dialog class="edit-dialog" title="提示" :visible.sync="customDialog" width="420px" :before-close="handleClose">
<div class="edit-dialog-body">
<div class="result-content">
<span>{{ resultText }}</span
><span class="color-f5222d">{{ failCount }} 条失败。</span> <el-button type="text" @click="showDetail">查看详情</el-button>
</div>
<el-dialog class="edit-dialog" title="提示" append-to-body :visible.sync="customDialog" width="420px" :before-close="handleClose">
<div class="edit-dialog-body">
<div class="result-content">
<span>{{ resultText }}</span
><span class="color-f5222d">{{ failCount }} 条失败。</span> <el-button type="text" @click="showDetail">查看详情</el-button>
</div>
</el-dialog>
</div>
</div>
</el-dialog>
</template>
<script>
// import { getRequest } from '@/api/api';
// import errMsg from '@/common/js/error';
export default {
name: 'record-list',
name: 'review-result',
props: {
resultText: {
type: String,
......@@ -97,9 +95,7 @@ export default {
</script>
<style lang="less" scoped>
.bg-82C5FF {
background: #82c5ff;
}
.color-f5222d {
color: #f5222d;
}
......@@ -124,20 +120,5 @@ export default {
background: rgba(235, 238, 245, 1);
}
.el-alert--info {
width: 400px;
font-size: 14px;
color: #606266;
background: #e6f7ff;
border: 1px solid rgba(145, 213, 255, 1);
}
.el-icon-info {
width: 12px;
font-size: 12px;
color: #1890ff;
}
.el-form {
margin-top: 40px;
}
}
</style>
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2020-08-03 18:08:51
* @LastEditTime: 2020-08-03 18:54:39
-->
<template>
<div class="unreview-wrap common-set-wrap">
......@@ -127,7 +127,7 @@
<el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button>
</div>
</el-dialog>
<review-result-detail :batchId="batchId" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
<review-result-detail :auditIds="auditIds" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
<review-result :resultText="resultText" :failCount="failCount" :resultShow="resultShow" @showResultDetail="showResultDetail" @hideResultDialog="hideResultDialog"> </review-result>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
<span>共{{ multipleSelection.length }}条审核事项,是否批量同意?</span>
......@@ -207,10 +207,9 @@ export default {
approveVisible: false,
refuseVisible: false,
detailShow: false,
resultShow: false,
tableListData: [], //审核详情的数据
batchId: '',
detailShow: false, // 批量审核详情显示
resultShow: false, // 批量审核显示
tableListData: [], // 审核详情的数据
resultText: '',
failCount: '0',
// user
......@@ -384,9 +383,9 @@ export default {
.then(res => {
that.loadBtn = false;
that.dialogVisible = false;
that.batchId = res.result.batchId;
that.resultText = `共${that.multipleSelection.length}条审核事项,${res.result.successCount}条成功,`;
that.failCount = res.result.failCount;
that.resultText = `共${that.multipleSelection.length}条审核事项,${res.result.successCount || ''}条成功,`;
that.failCount = res.result.failCount || '';
that.auditIds = ids;
that.resultShow = true;
})
.catch(function(error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment