From 18f1fb7790f7bee708c0f23e8d582df7c2c78b09 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 30 May 2024 16:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/common/basic.js     |  8 ++++++--
 fe/PDA/common/pdabasic.css | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js
index 9550522bc..de34cae6a 100644
--- a/fe/PDA/common/basic.js
+++ b/fe/PDA/common/basic.js
@@ -6,7 +6,9 @@ export function getJobStatuStyle(val) {
 	else if (val == 1) return 'open'
 	else if (val == 2) return 'pending'
 	else if (val == 3) return 'completed'
-	else if (val == 4) return 'close'
+	else if (val == 4) return 'partial'
+	else if (val == 8) return 'close'
+	else if (val == 9) return 'cancelled '
 	else if (val == 30) return 'close'
 }
 //任务状态
@@ -16,7 +18,9 @@ export function getJobStatuDesc(val) {
 	else if (val == 1) return '待处理'
 	else if (val == 2) return '进行中'
 	else if (val == 3) return '完成'
-	else if (val == 4) return '关闭'
+	else if (val == 4) return '部分完成'
+	else if (val == 8) return '关闭'
+	else if (val == 9) return '作废'
 	else if (val == 30) return '等待'
 	else return '其他'
 }
diff --git a/fe/PDA/common/pdabasic.css b/fe/PDA/common/pdabasic.css
index 06290efc2..49101bcd8 100644
--- a/fe/PDA/common/pdabasic.css
+++ b/fe/PDA/common/pdabasic.css
@@ -271,6 +271,17 @@
 	background-color: #F56C6C;
 	color: #FFFFFF;
 }
+/* 部分完成 */
+.partial {
+	background-color: #21DF4B;
+	color: #FFFFFF;
+}
+
+/* 作废 */
+.cancelled {
+	background-color: #EF5222;
+	color: #FFFFFF;
+}
 
 /* 等待 */
 .close {