From 6beea2392e3f87be0a355e036e00546f82a1e50f Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 3 Dec 2025 10:53:47 +0800
Subject: [PATCH] =?UTF-8?q?1.0.44=20=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectSelect/index.vue    | 25 ++++++++++++++++-------
 src/views/oa/erp/projectPurchase/edit.vue |  3 ++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/ProjectSelect/index.vue b/src/components/ProjectSelect/index.vue
index 8fabfe0..c045a82 100644
--- a/src/components/ProjectSelect/index.vue
+++ b/src/components/ProjectSelect/index.vue
@@ -6,14 +6,18 @@
           <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
             <div v-show="showSearch" class="mb-[10px]">
               <el-card shadow="hover">
-                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
                   <el-form-item label="项目编号" prop="projectCode">
-                    <el-input v-model="queryParams.projectCode" placeholder="请输入项目编码" clearable @keyup.enter="handleQuery" />
+                    <el-input v-model="queryParams.projectCode" placeholder="请输入项目编码" clearable @keyup.enter="handleQuery" style="width: 150px"/>
                   </el-form-item>
                   <el-form-item label="项目名称" prop="projectName">
-                    <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
+                    <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" style="width: 200px"/>
+                  </el-form-item>
+                  <el-form-item label="项目类别" prop="projectCategory">
+                    <el-select v-model="queryParams.projectCategory" placeholder="请选择项目类别" clearable style="width: 200px">
+                      <el-option v-for="dict in project_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
                   </el-form-item>
-
                   <el-form-item>
                     <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                     <el-button icon="Refresh" @click="() => resetQuery()">重置</el-button>
@@ -38,9 +42,14 @@
             >
               <vxe-column type="checkbox" width="50" align="center" />
               <vxe-column key="projectCode" title="项目编码" align="center" field="projectCode" width="120" />
-              <vxe-column key="projectName" title="项目名称" align="center" field="projectName" width="120" />
+              <vxe-column key="projectName" title="项目名称" align="center" field="projectName" width="300" />
+              <vxe-column key="projectCategory" title="项目类别" align="center" field="projectCategory" width="150">
+                <template #default="scope">
+                  <dict-tag :options="project_category" :value="scope.row.projectCategory" />
+                </template>
+              </vxe-column>
               <vxe-column key="managerName" title="项目经理" align="center" field="managerName" width="120" />
-              <vxe-column key="deptName" title="部门ID" align="center" field="deptName" width="120" />
+              <vxe-column key="deptName" title="部门" align="center" field="deptName" width="120" />
               <vxe-column key="chargeName" title="部门负责人" align="center" field="chargeName" width="120" />
               <vxe-column key="deputyName" title="分管副总" align="center" field="deputyName" width="120" />
               <!-- <vxe-column key="business_direction" title="业务方向" align="center" field="business_direction" width="120" /> -->
@@ -96,6 +105,8 @@ const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const { project_category } = toRefs<any>(proxy?.useDict('project_category'));
+
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
@@ -108,7 +119,7 @@ const queryFormRef = ref<ElFormInstance>();
 const tableRef = ref<VxeTableInstance<ProjectInfoVO>>();
 
 const projectSelectDialog = useDialog({
-  title: '项目选择'
+  title: '选择项目'
 });
 
 const initFormData: ProjectInfoForm = {
diff --git a/src/views/oa/erp/projectPurchase/edit.vue b/src/views/oa/erp/projectPurchase/edit.vue
index cdda0b2..0e669ae 100644
--- a/src/views/oa/erp/projectPurchase/edit.vue
+++ b/src/views/oa/erp/projectPurchase/edit.vue
@@ -806,7 +806,7 @@ onMounted(async () => {
   nextTick(async () => {
     // 获取路由参数
     Object.assign(routeParams, route.query);
-    pageLoading.value = true;
+    // pageLoading.value = true;
     loadSelectOptions();
     const id = routeParams.id as string | number;
     const type = routeParams.type as string;
@@ -820,6 +820,7 @@ onMounted(async () => {
     }
     const shouldLoadDetail = !!id && (type === 'update' || type === 'view' || type === 'approval');
     await loadDetail(shouldLoadDetail ? (id as string | number) : undefined);
+    pageLoading.value = false;
   });
 });
 </script>