From 676db89a661ba8af8da04f4503c39b1bc0d2c25e Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期二, 10 六月 2025 16:11:04 +0800
Subject: [PATCH] bug修改
---
pages/QC/LLJ/List.vue | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/pages/QC/LLJ/List.vue b/pages/QC/LLJ/List.vue
index 41f45ce..cffc6d1 100644
--- a/pages/QC/LLJ/List.vue
+++ b/pages/QC/LLJ/List.vue
@@ -30,7 +30,6 @@
</view>
</view>
-
<!-- 妫�楠屽崟鍒楄〃 -->
<view class="inspection-list">
<!-- 妫�楠屽崟鍗＄墖1 -->
@@ -38,10 +37,16 @@
<view class="card-header">
<text class="badge urgent" v-if="item.urgentFlag == 1">鎬ユ枡</text>
<text class="badge urgent" v-if="item.jycs == 1">瓒呮椂</text>
+
<text class="badge normal" v-if="item.ftype == 1">濮斿</text>
<text class="badge normal" v-if="item.first == 1">棣栨鏉ユ枡</text>
<text class="card-title">妫�楠屽崟鍙�: {{item.releaseNo}}</text>
- <text class="status pending" v-if="item.userName==null && item.activeTab==0">寰呭垎閰�</text>
+ <view v-if="item.userName == null && item.activeTab == 0">
+ <text class="status pending" :class="{ 'emergency-pending': item.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!' }">
+ {{ item.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!' ? '绱ф�ユ斁琛�/寰呭垎閰�' : '寰呭垎閰�' }}
+ </text>
+
+ </view>
<text class="status assigned" v-if="item.userName!=null && item.activeTab==0">宸插垎閰�</text>
<text class="status pass" v-if="item.fcheckResu=='鍚堟牸' && item.activeTab==1">鍚堟牸</text>
<text class="status Unqualified" v-if="item.fcheckResu=='涓嶅悎鏍�' && item.activeTab==1">涓嶅悎鏍�</text>
@@ -121,7 +126,7 @@
pageIndex: 1,
limit: 20,
IQCJL: 0,
- options: ['椤圭洰', '鐗╂枡缂栧彿', '鐗╂枡鍚嶇О', '渚涘簲鍟�', '閲囪喘鍛�'],
+ options: ['椤圭洰', '鐗╂枡缂栧彿', '鐗╂枡鍚嶇О', '渚涘簲鍟�', '閲囪喘鍛�','鍒拌揣鍗曞彿','妫�楠屽崟鍙�','鐗╂枡瑙勬牸'],
searchValue: ''
}
@@ -140,7 +145,10 @@
1: 'itemNo', // 鐗╂枡缂栧彿
2: 'itemName', // 鐗╂枡鍚嶇О
3: 'suppName', // 渚涘簲鍟�
- 4: 'purchaser' // 閲囪喘鍛�
+ 4: 'purchaser' ,// 閲囪喘鍛�
+ 5: 'lotNO' ,// 鍒拌揣鍗曞彿
+ 6: 'releaseNO' ,// 妫�楠屽崟鍙�
+ 7: 'ItemModel',//鐗╂枡瑙勬牸
};
this.selectedField = fieldMap[this.optionsIndex];
},
@@ -173,7 +181,8 @@
result: result,
SearchValue: this.searchValue,
selectedIndex: this.optionsIndex, //涓嬫媺妗嗙瓫閫夋潯浠�
- userIndex: this.projectIndex
+ userIndex: this.projectIndex,
+ emergency:this.meergency,
}
}).then(res => {
if (this.pageIndex === 1) {
@@ -183,6 +192,7 @@
this.inspectionList.forEach((item, index) => {
this.$set(item, 'activeTab', this.activeTab);
this.$set(item, 'IQCJL', this.IQCJL);
+ this.$set(item, 'EMERGENCY', item.emergency || null);
});
} else {
@@ -193,6 +203,7 @@
this.inspectionList.forEach((item, index) => {
this.$set(item, 'activeTab', this.activeTab);
this.$set(item, 'IQCJL', this.IQCJL);
+ this.$set(item, 'EMERGENCY', item.emergency || null);
});
}
@@ -467,6 +478,12 @@
color: white;
}
+ .badge.emergency {
+ background-color: #ff4d4f;
+ color: white;
+ margin-right: 5px;
+ }
+
.status {
font-size: 12px;
padding: 4px 8px;
@@ -607,5 +624,9 @@
order: 4;
width: 100%;
} */
+ .status.emergency-pending {
+ background-color: #ff0000; /* 绾㈣壊鑳屾櫙 */
+ color: white;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3