From f30cde879ccfb0fbbd289c3c3305662b9b84c0c3 Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Fri, 20 Dec 2024 23:31:34 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=9B=A0=E6=97=A5=E5=BF=97=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=89=82=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/product/edit-modal.vue | 29 +++--------------------------
 src/pages/product/index.vue      |  7 +++++--
 src/pages/user/index.vue         | 11 +++++++----
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/pages/product/edit-modal.vue b/src/pages/product/edit-modal.vue
index 8a034a0..2544f5e 100644
--- a/src/pages/product/edit-modal.vue
+++ b/src/pages/product/edit-modal.vue
@@ -18,6 +18,9 @@ const { loading, runAsync, error } = useRequest(saveProduct, {
 })
 
 function handleSave() {
+    currentData.created_at = undefined;
+    currentData.updated_at = undefined;
+    currentData.status = undefined;
     runAsync(currentData).then(() => {
         editData.value = undefined;
         emit('saved')
@@ -33,32 +36,6 @@ function handleFinishError(errorInfo: any) {
 function onValuesChange() {
     error.value = undefined
 }
-/*
-[
-    { id: 1, name: "能量密度", alias: "power" },
-    { id: 2, name: "蛋白Pro", alias: "protein" },
-    { id: 3, name: "Glu", alias: "glu" },
-    { id: 4, name: "Fat", alias: "fat" },
-    { id: 5, name: "纤维素", alias: "cellulose" },
-    { id: 6, name: "Na", alias: "na" },
-    { id: 7, name: "K", alias: "k" },
-    { id: 8, name: "Ca", alias: "ca" },
-    { id: 9, name: "P", alias: "p" },
-    { id: 10, name: "Mg", alias: "mg" },
-];
-*/
-// const DataFields = [
-//     { label: '能量密度', name: 'power',message:'请输入能量密度数据' },
-//     { label: '蛋白Pro', name: 'protein',message:'请输入蛋白Pro数据' },
-//     { label: 'Glu', name: 'glu',message:'请输入Glu数据' },
-//     { label: 'Fat', name: 'fat',message:'请输入Fat数据' },
-//     { label: '纤维素', name: 'cellulose',message:'请输入纤维素数据' },
-//     { label: 'Na', name: 'na',message:'请输入Na数据' },
-//     { label: 'K', name: 'k',message:'请输入K数据' },
-//     { label: 'Ca', name: 'ca',message:'请输入Ca数据' },
-//     { label: 'P', name: 'p',message:'请输入P数据' },
-//     { label: 'Mg', name: 'mg',message:'请输入Mg数据' },
-// ]
 </script>
 <template>
     <Modal :width="640" :open="true" :footer="null" @cancel="handleCancel" :mask-closable="false"
diff --git a/src/pages/product/index.vue b/src/pages/product/index.vue
index 5eb01a8..60c5528 100644
--- a/src/pages/product/index.vue
+++ b/src/pages/product/index.vue
@@ -43,7 +43,10 @@ function handleDelete(id: number) {
         }
     })
 }
-
+function handleSearch(){
+    searchParams.value.page = 1;
+    run()
+}
 </script>
 <template>
     <div class="data-fields-container">
@@ -63,7 +66,7 @@ function handleDelete(id: number) {
                     </Select>
                 </Space>
                 <Space class="form-item" :size="15">
-                    <Button :icon="h(SearchOutlined)" type="primary" @click="run">查询</Button>
+                    <Button :icon="h(SearchOutlined)" type="primary" @click="handleSearch">查询</Button>
                     <Button :icon="h(PlusOutlined)" class="btn-info" @click="editProduct = { id: 0 }">新增</Button>
                 </Space>
             </Space>
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index e7b6975..25b562e 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -46,6 +46,11 @@ function handleDelete(id: number) {
         }
     })
 }
+
+function handleSearch() {
+    searchParams.value.page = 1;
+    run()
+}
 </script>
 <template>
     <div class="data-fields-container">
@@ -69,7 +74,7 @@ function handleDelete(id: number) {
                     </Select>
                 </Space>
                 <Space class="form-item" :size="15">
-                    <Button :icon="h(SearchOutlined)" type="primary" @click="run">查询</Button>
+                    <Button :icon="h(SearchOutlined)" type="primary" @click="handleSearch">查询</Button>
                     <Button :icon="h(PlusOutlined)" class="btn-info" @click="editUser = { id: 0 }">新增</Button>
                 </Space>
             </Space>
@@ -113,6 +118,4 @@ function handleDelete(id: number) {
         <EditModal v-if="!!editUser" v-model="editUser" @saved="refresh" />
     </div>
 </template>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>