Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/views/costAudit/auditInfo/archivesManage/archiveList.vue

@@ -14,15 +14,16 @@
             ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="地区:" prop="region">
-            <el-select
-              v-model="searchForm.region"
-              placeholder="请选择地区"
+          <el-form-item label="地区:" prop="areaCode">
+            <el-cascader
+              v-model="searchForm.areaCode"
+              :options="districtTree"
+              :props="districtTreeCascaderProps"
+              :show-all-levels="false"
               clearable
-              style="width: 150px"
-            >
-              <el-option label="山西省" value="山西省"></el-option>
-            </el-select>
+              placeholder="请选择地区"
+              style="width: 200px"
+            ></el-cascader>
           </el-form-item>
 
           <el-form-item label="卷宗号:" prop="archiveNo">
@@ -42,6 +43,14 @@
             >
               查询
             </el-button>
+            <el-button
+              plain
+              type="primary"
+              icon="el-icon-refresh"
+              @click="handleReset"
+            >
+              重置
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -69,12 +78,12 @@
           align="center"
         />
         <el-table-column
-          prop="region"
+          prop="areaName"
           label="立项地区"
           width="100"
           header-align="center"
           align="center"
-        />
+        ></el-table-column>
         <el-table-column
           prop="archiveNo"
           label="卷宗号"
@@ -89,7 +98,7 @@
           show-overflow-tooltip
           header-align="center"
           align="left"
-          min-width="180"
+          min-width="170"
         >
           <template slot-scope="scope">
             <div class="cell-content cell-content--left">
@@ -100,7 +109,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="auditObject"
+          prop="auditedUnitName"
           label="监审对象"
           header-align="center"
           align="left"
@@ -114,13 +123,13 @@
           width="150"
         />
         <el-table-column
-          prop="archiver"
+          prop="archiveUser"
           label="归档人"
           width="100"
           header-align="center"
           align="center"
         />
-        <el-table-column label="操作" align="center" width="180" fixed="right">
+        <el-table-column label="操作" align="center" width="250" fixed="right">
           <template slot-scope="scope">
             <span class="action-buttons">
               <el-button
@@ -135,7 +144,7 @@
                 size="small"
                 @click="handleDownload(scope.row)"
               >
-                回归档
+                档案详情
               </el-button>
               <el-button
                 type="text"
@@ -168,16 +177,18 @@
 <script>
   import taskDetail from '@/components/task/taskDetail.vue'
   import { getArchiveList } from '@/api/audit/archive'
+  import { regionMixin } from '@/mixins/useDict'
   export default {
     name: 'ArchiveList',
     components: {
       taskDetail,
     },
+    mixins: [regionMixin],
     data() {
       return {
         searchForm: {
           projectYear: '2025',
-          region: '',
+          areaCode: [],
           archiveNo: '',
         },
         loading: false,
@@ -203,7 +214,10 @@
             currentPage: this.pagination.currentPage,
             pageSize: this.pagination.pageSize,
             projectYear: this.searchForm.projectYear,
-            region: this.searchForm.region,
+            areaCode:
+              this.searchForm.areaCode && this.searchForm.areaCode.length > 0
+                ? this.searchForm.areaCode[this.searchForm.areaCode.length - 1]
+                : '',
             archiveNo: this.searchForm.archiveNo,
             isGd: 1, // 已归档
           }
@@ -213,29 +227,13 @@
           if (response && response.value) {
             // 获取记录列表
             const records = response.value.records || []
-            // 只加载第一级数据，过滤掉子任务
-            const firstLevelRecords = records.filter(
-              (record) => !record.pid || record.pid === '0'
-            )
 
             // 转换数据格式
-            this.tableData = firstLevelRecords.map((record) => {
-              return {
-                id: record.id,
-                year: record.projectYear || record.year || '',
-                region: record.region || '',
-                archiveNo: record.archiveNo || '',
-                projectName: record.projectName,
-                auditObject: record.auditedUnitName || record.auditObject || '',
-                auditPeriod: record.auditPeriod || '',
-                archiver: record.archiver || '',
-                projectId: record.projectId,
-                auditedUnitId: record.auditedUnitId,
-                taskId: record.id,
-              }
-            })
+            this.tableData = records
             // 设置总数
             this.pagination.total = response.value.total || 0
+            // 批量获取区域名称
+            this.fetchRegionNames(this.tableData, 'region')
           } else {
             this.tableData = []
             this.pagination.total = 0
@@ -256,7 +254,7 @@
       handleReset() {
         this.searchForm = {
           projectYear: '2025',
-          region: '',
+          areaCode: [],
           archiveNo: '',
         }
         this.pagination.currentPage = 1