zgq
2021-02-04 12476828f11d4062bfb994470d3b32a01474e071
调整菜单
3个文件已修改
2 文件已重命名
68 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/H_ProcessDetail.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/H_ProcessList.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>01/24/2021 11:27:32</publishTime>
      <publishTime>02/04/2021 21:25:29</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>01/24/2021 11:27:32</publishTime>
      <publishTime>02/04/2021 21:25:29</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
@@ -576,6 +576,9 @@
    <File Include="layuiadmin/Scripts/jquery-1.4.1.min.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/jquery-3.5.1.min.js">
      <publishTime>02/04/2021 21:11:28</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/json2.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
@@ -952,7 +955,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>01/26/2021 13:29:38</publishTime>
      <publishTime>02/04/2021 21:27:35</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1080,6 +1083,18 @@
    <File Include="views/公共页面/Kf_BarCodeEditDlg.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/基础资料/H_ProcessDetail.html">
      <publishTime>02/04/2021 21:11:28</publishTime>
    </File>
    <File Include="views/基础资料/H_ProcessList.html">
      <publishTime>02/04/2021 21:11:28</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>02/04/2021 21:11:28</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessList.html">
      <publishTime>02/04/2021 21:24:58</publishTime>
    </File>
    <File Include="views/工序汇报/MES_StationInBill.html">
      <publishTime>01/14/2021 14:48:04</publishTime>
    </File>
@@ -1159,7 +1174,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>02/04/2021 21:07:00</publishTime>
      <publishTime>02/04/2021 21:10:25</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
WebTM/WebTM.csproj
@@ -417,8 +417,8 @@
    <Content Include="views\仓库调拨\仓库调拨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\仓库调拨\仓库调拨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\公共页面\Kf_BarCodeEditDlg.html" />
    <Content Include="views\基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\H_ProcessList.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.html" />
    <Content Include="views\工序汇报\MES_StationInBill_PDA.html" />
    <Content Include="views\工序汇报\MES_StationInBill.html" />
    <Content Include="views\工序汇报\MES_StationInBillList.html" />
WebTM/views/index.html
@@ -11,7 +11,7 @@
    <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost ä¸‹å†è®¿é—®');
@@ -127,17 +127,6 @@
                  </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="基础资料/H_ProcessList.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">
@@ -157,6 +146,17 @@
                      </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">
                          <a>生产基础资料</a>
                          <dl class="layui-nav-child">
                              <dd><a lay-href="基础资料/生产基础资料/H_ProcessList.html">工序列表</a></dd>
                          </dl>
                      </dd>
                  </dl>
              </li>
              <li data-name="template" class="layui-nav-item">
                  <a href="javascript:;" lay-tips="验收入库" lay-direction="2">
                      <i class="layui-icon layui-icon-component"></i>
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/H_ProcessDetail.html
File was renamed from WebTM/views/»ù´¡×ÊÁÏ/H_ProcessDetail.html
@@ -6,7 +6,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <link href="../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
    <link href="../../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
    <title></title>
</head>
<body>
@@ -128,8 +128,8 @@
            </div>
        </div>-->
    </form>
    <script src="../../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script>
        function getUrlVars() {
            var vars = [], hash;
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/H_ProcessList.html
File was renamed from WebTM/views/»ù´¡×ÊÁÏ/H_ProcessList.html
@@ -6,9 +6,9 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <link href="../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
    <script src="../../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <link href="../../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
    <script src="../../../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <title></title>
    <style type="text/css">
@@ -43,6 +43,7 @@
            <button class="layui-btn layui-btn-sm" lay-event="isAll">验证是否全选</button>
        </div>
    </script>-->
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-xs" lay-event="detail">详细</a>
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
@@ -57,7 +58,7 @@
            //方法级渲染
            table.render({
                elem: '#ProcessTable'
                , url: GetWEBURL()+'/api/newBill/getProcessList'
                , url: GetWEBURL() + '/api/newBill/getProcessList'
                , where: {//参数条件设置
                    hName: hName.val(),
                    hNumber: hNumber.val(),
@@ -144,7 +145,7 @@
        function del(id) {
            var retData = new Object();
            $.ajax({
                url: GetWEBURL()+"/api/newBill/deleteProcess",
                url: GetWEBURL() + "/api/newBill/deleteProcess",
                type: "Get",
                dataType: "Json",
                async: false,