From 9036218de581fe0e930604d1587e98027224fd5d Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 22 九月 2021 08:31:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
/dev/null | 124 -----------------------------------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 31 +++++----
WebTM/layuiadmin/Scripts/webConfig.js | 7 +-
WebTM/views/index.html | 12 ++--
WebTM/WebTM.csproj | 1
5 files changed, 27 insertions(+), 148 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d1a78b4..34dc5c2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -527,7 +527,6 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\test.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Xt_ORGANIZATIONSList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PropertyList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e6b0b20..65518cb 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,15 +2,16 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
- //var WEBURL = "http://localhost/API/";
+ //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
+ //var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
+ var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 59f3960..b4e3e18 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -274,12 +274,12 @@
</dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
<!--<dd>
- <a>宸ヨ壓璺嚎</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
- <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
- </dl>
- </dd>-->
+ <a>宸ヨ壓璺嚎</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
+ </dl>
+ </dd>-->
</dl>
</li>
<!-- 鐢熶骇绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html"
deleted file mode 100644
index 80491be..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/test.html"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘�
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <title>娴嬭瘯 - layui</title>
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/zgqlayui.css">
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-</head>
-<body>
-
- <div class="layui-container">
- <div id="test12" class="demo-tree-more"></div>
- </div>
-
-
-
- <!-- 寮曞叆 layui.js 鐨� <script> 鏍囩鏈�濂芥斁缃湪 html 鏈熬 -->
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script>
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
- var $ = layui.$
- , layer = layui.layer
- , form = layui.form
- , laypage = layui.laypage
- , element = layui.element
- , tree = layui.tree
- , laydate = layui.laydate
- , util = layui.util;
-
- var sWhere = "";
-
- $.ajax({
- url: GetWEBURL() + '/Gy_Department/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- var treeData = LoadTree(data);
- console.log(treeData);
- tree.render({
- elem: '#test12',
- data: treeData,
- id: 'treeId',
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- onlyIconControl: false
- });
- }
- });
-
-
-
-
-
-
- //鎸夐挳浜嬩欢
- util.event('lay-demo', {
- getChecked: function (othis) {
- var checkedData = tree.getChecked('treeId'); //鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
-
- layer.alert(JSON.stringify(checkedData), { shade: 0 });
- console.log(checkedData);
- }
- , setChecked: function () {
- tree.setChecked('treeId', [12, 16]); //鍕鹃�夋寚瀹氳妭鐐�
- }
- , reload: function () {
- //閲嶈浇瀹炰緥
- tree.reload('treeId', {
-
- });
-
- }
- });
-
- //瑙﹀彂浜嬩欢
- util.event('test-active', {
- 'test-form': function () {
- layer.open({
- type: 1
- , resize: false
- , shadeClose: true
- , content: ['<ul class="layui-form" style="margin: 10px;">'
- , '<li class="layui-form-item">'
- , '<label class="layui-form-label">杈撳叆妗�</label>'
- , '<div class="layui-input-block">'
- , '<input class="layui-input" name="field1">'
- , '</div>'
- , '</li>'
- , '<li class="layui-form-item">'
- , '<label class="layui-form-label">閫夋嫨妗�</label>'
- , '<div class="layui-input-block">'
- , '<select name="field2">'
- , '<option value="A">A</option>'
- , '<option value="B">B</option>'
- , '<select>'
- , '</div>'
- , '</li>'
- , '<li class="layui-form-item" style="text-align:center;">'
- , '<button type="submit" lay-submit lay-filter="*" class="layui-btn">鎻愪氦</button>'
- , '</li>'
- , '</ul>'].join('')
- , success: function (layero) {
- layero.find('.layui-layer-content').css('overflow', 'visible');
-
- form.render().on('submit(*)', function (data) {
- layer.msg(JSON.stringify(data.field));
- });
- }
- });
- }
- });
- });
-
- </script>
-</body>
-</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 77771b6..1153b96 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -85,15 +85,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
</div>
</script>
</form>
@@ -122,6 +113,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , util = layui.util
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = "";
@@ -148,7 +140,6 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
-
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -171,6 +162,7 @@
get_FastQuery();
});
//#endregion
+
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
//鍒濆鍖栦富琛ㄥ垪琛�
@@ -190,7 +182,7 @@
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- $("#btnSearch").click();
+ //$("#btnSearch").click();
sWhere = "";
}
//#endregion
@@ -307,6 +299,7 @@
table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var HMainID = datas.hmainid;
+ var wait = layer.load();
$.ajax({
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
type: "GET",
@@ -315,10 +308,13 @@
if (data1.count == 1) {
option2.data = data1.data;
table.render(option2);
+ layer.close(wait);
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(wait);
}
}, error: function () {
+ layer.close(wait);
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
@@ -333,14 +329,21 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: true
- , height: 256
+ , height: 300
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
//{ field: 'hmainid', title: 'hmainid', width: 90 }
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
, { field: '绫诲瀷', title: '绫诲瀷' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true }
+ , {
+ field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: function (d) {
+ if (d.鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
//, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
@@ -397,7 +400,7 @@
elem: '#mainTable2'
//, toolbar: '#toolbarDemo'
, page: true
- , height: 226
+ , height: 300
, cellMinWidth: 90
, cols: [[
--
Gitblit v1.9.1