From 53606eac81e6d3a76937c4cb6f45ad61581cb4da Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 05 六月 2025 14:41:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/components/public/index.vue | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 9d11c4e..b14b956 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -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,29 +316,23 @@
// .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();
- 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;
+ // 濡傛灉娌℃湁閫変腑琛ㄦ牸椤�
+ if (!this.list || this.list.length === 0) {
+ if (!desc && !jcsj) {
+ this.$message.warning(
+ "璇峰～鍐欐湁鏁堢殑妫�鏌ユ墍瑙佸拰妫�鏌ョ粨璁猴紝鎴栭�夋嫨琛ㄦ牸鏁版嵁"
+ );
+ return;
+ }
+ }
}
try {
--
Gitblit v1.8.0