From bb5ec61ffdebd9a987c6441e98a4985469748d23 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 6 Nov 2024 11:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/articleManage/articleKepu/index.vue | 40 +++++++++++++------
 .../articleManage/articleOrigin/index.vue     | 14 ++++++-
 src/views/articleManage/classify/index.vue    | 17 ++------
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/views/articleManage/articleKepu/index.vue b/src/views/articleManage/articleKepu/index.vue
index 89448be..7aa414e 100644
--- a/src/views/articleManage/articleKepu/index.vue
+++ b/src/views/articleManage/articleKepu/index.vue
@@ -106,7 +106,7 @@
       </template>
     </a-table>
 
-    <articleModal ref="hospitalChild" :modalVisible="modalVisible" :modalForm="modalForm" :id="modalForm.article_id" @freshDetail="handleQuery" @familyVisibleChange="()=>{modalVisible=false,modalForm.article_id=''}"></articleModal>
+    <articleModal ref="hospitalChild" :modalVisible="modalVisible" :modalForm="modalForm" :id="modalForm.article_id" @freshDetail="freshDetail" @familyVisibleChange="()=>{modalVisible=false,modalForm.article_id=''}"></articleModal>
     <!-- Akiraka 20230223 删除与批量删除 开始 -->
     <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
       @deleteVisibleChange="() => deleteVisible = false" /> -->
@@ -234,7 +234,6 @@
    */
   const handlePageChange = (page) => {
     pager.page = page;
-
     // 修改当前页码
     currentPage.value = page;
     getMedinceInfo({ ...pager, ...queryForm });
@@ -251,6 +250,7 @@
     const { data, code, message } = await getArticleList(params);
     if (code == 200) {
       tableData.value = data.data;
+     
       Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
     }
   };
@@ -258,28 +258,44 @@
   // 查询患者信息
   const handleQuery = async () => {
     pager.page = 1;
-    if(!queryForm.province_id){
-      delete queryForm.province_id; 
+    currentPage.value = 1;
+    if(queryForm.is_top===''){
+      delete queryForm.is_top; 
     }
-    if(!queryForm.city_id){
-      delete queryForm.city_id; 
-    }
-    if(!queryForm.county_id){
-      delete queryForm.county_id; 
+    if(!queryForm.article_status){
+      delete queryForm.article_status; 
     }
+   
+    const params = {
+      page: pager.page,
+      page_size: pager.page_size,
+      ...queryForm,
+    };
+    getMedinceInfo(params);
+  };
+  const freshDetail = async () => {
+  
+    if(queryForm.is_top===''){
+      delete queryForm.is_top; 
+    }
+    if(!queryForm.article_status){
+      delete queryForm.article_status; 
+    }
+   
     const params = {
       page: pager.page,
       page_size: pager.page_size,
       ...queryForm,
     };
-
     getMedinceInfo(params);
   };
-
   // 重置搜索
   const handleResetQuery = () => {
     proxy.$refs.queryFormRef.resetFields();
-    getMedinceInfo(queryForm);
+    // pager.page =1;
+    // pager.page_size=10;
+    // currentPage.value = 1;
+    getMedinceInfo(...pager, ...queryForm);
   }
   const handlExport=async(type)=>{
   proxy.$loading.show();
diff --git a/src/views/articleManage/articleOrigin/index.vue b/src/views/articleManage/articleOrigin/index.vue
index 017aa6e..732d5ac 100644
--- a/src/views/articleManage/articleOrigin/index.vue
+++ b/src/views/articleManage/articleOrigin/index.vue
@@ -56,7 +56,7 @@
     </a-table>
 
     <articleOriginModal ref="hospitalChild" :modalVisible="modalVisible" :modalForm="modalForm"
-      :id="modalForm.source_id" @freshDetail="handleQuery"
+      :id="modalForm.source_id" @freshDetail="freshDetail"
       @familyVisibleChange="() => { modalVisible = false, modalForm.source_id = '' }">
     </articleOriginModal>
     <!-- Akiraka 20230223 删除与批量删除 开始 -->
@@ -202,6 +202,7 @@ const getMedinceInfo = async (params = {}) => {
 // 查询患者信息
 const handleQuery = async () => {
   pager.page = 1;
+  currentPage.value = 1;
   if (!queryForm.province_id) {
     delete queryForm.province_id;
   }
@@ -219,11 +220,20 @@ const handleQuery = async () => {
 
   getMedinceInfo(params);
 };
+const freshDetail = async () => {
+  const params = {
+    page: pager.page,
+    page_size: pager.page_size,
+    ...queryForm,
+  };
+
+  getMedinceInfo(params);
+};
 
 // 重置搜索
 const handleResetQuery = () => {
   proxy.$refs.queryFormRef.resetFields();
-  getMedinceInfo(queryForm);
+  getMedinceInfo(...pager, ...queryForm);
 }
 const handlExport = async (type) => {
   proxy.$loading.show();
diff --git a/src/views/articleManage/classify/index.vue b/src/views/articleManage/classify/index.vue
index be670c7..1531b95 100644
--- a/src/views/articleManage/classify/index.vue
+++ b/src/views/articleManage/classify/index.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
 
-      <a-form-item field="basic_class_name	" label="分类名称">
-        <a-input :style="{ width: '182px' }" v-model="queryForm.basic_class_name	" placeholder="请输入分类名称" @press-enter="handleQuery" />
+      <a-form-item field="basic_class_name" label="分类名称">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.basic_class_name" placeholder="请输入分类名称" @press-enter="handleQuery" />
 
       </a-form-item>
       <a-form-item field="order.basic_class_sort" label="分类排序">
@@ -200,6 +200,7 @@
   // 查询患者信息
   const handleQuery = async () => {
     pager.page = 1;
+    currentPage.value = 1;
     if(!queryForm.province_id){
       delete queryForm.province_id; 
     }
@@ -218,16 +219,6 @@
     getMedinceInfo(params);
   };
  const freshDetail=async () => {
-   
-    if(!queryForm.province_id){
-      delete queryForm.province_id; 
-    }
-    if(!queryForm.city_id){
-      delete queryForm.city_id; 
-    }
-    if(!queryForm.county_id){
-      delete queryForm.county_id; 
-    }
     const params = {
       page: pager.page,
       page_size: pager.page_size,
@@ -239,7 +230,7 @@
   // 重置搜索
   const handleResetQuery = () => {
     proxy.$refs.queryFormRef.resetFields();
-    getMedinceInfo(queryForm);
+    getMedinceInfo(...pager, ...queryForm);
   }
   const handlExport=async(type)=>{
   proxy.$loading.show();