From ebe4f10feba18e18bd4c744858a779ab75bcf622 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:44:09 +0800
Subject: [PATCH] qx
---
src/components/public/index.vue | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 9d11c4e..a1a56db 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -60,11 +60,12 @@
:data="dataList"
ref="multipleTable"
v-loading="loading"
+ row-key="aid"
@selection-change="handleSelectionChange"
border
height="480px"
>
- <el-table-column type="selection" width="40" align="center" />
+ <el-table-column type="selection" width="40" align="center" :reserve-selection="true"/>
<el-table-column
label="搴忓彿"
type="index"
@@ -180,7 +181,7 @@
queryParams: {
ruleStr: "",
pageNum: 1,
- pageSize: 10,
+ pageSize: 50,
},
list: [],
fList: {},
@@ -190,7 +191,6 @@
},
watch: {
checkStatus(newValue) {
- console.log(565658);
if (newValue === "1") {
this.updateData(this.proResult, this.conclusion);
}
@@ -263,10 +263,7 @@
if (this.checkStatus == 1) {
this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
- } else {
- this.form.desc = "";
- this.form.jcsj = "";
- }
+ }
if (this.list.length != 0) {
let desc = "";
@@ -279,8 +276,11 @@
.map((item) => item.yxbx)
.filter(Boolean)
.join(",");
- this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
- this.form.desc = this.form.desc + desc;
+ this.form.jcsj = jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = desc;
+ }else {
+ this.form.desc = "";
+ this.form.jcsj = "";
}
},
@@ -291,6 +291,8 @@
updateFormContent(selection) {
// if (!selection.length) return;
+ console.log(selection, 123456);
+
this.updateData(this.proResult, this.conclusion);
// 濡傛灉澶勪簬妫�鏌ョ姸鎬侊紝浣跨敤浼犲叆鐨勫��
// if (this.checkStatus === "1") {
@@ -314,35 +316,30 @@
// .join(",");
},
- /* handleOk() {
+ handleOk() {
if (!this.form.desc && !this.form.jcsj) {
this.$message.warning("璇烽�夋嫨鏁版嵁");
return;
+ } else {
+ const desc = this.form.desc?.trim();
+ const jcsj = this.form.jcsj?.trim();
+
+ // 濡傛灉娌℃湁閫変腑琛ㄦ牸椤�
+ if (!this.list || this.list.length === 0) {
+ if (!desc && !jcsj) {
+ this.$message.warning(
+ "璇峰～鍐欐湁鏁堢殑妫�鏌ユ墍瑙佸拰妫�鏌ョ粨璁猴紝鎴栭�夋嫨琛ㄦ牸鏁版嵁"
+ );
+ return;
+ }
+ }
}
try {
this.$emit("add", this.form.desc, this.form.jcsj);
this.resetForm();
this.open = false;
- } catch (error) {
- console.error("澶勭悊鏁版嵁澶辫触:", error);
- this.$message.error("鎿嶄綔澶辫触");
- }
- }, */
-
- handleOk() {
- const jcsjTrim = this.form.jcsj?.trim();
- const descTrim = this.form.desc?.trim();
-
- if (!jcsjTrim || !descTrim) {
- this.$message.warning("妫�鏌ユ墍瑙佸拰妫�鏌ョ粨璁轰笉鑳戒负绌�");
- return;
- }
-
- try {
- this.$emit("add", this.form.desc, this.form.jcsj);
- this.resetForm();
- this.open = false;
+ this.$refs.multipleTable.clearSelection();
} catch (error) {
console.error("澶勭悊鏁版嵁澶辫触:", error);
this.$message.error("鎿嶄綔澶辫触");
@@ -359,6 +356,7 @@
},
callcolos() {
this.open = false;
+ this.$refs.multipleTable.clearSelection();
},
},
computed: {
--
Gitblit v1.8.0