From 8d7134c8d37e08b1a737a02e6abca807d6220774 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期五, 26 三月 2021 17:33:06 +0800
Subject: [PATCH] 冲突解决
---
WebTM/views/index.html | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b8944bd..e468a0b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -157,7 +157,7 @@
<dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">涓婃灦褰掕繕鍗�</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_LookingForBillList.html" target="main_self_frame">鎵捐揣鍗曞垪琛�</a></dd>
<!--<dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html" target="main_self_frame">涓婃灦褰掕繕鍗曞垪琛�</a></dd>
- <dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_WaitingLookingFor.html" target="main_self_frame">寰呭彂鍖烘壘璐�</a></dd>-->
+ <dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_WaitingLookingFor.html" target="main_self_frame">寰呭彂鍖烘壘璐�</a></dd>-->
</dl>
</dd>
</dl>
@@ -185,6 +185,17 @@
</dl>
</li>
<li data-name="set" class="layui-nav-item">
+ <a><i class="layui-icon layui-icon-set"></i><cite>妯℃不鍏风鐞�</cite></a>
+ <dl class="layui-nav-child">
+ <dd class="layui-nav-itemed">
+ <a>妯℃不鍏风鐞�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsRepairWorkBillList.html">妯℃不鍏风淮淇伐鍗曡〃鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </li>
+ <li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd class="layui-nav-itemed">
@@ -198,7 +209,7 @@
<a>鎶ヨ〃鍒嗘瀽</a>
<dl class="layui-nav-child">
<!--<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">杞﹂棿杩涘害璺熻釜琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">鐢熶骇宸ュ簭鏄庣粏琛�</a></dd>-->
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">鐢熶骇宸ュ簭鏄庣粏琛�</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">澧欏挃宸ヨ祫缁熻鎶ヨ〃</a></dd>
</dl>
</dd>
@@ -207,6 +218,12 @@
<dl class="layui-nav-child append" id="append">
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</a></dd>
+ </dl>
+ </dd>
+ <dd class="layui-nav-itemed">
+ <a>涓嶈壇鍝佽瘎瀹″崟</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">涓嶈壇鍝佸垪琛�</a></dd>
</dl>
</dd>
</dl>
@@ -437,10 +454,10 @@
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
var judgeMorPCflag = judgeMorPC();
if (!judgeMorPCflag) {//绉诲姩绔�
- var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+ var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
$("#append").prepend(dd);
} else {//PC绔�
- var dd = '<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
+ var dd = '<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
$("#append").prepend(dd);
}
});
--
Gitblit v1.9.1