冲突解决

WYB

2021-03-26 8d7134c8d37e08b1a737a02e6abca807d6220774

 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">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序汇报/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
              var dd = '<dd><a href="车间管理/工序流转/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序流转/MES_StationOutBill_PDA.html">工序出站汇报单PDA</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);
          }
      });