From cdc6decaadbc0abbe46167a0796fa7f701443d7f Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 05 九月 2025 13:14:35 +0800
Subject: [PATCH] llj优化
---
manifest.json | 2
pages/QC/LLJ/List.vue | 70 +++++++++++++++++++++--------------
store/index.js | 4 +-
3 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/manifest.json b/manifest.json
index 9529a92..889d4ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "GS-MES-AP",
"appid" : "__UNI__F08FAE3",
"description" : "",
- "versionName" : "1.1.3.5",
+ "versionName" : "1.1.3.6",
"versionCode" : 1,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/LLJ/List.vue b/pages/QC/LLJ/List.vue
index b4ad25c..27c565e 100644
--- a/pages/QC/LLJ/List.vue
+++ b/pages/QC/LLJ/List.vue
@@ -78,10 +78,7 @@
<text class="info-label">鏁伴噺</text>
<text class="info-content highlight">{{item.fcovertQty}}</text>
</view>
- <view class="info-item" v-if="item.jyxm !== null && item.jyxm !== undefined">
- <text class="info-label">妫�楠岄」鐩�</text>
- <text class="info-content">{{item.jyxm}}</text>
- </view>
+
</view>
<view class="info-row">
<view class="info-item">
@@ -368,18 +365,18 @@
// 鏍规嵁妫�楠岄」鐩暟閲忚幏鍙栫姸鎬佹枃鏈�
getStatusText(item) {
- // 濡傛灉娌℃湁妫�楠岄」鐩紝鏄剧ず"鏈淮鎶�"
- if (!item.inspectionItemCount || item.inspectionItemCount === 0) {
+ // 浣跨敤JYXM瀛楁鍒ゆ柇鏄惁缁存姢浜嗘楠岄」鐩�
+ if (item.jyxm === 0 || item.jyxm === '0') {
return '鏈淮鎶�';
}
- // 濡傛灉鏈夋楠岄」鐩紝鏄剧ず"寰呮楠�"
+ // 濡傛灉缁存姢浜嗘楠岄」鐩紝鏄剧ず"寰呮楠�"
return '寰呮楠�';
},
// 鍒ゆ柇鏄惁涓烘湭缁存姢涓旈潪绱ф�ユ斁琛�
isUnmaintainedAndNotEmergency(item) {
- // 妫�鏌ユ槸鍚︿负鏈淮鎶わ紙娌℃湁妫�楠岄」鐩級
- const isUnmaintained = !item.inspectionItemCount || item.inspectionItemCount === 0;
+ // 浣跨敤JYXM瀛楁妫�鏌ユ槸鍚︿负鏈淮鎶わ紙0琛ㄧず鏈淮鎶わ級
+ const isUnmaintained = item.jyxm === 0 || item.jyxm === '0';
// 妫�鏌ユ槸鍚︿负闈炵揣鎬ユ斁琛�
const isNotEmergency = item.lotNo1 !== '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!';
return isUnmaintained && isNotEmergency;
@@ -396,32 +393,44 @@
// 瀵规楠屽崟鍒楄〃杩涜鎺掑簭
sortInspectionList(list) {
return list.sort((a, b) => {
- // 绗竴浼樺厛绾э細鏈彁浜ゆ牎楠岀殑绱ф�ユ斁琛�
- const aIsEmergencyPending = a.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!' && this.activeTab === 0;
- const bIsEmergencyPending = b.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!' && this.activeTab === 0;
+ // 绗竴浼樺厛绾э細鐘舵�佸垎缁勶紙鏈彁浜� vs 宸叉彁浜わ級
+ const aIsSubmitted = a.status === '宸叉彁浜�';
+ const bIsSubmitted = b.status === '宸叉彁浜�';
- if (aIsEmergencyPending && !bIsEmergencyPending) return -1;
- if (!aIsEmergencyPending && bIsEmergencyPending) return 1;
+ if (aIsSubmitted && !bIsSubmitted) return 1; // 宸叉彁浜ょ殑鎺掑湪鍚庨潰
+ if (!aIsSubmitted && bIsSubmitted) return -1; // 鏈彁浜ょ殑鎺掑湪鍓嶉潰
- // 绗簩浼樺厛绾э細鏈淮鎶ゆ楠岄」鐩紙闈炵揣鎬ユ斁琛岋級
- const aIsUnmaintained = this.isUnmaintainedAndNotEmergency(a);
- const bIsUnmaintained = this.isUnmaintainedAndNotEmergency(b);
-
- if (aIsUnmaintained && !bIsUnmaintained) return -1;
- if (!aIsUnmaintained && bIsUnmaintained) return 1;
-
- // 绗笁浼樺厛绾э細鍒涘缓鏃堕棿锛堟湭鎻愪氦鐨勬寜鍒涘缓鏃堕棿鍗囧簭锛屽凡鎻愪氦鐨勬寜鎻愪氦鏃堕棿闄嶅簭锛�
- if (this.activeTab === 0) {
- // 鏈楠岋細鎸夊垱寤烘椂闂村崌搴忥紙瓒婃棭瓒婇潬鍓嶏級
+ // 鏈彁浜ゅ崟鎹殑鎺掑簭閫昏緫
+ if (!aIsSubmitted && !bIsSubmitted) {
+ // 绗竴浼樺厛绾э細绱ф�ユ斁琛�
+ const aIsEmergency = a.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!';
+ const bIsEmergency = b.lotNo1 === '绱ф�ユ斁琛岋紝璇峰嬁楠岄��!';
+
+ if (aIsEmergency && !bIsEmergency) return -1;
+ if (!aIsEmergency && bIsEmergency) return 1;
+
+ // 绗簩浼樺厛绾э細鏈淮鎶ゆ楠岄」鐩紙浣跨敤JYXM瀛楁锛�
+ const aIsUnmaintained = a.jyxm === 0 || a.jyxm === '0';
+ const bIsUnmaintained = b.jyxm === 0 || b.jyxm === '0';
+
+ if (aIsUnmaintained && !bIsUnmaintained) return -1;
+ if (!aIsUnmaintained && bIsUnmaintained) return 1;
+
+ // 绗笁浼樺厛绾э細鍒涘缓鏃堕棿锛堝垱寤烘椂闂磋秺鏅氳秺闈犲悗锛�
const aCreateTime = new Date(a.createDate || 0);
const bCreateTime = new Date(b.createDate || 0);
- return aCreateTime - bCreateTime;
- } else {
- // 宸叉楠岋細鎸夋彁浜ゆ椂闂撮檷搴忥紙瓒婃櫄瓒婇潬鍓嶏級
+ return aCreateTime - bCreateTime; // 鍗囧簭锛氭棭鐨勫湪鍓嶏紝鏅氱殑鍦ㄥ悗
+ }
+
+ // 宸叉彁浜ゅ崟鎹殑鎺掑簭閫昏緫
+ if (aIsSubmitted && bIsSubmitted) {
+ // 鎸夋彁浜ゆ椂闂存帓搴忥紙鎻愪氦鐨勮秺鏅氳秺闈犲墠锛�
const aIqcTime = new Date(a.iqcDate || 0);
const bIqcTime = new Date(b.iqcDate || 0);
- return bIqcTime - aIqcTime;
+ return bIqcTime - aIqcTime; // 闄嶅簭锛氭櫄鐨勫湪鍓嶏紝鏃╃殑鍦ㄥ悗
}
+
+ return 0;
});
}
}
@@ -653,6 +662,11 @@
color: #2c3e50;
line-height: 1.5;
}
+
+ .info-content.unmaintained {
+ color: #e74c3c;
+ font-weight: 600;
+ }
.highlight {
font-weight: 600;
diff --git a/store/index.js b/store/index.js
index 3fb8f02..d50ed24 100644
--- a/store/index.js
+++ b/store/index.js
@@ -10,9 +10,9 @@
networkFlag:'鍐呯綉',
serverURLInt:'http://192.168.11.251:10055',//鏈嶅姟鍣ㄤ綋妫� 10.0.1.104:10054
serverURL:'http://localhost:10055',//鏈湴璋冭瘯鍦板潃
- serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
+ //serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
//serverAPI:'http://192.168.1.22:10054/api',//鍐呯綉
- //serverAPI:'http://36.26.21.214:10055/api',
+ serverAPI:'http://36.26.21.214:10055/api',
ftpServer:'ftp://36.26.21.214',//FTP鏈嶅姟鍣ㄥ湴鍧�
}
},
--
Gitblit v1.9.3