From c4b152ab383336ba63a554aaf27e5120c0761b5a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 十二月 2024 16:54:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/IpadIndex.html |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index a996612..d05528c 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -101,8 +101,32 @@
                                 html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                 //html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
                                 //html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
-                                //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
+                                //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';                                
                                 html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
+                                switch (LoadData[i - 1].HStatus) {
+                                    case "绌洪棽":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "寮�鏈�":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "鍋滄満":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "鐢熶骇":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "缁翠慨杩涜涓�":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "缁翠慨缁撴潫":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;
+                                    case "缁翠慨缁堟":
+                                        html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+                                        break;                                  
+                                    default:
+                                }
                                 html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
                                 html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
                                 html1 += '</dd>';
@@ -233,8 +257,7 @@
                                         break;
                                     case "瀹屽伐":
                                         html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
-                                        break;
-                                    default:
+                                        break;                                    
                                 }
                                 html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
                                 html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
@@ -1489,16 +1512,16 @@
                                     <span class="imgtitle">棣栨</span>
                                 </div>
                             </div>
-                            <div class="layui-col-sm12 layui-col-md4">
-                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
+                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
+                                <div class="cnt bottomright">
                                     <span class="layui-icon layui-icon-search imgicon"></span>
                                     <span class="imgtitle">宸℃</span>
                                 </div>
                             </div>
-                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
-                                <div class="cnt bottomright">
+                            <div class="layui-col-sm12 layui-col-md4">
+                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
                                     <span class="layui-icon layui-icon-search imgicon"></span>
-                                    <span class="imgtitle">杩囩▼妫�楠�</span>
+                                    <span class="imgtitle">鏈</span>
                                 </div>
                             </div>
                         </div>

--
Gitblit v1.9.1