From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentListOfAll.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index c553327..de4d6d5 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -39,7 +39,7 @@
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
- dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
@@ -869,10 +869,16 @@
RepairOrderListComponent,
EquipmentCalibrationOrderComponent,
},
+ props: {
+ caytegoryParam: {
+ type: String,
+ default: 'all',
+ required: true,
+ },
+ },
data() {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
- caytegoryParam: 'all',
// 琛ㄥご
columns: [
{
@@ -1291,7 +1297,10 @@
this.ipagination.current = 1;
}
this.onClearSelected()
- var params = this.getQueryParams();//鏌ヨ鏉′欢
+ if(this.caytegoryParam !== 'all') {
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+ }
+ let params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
@@ -1434,6 +1443,11 @@
}
})
}
+ else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+ }
+ } else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
}
})
},
--
Gitblit v1.9.3