From a4f18f9d2ebcb4d6d8e44e89af9152083dd0b19f Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 11 八月 2022 21:30:25 +0800
Subject: [PATCH] 列宽测试
---
WebTM/views/user/login.html | 3 +--
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 4 ++--
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 46 +++++++++++++++++++++++-----------------------
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
4 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d75e26b..ced9ad9 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,10 +7,10 @@
//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://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://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 79e9672..203229a 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -195,8 +195,7 @@
var PassWord = $("#LAY-user-login-password").val();
layer.load(3);
$.ajax({
- type: "get",
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetUser",
+ type: "get",
url: GetWEBURL() + "/Web/GetUser",
data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
success: function (result) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 192afa7..e983876 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -99,10 +99,10 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
- //鍒濆鍖栫晫闈�
- set_ClearBill();
//
var HModName = "JIT_NeedMaterPlanBillList";
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
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 9bd0004..de8d10f 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"
@@ -142,10 +142,10 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
- //鍒濆鍖栫晫闈�
- set_ClearBill();
//
var HModName = "Sc_ProcessExchangeBillList";
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
//#endregion
@@ -517,8 +517,8 @@
//闅愯棌鍒楄缃�
function get_HideColumn2() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ colName += option2.cols[0][i]["title"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -641,50 +641,50 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option2.cols[0].length - 2; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
+ option2.cols[0][i + 1]["hide"] = true;
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
+ option2.cols[0][i + 1]["width"] = dataCols[3];
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option2.cols[0][i + 1]["style"] = "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ // option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
//} else {
- // option.cols[0][i + 1]["width"] = "";
+ // option2.cols[0][i + 1]["width"] = "";
//}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
+ if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+ option2.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
- option.cols[0][i + 1]["align"] = "left";
+ option2.cols[0][i + 1]["align"] = "left";
break;
case "M":
- option.cols[0][i + 1]["align"] = "center";
+ option2.cols[0][i + 1]["align"] = "center";
break;
case "R":
- option.cols[0][i + 1]["align"] = "right";
+ option2.cols[0][i + 1]["align"] = "right";
break;
}
}
//鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ if (option2.cols[0][i]["fixed"] != null) {
+ option2.cols[0][i]["fixed"] = null;
}
else {
break;
@@ -693,15 +693,15 @@
//鍐荤粨鍒�
if (data1.data[0].HFixCols != 0) {
for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
data1.data[0].HFixCols += 1;
}
- option.cols[0][i + 1]["fixed"] = "left";
+ option2.cols[0][i + 1]["fixed"] = "left";
}
}
- table.render(option);
+ table.render(option2);
} else {
- table.render(option);
+ table.render(option2);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
--
Gitblit v1.9.1