From e7a42dd70ac5df2eafab9c55dd21891acccdfdae Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 13 三月 2023 15:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/index.html |   66 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index d9be408..8460ca6 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -30,20 +30,20 @@
                             <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="http://www.layui.com/admin/" target="_blank" title="鍓嶅彴">
                             <i class="layui-icon layui-icon-website"></i>
                         </a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item" lay-unselect>
                         <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
                             <i class="layui-icon layui-icon-refresh-3"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
-                    </li>
-                    <li class="layui-nav-item" lay-unselect style="color: black;">
+                    </li>-->
+                    <li class="layui-nav-item" lay-unselect style="color: black;margin-left:290px">
                         <span>鐧诲綍缁勭粐锛�</span>
                         <label id="Organization"></label>
                     </li>
@@ -59,11 +59,11 @@
                             <span class="layui-badge-dot"></span>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="theme">
                             <i class="layui-icon layui-icon-theme"></i>
                         </a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="note">
                             <i class="layui-icon layui-icon-note"></i>
@@ -74,22 +74,22 @@
                             <i class="layui-icon layui-icon-screen-full"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item" lay-unselect>
+                    <li class="layui-nav-item" lay-unselect style="margin-right:12px;">
                         <a href="javascript:;">
                             <cite>
                                 <label name="UserName" id="UserName"></label>
                             </cite>
                         </a>
                         <dl class="layui-nav-child">
-                            <dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
+                            <!--<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>-->
                             <dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
                             <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
                         </dl>
                     </li>
 
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                         <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
                     </li>
@@ -443,9 +443,17 @@
                                 <dd>
                                     <a>宸ュ簭娴佽浆</a>
                                     <dl class="layui-nav-child">
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗$淮鎶�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
                                         <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
                                         <dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
@@ -474,7 +482,8 @@
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
@@ -588,6 +597,8 @@
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。缁存姢</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">鍣ㄥ叿淇濆吇瑙勭▼鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillEdit.html">鍣ㄥ叿鐐规瑙勭▼鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">鍣ㄥ叿鐐规瑙勭▼鍗曠淮鎶�</a></dd>
                                         <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>-->
                                     </dl>
                                 </dd>
@@ -621,6 +632,10 @@
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutButNotStepInList.html">鍣ㄥ叿鍒嗘寮忚皟鍑烘湭璋冨叆鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBill.html">鍣ㄥ叿鎶ュ簾鐢宠鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBillList.html">鍣ㄥ叿鎶ュ簾鐢宠鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBill.html">鍣ㄥ叿鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBillList.html">鍣ㄥ叿鐘舵�佸彉鏇村崟缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -628,6 +643,8 @@
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -690,6 +707,12 @@
                                         <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBillList.html">璁惧澶囧搧澶囦欢缁存姢</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBill.html">璁惧澶囧搧澶囦欢鍙樻洿鍗�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">璁惧澶囧搧澶囦欢鍙樻洿鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBill.html">璁惧鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">璁惧鐘舵�佸彉鏇村崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBill.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBill.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -703,6 +726,10 @@
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillEdit.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -903,9 +930,10 @@
                                     <a>鍏敤璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">鐗╂枡鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd>
-                                        <dd><a lay-href="">浠撲綅鍒楄〃null</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">鑱屽憳鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">閮ㄩ棬鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd>
@@ -935,6 +963,9 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Operator.html">涓氬姟鍛樺垪琛�</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Work.html">浣滀笟鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Staff.html">鍛樺伐鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatus.html">鍣ㄥ叿鐘舵�佸垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_EquipStatus.html">璁惧鐘舵�佸垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxMIX.html">绋庣粍鍚堝垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -982,6 +1013,13 @@
                                     </dl>
                                 </dd>
                                 <dd>
+                                    <a>浜у搧璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQty.html">渚涘簲鍟嗙墿鏂欒祫鏂�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欑淮鎶�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
                                     <a>鏁版嵁瀛楀吀</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)</a></dd>
@@ -1008,6 +1046,7 @@
                                         <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅缁存姢</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillSubTypeList.html">绯荤粺鍗曟嵁瀛愮被鍨嬫煡璇�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -1025,6 +1064,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_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
                                         <dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
                                         <dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
                                     </dl>

--
Gitblit v1.9.1