From 9e8bc525b243468a68eae6e917de918299bc44ee Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 18:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request_formdata.js                |  2 +-
 src/views/dataManage/pro-materials/index.vue | 25 ++++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/utils/request_formdata.js b/src/utils/request_formdata.js
index 5796356..f17b0c0 100644
--- a/src/utils/request_formdata.js
+++ b/src/utils/request_formdata.js
@@ -17,7 +17,7 @@ const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     baseURL: process.env.VUE_APP_BASE_API,
     // 超时
-    timeout: 10000,
+    timeout: 60000 * 2,
 })
 
 // request拦截器
diff --git a/src/views/dataManage/pro-materials/index.vue b/src/views/dataManage/pro-materials/index.vue
index e43f8f2..32e6c1d 100644
--- a/src/views/dataManage/pro-materials/index.vue
+++ b/src/views/dataManage/pro-materials/index.vue
@@ -19,12 +19,16 @@
                 <el-select
                     clearable
                     filterable
-                    placeholder="选择类型"
-                    v-model="queryParams.type"
+                    style="width: 100%"
+                    placeholder="请选择类型"
+                    v-model="queryParams.typeId"
                 >
-                    <el-option value="1" label="智慧基建" />
-                    <el-option value="2" label="智慧后勤" />
-                    <el-option value="3" label="数智装备" />
+                    <el-option
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                        v-for="item in dict.type.tb_product_type"
+                    />
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -161,6 +165,7 @@ import DialogModel from '@/components/DialogModel'
 import AddAndEditForm from './components/addAndEditForm.vue'
 export default {
     name: 'ProMaterials',
+    dicts: ['tb_product_type'],
     components: {
         AddAndEditForm,
         DialogModel,
@@ -228,14 +233,16 @@ export default {
             this.total = res?.total
         },
         onHandleQuery() {
-            console.log(this.queryParams)
             this.getProMaterialsListFun()
         },
         onResetQuery() {
             this.queryParams = {
                 name: undefined,
-                type: undefined,
+                typeId: undefined,
+                pageNum: 1,
+                pageSize: 10,
             }
+            this.getProMaterialsListFun()
         },
         onHandleAdd() {
             this.formType = 1
@@ -268,9 +275,7 @@ export default {
                         this.onHandleQuery()
                     }
                 })
-                .catch(() => {
-                    console.log('取消')
-                })
+                .catch(() => {})
         },
         // 关闭弹框
         handleCloseDialogOuter() {