From d5f8c5ea1acfe1fc08f8ddf69dff6f5164eea683 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 二月 2024 13:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/index_QiaoYi.html | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 68b7114..bff9759 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -13,7 +13,7 @@
<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
<script language="JavaScript">
- //灞忚斀鍚庨��鎸夐挳
+ //灞忚斀鍚庨��鎸夐挳
history.pushState(null, null, document.URL);
window.addEventListener('popstate', function () {
history.pushState(null, null, document.URL);
@@ -495,6 +495,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKReport.html">鐢熶骇鍏ュ簱鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_BadReasonReport.html">涓嶈壇鍘熷洜鍒嗘瀽鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SC_DayRkReport.html">鐢熶骇鏃ヨ</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProcExchangeNoInReport.html">娴佽浆鍗℃湭鍏ュ簱鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SemiFinishedProductsReport.html">鍗婃垚鍝佹姤琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProcessErrStationReport.html">宸ュ簭寮傚父杩囩珯鎶ヨ〃</a></dd>
</dl>
@@ -619,6 +620,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeReport.html">瀹㈡埛搴旀敹璐︽鍒嗘瀽鎶ヨ〃</a></dd>
<dd><a lay-href="搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html">瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃</a></dd>
+ <dd><a lay-href="搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/YS_ContactBalReport.html">鏈熷垵浣欓鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
@@ -766,6 +768,7 @@
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserByUser.html">鐢ㄦ埛鍏宠仈鐢ㄦ埛</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>-->
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserCustomerList.html">鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
<!--<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>-->
<dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
@@ -837,15 +840,15 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "user/login.html"; });
}
- //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸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>';
- $("#append").prepend(dd);
- }
- if (!judgeMorPCflag) {//绉诲姩绔�
- window.location.href = 'index_Mobile_QiaoYi.html'
- }
+ ////鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸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>';
+ // $("#append").prepend(dd);
+ //}
+ //if (!judgeMorPCflag) {//绉诲姩绔�
+ // window.location.href = 'index_Mobile_QiaoYi.html'
+ //}
/* $("#LAY_app_flexible").click();*/
});
--
Gitblit v1.9.1