From c50a874feed1ceceb18e0d42f95e4094eef98128 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期四, 27 十一月 2025 23:32:56 +0800
Subject: [PATCH] 修改了代码
---
src/views/archiveManager/index.vue | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/src/views/archiveManager/index.vue b/src/views/archiveManager/index.vue
index 443ddbf..dcb1fb4 100644
--- a/src/views/archiveManager/index.vue
+++ b/src/views/archiveManager/index.vue
@@ -208,12 +208,19 @@
/>
</el-form-item>
<el-form-item label="鎵弿鍔犲伐鍏徃" prop="scanningCompany">
- <el-input
+ <el-select
v-model="queryParams.scanningCompany"
- placeholder="璇疯緭鍏ユ壂鎻忓姞宸ュ叕鍙�"
+ placeholder="璇烽�夋嫨鎵弿鍔犲伐鍏徃"
clearable
- @keyup.enter.native="handleQuery"
- />
+ @change="handleQuery"
+ >
+ <el-option
+ v-for="item in projectCompanyOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="妗ｆ绠�(瀹�)鍙�" prop="archiveRoomNumber">
<el-input
@@ -824,7 +831,14 @@
<el-input v-model="form.projectNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�" />
</el-form-item>
<el-form-item label="鎵弿鍔犲伐鍏徃" prop="scanningCompany">
- <el-input v-model="form.scanningCompany" placeholder="璇疯緭鍏ユ壂鎻忓姞宸ュ叕鍙�" />
+ <el-select v-model="form.scanningCompany" placeholder="璇烽�夋嫨鎵弿鍔犲伐鍏徃">
+ <el-option
+ v-for="item in projectCompanyOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="妗ｆ绠�(瀹�)鍙�" prop="archiveRoomNumber">
<el-input v-model="form.archiveRoomNumber" placeholder="璇疯緭鍏ユ。妗堢(瀹�)鍙�" />
@@ -876,6 +890,8 @@
maxId: 0,
// 椤圭洰鍚嶇О閫夐」
projectOptions: [],
+ // 椤圭洰绠＄悊鍏徃閫夐」
+ projectCompanyOptions: [],
// 妗ｆ绫诲瀷閫夐」
recordTypeOptions: [],
//鍦板尯绫诲瀷
@@ -1002,6 +1018,7 @@
this.getRecordTypes()
this.getZoneOptions()
this.fetchProjectOptions()
+ this.fetchProjectCompanyOptions()
this.getList()
},
watch: {
@@ -1116,6 +1133,23 @@
console.error('鑾峰彇椤圭洰鍚嶇О鍒楄〃澶辫触:', error)
}
},
+
+ async fetchProjectCompanyOptions() {
+ try {
+ const response = await listAllProjectName()
+ console.log("椤圭洰绠＄悊鍏徃鏁版嵁:", response)
+ // 浠庨」鐩暟鎹腑鎻愬彇绠＄悊鍏徃淇℃伅
+ const companies = [...new Set(response.data.data.map(item => item.companyName).filter(Boolean))]
+ console.log("椤圭洰绠＄悊鍏徃鏁版嵁:", companies)
+
+ this.projectCompanyOptions = companies.map(company => ({
+ value: company,
+ label: company
+ }))
+ } catch (error) {
+ console.error('鑾峰彇椤圭洰绠＄悊鍏徃鍒楄〃澶辫触:', error)
+ }
+ },
/** 鑾峰彇妗ｆ绫诲瀷鍒楄〃 */
getRecordTypes() {
return new Promise((resolve) => {
@@ -1157,24 +1191,28 @@
const queryParams = { ...this.queryParams }
// 澶勭悊绫诲埆鍙锋悳绱�
- if (queryParams.categoryType || queryParams.categoryZone || queryParams.categoryYear || queryParams.categorySeq || queryParams.categorySeqEnd) {
- // 鏋勫缓鍩虹閮ㄥ垎
+ if ((queryParams.categoryType || queryParams.categoryZone || queryParams.categoryYear) && (queryParams.categorySeq || queryParams.categorySeqEnd)) {
+ // 鏋勫缓鍩虹閮ㄥ垎锛堝墠涓変釜瀛楁淇濇寔涓�鑷达級
const baseParts = []
if (queryParams.categoryType) baseParts.push(queryParams.categoryType)
if (queryParams.categoryZone) baseParts.push(queryParams.categoryZone)
if (queryParams.categoryYear) baseParts.push(queryParams.categoryYear)
const baseCategory = baseParts.join('-')
- // 鍒ゆ柇鏄崟涓簭鍙锋悳绱㈣繕鏄寖鍥存悳绱�
- if (queryParams.categorySeq && queryParams.categorySeqEnd) {
- // 鑼冨洿鎼滅储锛氭瀯寤哄紑濮嬪拰缁撴潫绫诲埆鍙�
- queryParams.categoryNumberStart = baseCategory ? baseCategory + '-' + queryParams.categorySeq : queryParams.categorySeq
- queryParams.categoryNumberEnd = baseCategory ? baseCategory + '-' + queryParams.categorySeqEnd : queryParams.categorySeqEnd
- } else if (queryParams.categorySeq) {
- // 鍗曚釜搴忓彿鎼滅储锛氭瀯寤哄畬鏁寸殑绫诲埆鍙�
- queryParams.categoryNumber = baseCategory ? baseCategory + '-' + queryParams.categorySeq : queryParams.categorySeq
+ // 鏋勫缓寮�濮嬬被鍒彿
+ if (queryParams.categorySeq) {
+ queryParams.categoryNumberStart = baseCategory + '-' + queryParams.categorySeq
}
+ // 鏋勫缓缁撴潫绫诲埆鍙�
+ if (queryParams.categorySeqEnd) {
+ queryParams.categoryNumberEnd = baseCategory + '-' + queryParams.categorySeqEnd
+ } else if (queryParams.categorySeq) {
+ // 濡傛灉娌℃湁缁撴潫搴忓彿锛屽垯缁撴潫绫诲埆鍙蜂笌寮�濮嬬被鍒彿鐩稿悓
+ queryParams.categoryNumberEnd = queryParams.categoryNumberStart
+ }
+ console.log(queryParams)
+ console.log("9999999999999999999")
// 鍒犻櫎鍗曠嫭鐨勫瓧娈碉紝閬垮厤閲嶅鎼滅储
delete queryParams.categoryType
delete queryParams.categoryZone
@@ -1232,6 +1270,12 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.resetForm("queryForm")
+ // 纭繚绫诲埆鍙风浉鍏冲瓧娈佃瀹屽叏閲嶇疆
+ this.queryParams.categoryType = null
+ this.queryParams.categoryZone = null
+ this.queryParams.categoryYear = null
+ this.queryParams.categorySeq = null
+ this.queryParams.categorySeqEnd = null
this.handleQuery()
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.9.1