From e55df9616c68ca79571b821b00ba03e4f2cdb0cd Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 26 Jan 2026 16:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=EF=BC=8C=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business-examine/receive-apply/index.vue  | 37 +++++++++-
 .../directApplyRecord.vue                     | 74 ++++++++++++++++---
 2 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/src/views/business-examine/receive-apply/index.vue b/src/views/business-examine/receive-apply/index.vue
index 3e8368ce..60263fc0 100644
--- a/src/views/business-examine/receive-apply/index.vue
+++ b/src/views/business-examine/receive-apply/index.vue
@@ -23,6 +23,23 @@
                 style="width: 130px"
                 />
             </el-form-item>
+                <el-form-item label="分公司" prop="impUnitName">
+                <el-select
+                    v-model="queryParams.impUnitName"
+                    placeholder="请选择分公司"
+                    clearable
+                    filterable
+                    style="width: 100%"
+                >
+                    <el-option
+                    v-for="item in impUnitOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                    />
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="关键字" prop="keyWord">
                 <el-input
                     clearable
@@ -112,6 +129,7 @@
 
 <script>
 import { getReceiveApplyApi } from '@/api/receive-apply/index.js'
+import {getImpUnitListApi} from "@/api/materialsStation";
 import { getToken, setToken, setExpiresIn } from '@/utils/auth'
 
 export default {
@@ -130,7 +148,8 @@ export default {
                 keyWord: '', // 关键字
                 taskStatus: '1', // 审核状态
                 startTime: '', // 开始时间
-                endTime: '' // 结束时间
+                endTime: '', // 结束时间
+                impUnitName: '', // 分公司
             },
             // 审核状态
             statusOptions: [
@@ -152,7 +171,8 @@ export default {
                 { label: '领料人', prop: 'leasePerson' },
                 { label: '领料人电话', prop: 'phone' },
                 { label: '状态', prop: 'taskStatus' }
-            ]
+            ],
+            impUnitOptions: [], // 分公司下拉选
         }
     },
     async created() {
@@ -215,6 +235,7 @@ export default {
             // if (this.statusOptions.length > 1) {
             //     this.queryParams.taskStatus = this.statusOptions[1].value
             // }
+            this.getImpUnitOptions()
             this.getList()
         }
     },
@@ -242,6 +263,18 @@ export default {
             this.$refs.queryForm.resetFields()
             this.getList()
         },
+
+        async getImpUnitOptions() {
+            try {
+            const res = await getImpUnitListApi()
+            this.impUnitOptions = res.data.map(item => ({
+                label: item.impUnitName,
+                value: item.impUnitName
+            }))
+            } catch (e) {
+            console.error('获取分公司下拉失败:', e)
+            }
+        },        
         // 获取列表
         async getList() {
             try {
diff --git a/src/views/business/businessHandlingRecord/directApplyRecord.vue b/src/views/business/businessHandlingRecord/directApplyRecord.vue
index 4fbccc1a..d2c4a835 100644
--- a/src/views/business/businessHandlingRecord/directApplyRecord.vue
+++ b/src/views/business/businessHandlingRecord/directApplyRecord.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 基础页面 -->
   <div class="app-container">
-    <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
+    <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline label-width="80px">
       <el-form-item label="申请日期" prop="startTime">
         <el-date-picker
           v-model="queryParams.startTime"
@@ -31,6 +31,40 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="转出工程" prop="backProId">
+        <el-select
+          v-model="queryParams.backProId"
+          placeholder="请选择工程"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in impProOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="转入工程" prop="leaseProId">
+        <el-select
+          v-model="queryParams.leaseProId"
+          placeholder="请选择工程"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in leaseProjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable>
           <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -56,7 +90,6 @@
 
     <el-table :data="tableList" fit highlight-current-row style="width: 100%" :max-height="650" v-loading="loading">
       <!-- 多选 -->
-      <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
       <el-table-column
         type="index"
         width="55"
@@ -127,6 +160,7 @@
 
 <script>
 import { getReceiveList, receiveDelete } from '@/api/business/index'
+import { getProjectList, } from '@/api/lease/apply'
 
 export default {
   name: 'DirectApplyRecord',
@@ -141,7 +175,9 @@ export default {
         status: '', // 审核状态
         timeRange: [], // 日期范围
         startTime: '', // 开始日期
-        endTime: '' // 结束日期
+        endTime: '', // 结束日期
+        backProId: '', // 转出工程
+        leaseProId: '', // 转入工程
       },
       // 考勤状态
       statusOptions: [
@@ -164,11 +200,15 @@ export default {
         { label: '业务联单', prop: 'businessCode', showTooltip: true },
       ],
       // 表格数据
-      tableList: []
+      tableList: [],
+      impProOptions: [],//转出工程下拉
+      leaseProjectList: [],
     }
   },
   created() {
     this.getList()
+    this.getImpProOptions()
+    this.getLeaseProjectList()
   },
   methods: {
     // 查询
@@ -204,10 +244,23 @@ export default {
         this.loading = false
       }
     },
-    // 多选
-    selectionChange(val) {
-      console.log('selectionChange', val)
+
+    async getImpProOptions() {
+        const res = await getProjectList({ departName: null })
+        this.impProOptions = res.data.map(item => ({
+          label: item.proName,
+          value: item.proId
+        }))
     },
+
+    async getLeaseProjectList() {
+        const res = await getProjectList({ departName: null,enableFilter: false })
+        this.leaseProjectList = res.data.map(item => ({
+          label: item.proName,
+          value: item.proId
+        }))
+    },
+    
     handleAdd() {
       console.log('领料申请')
       this.$router.push({ path: '/materialsStation/straight/directApply' })
@@ -265,15 +318,16 @@ export default {
         }
 
         const currentTime = formatTime(new Date())
-        let fileName = `直转记录_${currentTime}.xLsx`
-        let url = '/material/directRotation/export'
+        let fileName = `直转记录_${currentTime}.xlsx`
+        let url = '/material/directRotation/exportDetail'
         const params = { ...this.queryParams }
         console.log('🚀 ~ 导出 ~ params:', params)
         this.download(url, params, fileName)
       } catch (error) {
         console.log('导出数据失败', error)
       }
-    }
+    },
+
   }
 }
 </script>