From 18c0f035e6e119472b5b9ea4992cd9b5d18a9d6f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 May 2024 18:56:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/disputeRecord/disputeRecord.vue | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/views/disputeRecord/disputeRecord.vue b/src/views/disputeRecord/disputeRecord.vue
index 3d22d55..df60cff 100644
--- a/src/views/disputeRecord/disputeRecord.vue
+++ b/src/views/disputeRecord/disputeRecord.vue
@@ -142,29 +142,29 @@
tip: '请上传 .xls,.xlsx 标准格式文件',
action: "/api/blade-disputeRecord/disputeRecord/import-disputeRecord"
},
- // {
- // label: "数据覆盖",
- // prop: "isCovered",
- // type: "switch",
- // align: "center",
- // width: 80,
- // dicData: [{
- // label: "否",
- // value: 0
- // },
- // {
- // label: "是",
- // value: 1
- // }
- // ],
- // value: 0,
- // slot: true,
- // rules: [{
- // required: true,
- // message: "请选择是否覆盖",
- // trigger: "blur"
- // }]
- // },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
{
label: '模板下载',
prop: 'excelTemplate',
@@ -393,7 +393,7 @@
trigger: "blur",
},
],
- },{
+ }, {
label: "当事人1性别",
prop: "genderOne",
align: 'center',
@@ -402,13 +402,13 @@
// search: true,
searchLabelWidth: 110,
searchSpan: 4,
- type:"select",
- dicData:[
+ type: "select",
+ dicData: [
{
- label:"男",
+ label: "男",
value: 1
- },{
- label:"女",
+ }, {
+ label: "女",
value: 2
}
],
@@ -420,7 +420,7 @@
trigger: "blur",
},
],
- }, {
+ }, {
label: "当事人1电话",
prop: "phoneOne",
align: 'center',
@@ -490,13 +490,13 @@
// search: true,
searchLabelWidth: 110,
searchSpan: 4,
- type:"select",
- dicData:[
+ type: "select",
+ dicData: [
{
- label:"男",
+ label: "男",
value: 1
- },{
- label:"女",
+ }, {
+ label: "女",
value: 2
}
],
@@ -661,6 +661,12 @@
},
immediate: true,
},
+ 'excelForm.isCovered'() {
+ if (this.excelForm.isCovered !== '') {
+ const column = this.findObject(this.excelOption.column, "excelFile")
+ column.action = `/api/blade-disputeRecord/disputeRecord/import-disputeRecord?isCovered=${this.excelForm.isCovered}`
+ }
+ }
},
methods: {
locationDispose(data) {
@@ -682,7 +688,12 @@
},
uploadAfter(res, done, loading, column) {
this.excelBox = false
- this.refreshChange()
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: res
+ })
+ this.$refs.crud.toggleSelection()
done()
},
handleExport() {
--
Gitblit v1.9.3