From 12476828f11d4062bfb994470d3b32a01474e071 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 04 二月 2021 21:46:28 +0800
Subject: [PATCH] 调整菜单
---
WebTM/views/基础资料/生产基础资料/H_ProcessDetail.html | 6 +-
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 23 +++++++++--
WebTM/views/基础资料/生产基础资料/H_ProcessList.html | 11 +++--
WebTM/views/index.html | 24 ++++++------
WebTM/WebTM.csproj | 4 +-
5 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 14f0cc8..c622c65 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/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>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4709022..6e60777 100644
--- a/WebTM/WebTM.csproj
+++ b/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" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 258cd5f..5b86336 100644
--- a/WebTM/views/index.html
+++ b/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>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessDetail.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessDetail.html"
similarity index 97%
rename from "WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessDetail.html"
rename to "WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessDetail.html"
index 590ab77..c17923f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessDetail.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/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;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessList.html"
similarity index 94%
rename from "WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessList.html"
rename to "WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessList.html"
index 3d44a52..ffcc8fd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/H_ProcessList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/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,
--
Gitblit v1.9.1