From 69727fa6134dfa6b80db495d993b1af1709cfdfc Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Mon, 22 Jul 2024 11:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/view/dict/index.vue | 92 ++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/hx-ai-intelligent/src/view/dict/index.vue b/hx-ai-intelligent/src/view/dict/index.vue
index 1a85aac..57d69dc 100644
--- a/hx-ai-intelligent/src/view/dict/index.vue
+++ b/hx-ai-intelligent/src/view/dict/index.vue
@@ -53,7 +53,7 @@
     <a-drawer
       :width="600"
       :visible="visible"
-      :title="updateInfo.id ? '编辑' : '新增'"
+      :title="updateInfo && updateInfo.id ? '编辑' : '新增'"
       :body-style="{ paddingBottom: '80px' }"
       :footer-style="{ textAlign: 'right' }"
       destroyOnClose
@@ -129,7 +129,7 @@
 <script lang="ts" setup>
   import { ref, onMounted, defineOptions } from 'vue';
   import { http } from '/nerv-lib/util/http';
-  import type { Rule } from 'ant-design-vue/es/form';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
   import { tableColumns } from './config';
   import { dict } from '/@/api/dict';
   import { NsMessage } from '/nerv-lib/component';
@@ -140,6 +140,7 @@
 
   const data = ref([]);
   const updateInfo = ref({});
+  const formRef = ref<FormInstance | null>(null);
 
   const queryParams = ref({
     grp: '',
@@ -176,9 +177,9 @@
   };
 
   const visible = ref(false);
-  const formState = ref({
-    orgId: orgId.value,
-  });
+  // const formState = ref({
+  //   orgId: orgId.value,
+  // });
   const labelCol = { span: 5 };
   const wrapperCol = { span: 19 };
   // 定义form表单的必填
@@ -190,25 +191,25 @@
     seq: [{ required: true, message: '请输入排序数字', trigger: 'change' }],
     showed: [{ required: true, message: '请输入是否展示', trigger: 'change' }],
   };
-  interface FormState {
-    energyType: string;
-    unit: string;
-    collectionNode: string;
-    emissionType: string | undefined;
-    isComputeCarbon: string;
-    janFlag: string;
-    febFlag: string;
-    marFlag: string;
-    aprFlag: string;
-    mayFlag: string;
-    junFlag: string;
-    julFlag: string;
-    augFlag: string;
-    sepFlag: string;
-    octFlag: string;
-    novFlag: string;
-    decFlag: string;
-  }
+  // interface FormState {
+  //   energyType: string;
+  //   unit: string;
+  //   collectionNode: string;
+  //   emissionType: string | undefined;
+  //   isComputeCarbon: string;
+  //   janFlag: string;
+  //   febFlag: string;
+  //   marFlag: string;
+  //   aprFlag: string;
+  //   mayFlag: string;
+  //   junFlag: string;
+  //   julFlag: string;
+  //   augFlag: string;
+  //   sepFlag: string;
+  //   octFlag: string;
+  //   novFlag: string;
+  //   decFlag: string;
+  // }
   // 关闭新增抽屉
   const onClose = () => {
     visible.value = false;
@@ -226,29 +227,42 @@
   // 打开新增页
   const addDict = () => {
     updateInfo.value = {};
+    updateInfo.value.showed = 1;
     visible.value = true;
     // todo 打开编辑页
   };
 
   // 点击确定提交
   const onSubmit = () => {
-    if (updateInfo.value.id) {
-      fetch(dict.updateDictionary, updateInfo.value).then((res) => {
-        if (res.retcode == 0) {
-          visible.value = false;
-          NsMessage.success('保存成功');
-          getTableList();
-        }
-      });
-    } else {
-      fetch(dict.createDictionary, updateInfo.value).then((res) => {
-        if (res.retcode == 0) {
-          visible.value = false;
-          NsMessage.success('保存成功');
-          getTableList();
+    debugger;
+    formRef.value
+      ?.validate()
+      .then((valid) => {
+        if (valid) {
+          if (updateInfo.value.id) {
+            fetch(dict.updateDictionary, updateInfo.value).then((res) => {
+              if (res.retcode == 0) {
+                visible.value = false;
+                NsMessage.success('保存成功');
+                getTableList();
+              }
+            });
+          } else {
+            fetch(dict.createDictionary, updateInfo.value).then((res) => {
+              if (res.retcode == 0) {
+                visible.value = false;
+                NsMessage.success('保存成功');
+                getTableList();
+              }
+            });
+          }
+        } else {
+          console.log('表单验证失败');
         }
+      })
+      .catch((error) => {
+        console.log('表单验证失败', error);
       });
-    }
   };
 
   // 删除字典