From cc1afed9022041e9bb849b591ac9e4eff614e7fb Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 2 Jul 2021 16:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E6=8F=90=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E6=BB=91=E5=9D=97=E9=AA=8C=E8=AF=81bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/verify/index.vue | 28 +++++++----- .../views/distribution/distributionCash.vue | 43 ++++++++----------- .../src/views/my-components/verify/index.vue | 29 ++++++++----- .../src/views/my-components/verify/index.vue | 29 ++++++++----- .../views/order/receiptManager/receipt.vue | 4 +- 5 files changed, 72 insertions(+), 61 deletions(-) diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue index eb6b7705..eb6cc5ef 100644 --- a/buyer/src/components/verify/index.vue +++ b/buyer/src/components/verify/index.vue @@ -72,19 +72,25 @@ export default { xPos: this.distance }; postVerifyImg(params).then(res => { - if (res.result) { - this.bgColor = 'green'; - this.verifyText = '解锁成功'; - this.$emit('change', { status: true, distance: this.distance }); + if (res.success) { + if (res.result) { + this.bgColor = 'green'; + this.verifyText = '解锁成功'; + this.$emit('change', { status: true, distance: this.distance }); + } else { + this.bgColor = 'red'; + this.verifyText = '解锁失败'; + let that = this; + setTimeout(() => { + that.refresh(); + }, 1000); + this.$emit('change', { status: false, distance: this.distance }); + } } else { - this.bgColor = 'red'; - this.verifyText = '解锁失败'; - let that = this; - setTimeout(() => { - that.refresh(); - }, 1000); - this.$emit('change', { status: false, distance: this.distance }); + this.refresh() } + }).catch(() => { + this.refresh() }); }, refresh () { // 刷新滑块 diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue index 6855ac6c..a6c4d84e 100644 --- a/manager/src/views/distribution/distributionCash.vue +++ b/manager/src/views/distribution/distributionCash.vue @@ -37,8 +37,8 @@ - 通过 - 拒绝 + 通过 + 拒绝 @@ -67,7 +67,7 @@ export default { loading: true, // 表单加载状态 modalVisible: false, // 添加或编辑显示 modalTitle: "", // 添加或编辑标题 - result: -1, // 是否通过 + result: 'REFUSE', // 是否通过 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 @@ -80,9 +80,6 @@ export default { memberName: "", price: "", }, - auditForm: { // 编辑表单 - result: -1 - }, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 @@ -101,11 +98,9 @@ export default { title: "申请金额", key: "price", minWidth: 90, - render: (h, params) => { - if (params.row.price) { - return h("div", this.$options.filters.unitPrice(params.row.price,'￥')); - } - } + render: (h, params) => { + return h("div", this.$options.filters.unitPrice(params.row.price,'￥')); + } }, { title: "申请时间", @@ -193,23 +188,27 @@ export default { }; }, methods: { + // 初始化数据 init() { this.getDataList(); }, + // 改变页码 changePage(v) { this.searchForm.pageNumber = v; this.getDataList(); - this.clearSelectAll(); }, + // 改变页数 changePageSize(v) { this.searchForm.pageSize = v; this.getDataList(); }, + // 搜索表格 handleSearch() { this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, + // 排序 changeSort(e) { this.searchForm.sort = e.key; this.searchForm.order = e.order; @@ -218,14 +217,7 @@ export default { } this.getDataList(); }, - clearSelectAll() { - this.$refs.table.selectAll(false); - }, - changeSelect(e) { - this.selectList = e; - this.selectCount = e.length; - }, - + // 获取列表数据 getDataList() { this.loading = true; // 带多条件搜索参数获取表单数据 请自行修改接口 @@ -241,7 +233,7 @@ export default { }, handleSubmit() { let result = "拒绝" - if(this.result == 0){ + if(this.result == 'PASS'){ result = "通过" } this.$refs.form.validate(valid => { @@ -251,13 +243,14 @@ export default { content: "您确认要审核"+result+"么?", loading: true, onOk: () => { - this.auditForm.result = this.result; - auditDistributionCash(this.form.id,this.auditForm).then(res => { + auditDistributionCash(this.form.id,{result:this.result}).then(res => { if (res.success) { this.$Modal.remove(); this.$Message.success("审核成功"); this.getDataList(); this.modalVisible = false; + } else { + this.modalVisible = false; } }); } @@ -275,9 +268,7 @@ export default { v[attr] = ""; } } - let str = JSON.stringify(v); - let data = JSON.parse(str); - this.form = data; + this.form = JSON.parse(JSON.stringify(v)); this.modalVisible = true; }, view(v){ diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue index eb6b7705..5f13fee8 100644 --- a/manager/src/views/my-components/verify/index.vue +++ b/manager/src/views/my-components/verify/index.vue @@ -72,19 +72,26 @@ export default { xPos: this.distance }; postVerifyImg(params).then(res => { - if (res.result) { - this.bgColor = 'green'; - this.verifyText = '解锁成功'; - this.$emit('change', { status: true, distance: this.distance }); + if (res.success) { + if (res.result) { + this.bgColor = 'green'; + this.verifyText = '解锁成功'; + this.$emit('change', { status: true, distance: this.distance }); + } else { + this.bgColor = 'red'; + this.verifyText = '解锁失败'; + let that = this; + setTimeout(() => { + that.refresh(); + }, 1000); + this.$emit('change', { status: false, distance: this.distance }); + } } else { - this.bgColor = 'red'; - this.verifyText = '解锁失败'; - let that = this; - setTimeout(() => { - that.refresh(); - }, 1000); - this.$emit('change', { status: false, distance: this.distance }); + this.refresh() } + + }).catch(()=>{ + this.refresh() }); }, refresh () { // 刷新滑块 diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue index eb6b7705..5f13fee8 100644 --- a/seller/src/views/my-components/verify/index.vue +++ b/seller/src/views/my-components/verify/index.vue @@ -72,19 +72,26 @@ export default { xPos: this.distance }; postVerifyImg(params).then(res => { - if (res.result) { - this.bgColor = 'green'; - this.verifyText = '解锁成功'; - this.$emit('change', { status: true, distance: this.distance }); + if (res.success) { + if (res.result) { + this.bgColor = 'green'; + this.verifyText = '解锁成功'; + this.$emit('change', { status: true, distance: this.distance }); + } else { + this.bgColor = 'red'; + this.verifyText = '解锁失败'; + let that = this; + setTimeout(() => { + that.refresh(); + }, 1000); + this.$emit('change', { status: false, distance: this.distance }); + } } else { - this.bgColor = 'red'; - this.verifyText = '解锁失败'; - let that = this; - setTimeout(() => { - that.refresh(); - }, 1000); - this.$emit('change', { status: false, distance: this.distance }); + this.refresh() } + + }).catch(()=>{ + this.refresh() }); }, refresh () { // 刷新滑块 diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index e354ee54..94ee9637 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -121,7 +121,7 @@ export default { { title: "发票状态", key: "receiptStatus", - width: 90, + width: 100, tooltip: true, render: (h, params) => { if (params.row.receiptStatus == 0) { @@ -138,7 +138,7 @@ export default { { title: "订单状态", key: "orderStatus", - width: 90, + width: 100, render: (h, params) => { if (params.row.orderStatus == "UNPAID") { return h("div", [