Jjie
/
OMAY_WMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2 Commits
ff5c1d4e87 ... a6c6c2ff64

Author SHA1 Message Date
Juj a6c6c2ff64 Merge branch 'master' of http://119.3.29.177:3000/Jjie/OMAY_WMS
6 months ago
Juj 08d5b0f953 no message
6 months ago
3 changed files with 312 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 17
      WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
  2. 248
      WMS-BS/NFine.Web/Areas/SystemManage/Views/CommonReport/Index.cshtml
  3. 78
      WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSSDN.cshtml

17
WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
View File

@ -102,21 +102,22 @@
else if (MeasureEnable == true && cretePageCountEnable == true) {
if (InvAmountEnable == true && AmountEnable == true) {
$("#minPackQty").attr("disabled", "disabled");
// $("#minPackQty").attr("disabled", "disabled");
$("#thisCreateQty").attr("disabled", "disabled");
$("#Amount").change(Amount_Change);
$("#cretePageCount").change(cretePageCount_Change);
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
//if (YAmount == 0) {
// $.modalMsg("源头单据辅计量数量不可0,请确认！", "warning");
// return;
//}
}
else {
$("#Amount").attr("disabled", "disabled");
$("#cretePageCount").attr("disabled", "disabled");
minPackQtyEnable = true;
cretePageCountEnable = true;
// $("#Amount").attr("disabled", "disabled");
// $("#cretePageCount").attr("disabled", "disabled");
// $("#thisCreateQty").attr("disabled", "disabled");
$("#minPackQty").change(minPack_Change);
$("#cretePageCount").change(cretePageCount_Change);
$("#thisCreateQty").change(thisCreate_Change);
}
}
@ -489,7 +490,7 @@
//最小+张数
function minPackAndcretePageCount() {
debugger;
var minPackQty = $("#minPackQty").val() * 1;//最小包装量
minPackQty = minPackQty.toFixed(6);
var cretePageCount = $("#cretePageCount").val() * 1;//张数

248
WMS-BS/NFine.Web/Areas/SystemManage/Views/CommonReport/Index.cshtml
View File

@ -20,7 +20,7 @@
var mold = $.request("mold");
//var _MenuCaption = "";
var _MenuTag = "";
var Menu = $.request("Menu");
var _MenuID = "";//菜单ID
var _SourceID = "";//数据源ID
var _sqlTxt = "";//加上参数的sql
@ -58,7 +58,7 @@
//1、获取当前页菜单名
function GetMenuID() {
debugger
var cc = self.frameElement.getAttribute('id');
_MenuID = cc.replace("iframe", "");
//_MenuTag = $.request("MenuTag");
@ -137,6 +137,70 @@
var LogStr = GetLogStringByNum(parseInt(formatcol.LogStr));
if (FormatDataType != "日期型") {
//switch (LogStr) {
// case "等于": if (val == formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "不等于": if (val != formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "小于": if (val < formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "大于": if (val > formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "小于等于": if (val <= formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "大于等于": if (val >= formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "范围内": if (val >= formatcol.SValue && val <= formatcol.DValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "范围外": if (val < formatcol.SValue || val > formatcol.DValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "包含": if (val.indexOf(formatcol.SValue) != -1) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "头部包含": if (val.indexOf(formatcol.SValue) == 0) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "尾部包含": if (val.indexOf(formatcol.SValue) == formatcol.length - val.length) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "不包含": if (val.indexOf(formatcol.SValue) == -1) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
//}
switch (LogStr) {
case "等于": if (val == formatcol.SValue) {
if (IsRow) { _formatcols_Row.push(rr); }
@ -148,32 +212,32 @@
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "小于": if (val < formatcol.SValue) {
case "小于": if (Number(val) < Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "大于": if (val > formatcol.SValue) {
case "大于": if (Number(val) > Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "小于等于": if (val <= formatcol.SValue) {
case "小于等于": if (Number(val) <= Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "大于等于": if (val >= formatcol.SValue) {
case "大于等于": if (Number(val) >= Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "范围内": if (val >= formatcol.SValue && val <= formatcol.DValue) {
case "范围内": if (Number(val) >= Number(formatcol.SValue) && Number(val) <= Number(formatcol.DValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "范围外": if (val < formatcol.SValue || val > formatcol.DValue) {
case "范围外": if (Number(val) < Number(formatcol.SValue) || Number(val) > Number(formatcol.DValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
@ -208,9 +272,9 @@
{
var VV = val.substring(0, 10);
switch (LogStr) {
case "等于":
case "等于":
if (VV== formatcol.SValue) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
@ -252,7 +316,7 @@
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
}
}
@ -310,6 +374,34 @@
cellattr: addCellAttr,
}
}
else if (ColCaption == '文件名' && Menu == '111') {
var FilePath;
debugger;
$.ajax({
url: "/SystemManage/CommonReport/GetFilePath?" + Math.random(),
dataType: "json",
async: false,
success: function (data) {
debugger;
FilePath = data.FilePath;
}
});
obj = {
label: ColCaption,
name: ColFiledName,
width: ColWidth,
align: "left",
sortable: sortable,
formatter: function (cellvalue, options, rowObject) {
var html = "";
if (cellvalue != "" && cellvalue != null) {
html = " <a href='../../../File/" +FilePath+ cellvalue + "' download='" + cellvalue + "' style='color:blue;'>" + cellvalue + "</a>";
}
return html;
}
}
}
else {
obj = {
label: ColCaption,
@ -585,8 +677,8 @@
});
}
function btn_ExportAll()
{
var condion = new Array();
@ -635,7 +727,87 @@
});
}
//新增类型
function btn_Create() {
if (Menu == "111") {
$.modalOpen({
id: "ICSConfigurationAdd",
title: "新增",
url: "/WMS/ICSDeliveryNotice/ICSDeliveryNoticeApplyNegAdd" + "?" + Math.random(),
width: "1000px",
height: "800px",
callBack: function (iframeId) {
top.frames[iframeId].submitForm();
}
});
} else {
}
}
//删除库位
function btn_Delete() {
var objArr = '';
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
for (var i = 0; i < objList.length; i++) {
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
//objArr += "'" + rowData.ID + "',";
if (objArr == "") {
objArr = '\'' + rowData.ID + '\'';
} else {
objArr = objArr + ',' + '\'' + rowData.ID + '\'';
}
}
if (objArr == '') {
$.modalAlertNew("WMS00001");
return;
}
if (Menu == "111") {
$.deleteForm({
url: "/WMS/ICSDeliveryNotice/DeleteICSDeliveryNotice" + "?" + Math.random(),
param: { keyValue: JSON.stringify(objArr) },
success: function () {
$.currentWindow().$("#gridList").trigger("reloadGrid");
}
})
} else {
}
}
//修改类型
function btn_Update() {
if (Menu == "111") {
var objArr = '';
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
for (var i = 0; i < objList.length; i++) {
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
//objArr += "'" + rowData.ID + "',";
if (objArr == "") {
objArr = '\'' + rowData.ID + '\'';
} else {
objArr = objArr + ',' + '\'' + rowData.ID + '\'';
}
}
if (objArr == '') {
$.modalAlertNew("WMS00001");
return;
}
$.modalOpen({
id: "Details",
title: "修改",
url: "/WMS/ICSDeliveryNotice/ICSDeliveryNoticeApplyNegUpdate?ID=" + objArr + "&" + Math.random(),
width: "1000px",
height: "1200px",
callBack: function (iframeId) {
top.frames[iframeId].submitForm();
}
});
} else {
}
}
function btnPrint() {
debugger;
// var mold = 'FP0001'; //条码打印
@ -654,6 +826,43 @@
}
objArr = "" + objArr + "|";
arr.push(objArr);
Arguments = JSON.stringify(arr);
sessionStorage.setItem("Arguments", Arguments); // 存储参数
$.modalOpen({
id: "PrintLot",
title: "打印",
url: "/WMS/Print/PrintViewBySession?mold=" + mold + "&" + Math.random(),
width: "550px",
height: "1000px",
callBack: function (iframeId) {
top.frames[iframeId].submitForm();
}
});
}
//支持两个参数的打印功能
function btnPrint2() {
debugger;
// var mold = 'FP0001'; //条码打印
var objArr = '';
var objArr2 = '';
var arr = [];
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
for (var i = 0; i < objList.length; i++) {
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
objArr += "'" + rowData.ID + "',";
objArr2 += "'" + rowData.Code + "',";
}
objArr = objArr.slice(0, objArr.length - 1);
objArr2 = objArr2;
if (objArr == "") {
$.modalAlertNew("WMS00003");
return;
}
objArr = "" + objArr + "|" + objArr2;
arr.push(objArr);
$.modalOpen({
@ -678,6 +887,9 @@
<div class="btn-group">
<a class="btn btn-primary" onclick="$.reload()"><span class="glyphicon glyphicon-refresh"></span></a>
<a class="btn btn-primary dropdown-text" onclick="btn_Filter()"><i class="fa fa-filter"></i>过滤</a>
<a id="NF-Create" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Create()"><i class="fa fa-pencil-square-o"></i>新增</a>
<a id="NF-Delete" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Delete()"><i class="fa fa-pencil-square-o"></i>删除</a>
<a id="NF-Update" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Update()"><i class="fa fa-pencil-square-o"></i>修改</a>
</div>
<div class="btn-group">
@ -685,10 +897,12 @@
<a id="NF-Cols" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Cols()"><i class="fa fa-text-width"></i>列设置</a>
<a id="NF-GridFormat" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_GridFormat()"><i class="fa fa-bars"></i>个性化设置</a>
<a id="NF-Clear" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Clear()"><i class="fa fa-times"></i>清空本菜单所有设置</a>
<a id="NF-ExportAll" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ExportAll()"><i class="fa fa-download"></i>全部导出</a>
<a id="NF-WatchPanel" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_WatchPanel()"><i class="fa fa-download"></i>看板显示</a>
<a id="NF-ColsVisible" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ColsVisible()"><i class="fa fa-user"></i>角色显示栏位</a>
<a id="NF-ExportAll" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ExportAll()"><i class="fa fa-download"></i>全部导出</a>
<a id="NF-WatchPanel" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_WatchPanel()"><i class="fa fa-download"></i>看板显示</a>
<a id="NF-ColsVisible" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ColsVisible()"><i class="fa fa-user"></i>角色显示栏位</a>
<a id="NF-Print" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnPrint()"><i class="fa fa-pencil-square-o"></i>打印</a>
<a id="NF-Print2" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnPrint2()"><i class="fa fa-pencil-square-o"></i>打印</a>
@*<a id="NF-GridHeader" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_GridHeader()"><i class="fa fa-list-alt"></i>多表头设置</a>*@
</div>

78
WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSSDN.cshtml
View File

@ -117,6 +117,7 @@
}
});
}
//个性化栏位背景色
function addCellAttr(rowId, val, rawObject, cm, rdata) {
var rr = ' id=\'' + cm.name + '' + rowId + "\' ";
@ -136,6 +137,70 @@
var LogStr = GetLogStringByNum(parseInt(formatcol.LogStr));
if (FormatDataType != "日期型") {
//switch (LogStr) {
// case "等于": if (val == formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "不等于": if (val != formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "小于": if (val < formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "大于": if (val > formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "小于等于": if (val <= formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "大于等于": if (val >= formatcol.SValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "范围内": if (val >= formatcol.SValue && val <= formatcol.DValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "范围外": if (val < formatcol.SValue || val > formatcol.DValue) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "包含": if (val.indexOf(formatcol.SValue) != -1) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "头部包含": if (val.indexOf(formatcol.SValue) == 0) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "尾部包含": if (val.indexOf(formatcol.SValue) == formatcol.length - val.length) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
// case "不包含": if (val.indexOf(formatcol.SValue) == -1) {
// if (IsRow) { _formatcols_Row.push(rr); }
// else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
// }
// break;
//}
switch (LogStr) {
case "等于": if (val == formatcol.SValue) {
if (IsRow) { _formatcols_Row.push(rr); }
@ -147,32 +212,32 @@
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "小于": if (val < formatcol.SValue) {
case "小于": if (Number(val) < Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "大于": if (val > formatcol.SValue) {
case "大于": if (Number(val) > Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "小于等于": if (val <= formatcol.SValue) {
case "小于等于": if (Number(val) <= Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "大于等于": if (val >= formatcol.SValue) {
case "大于等于": if (Number(val) >= Number(formatcol.SValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "范围内": if (val >= formatcol.SValue && val <= formatcol.DValue) {
case "范围内": if (Number(val) >= Number(formatcol.SValue) && Number(val) <= Number(formatcol.DValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
break;
case "范围外": if (val < formatcol.SValue || val > formatcol.DValue) {
case "范围外": if (Number(val) < Number(formatcol.SValue) || Number(val) > Number(formatcol.DValue)) {
if (IsRow) { _formatcols_Row.push(rr); }
else { rr += "style='background-color:" + formatcol.Color + "'"; return rr; }
}
@ -262,6 +327,7 @@
return rr;
}
//个性化栏位背景色
function addCellAttr_ID(rowId, val, rawObject, cm, rdata) {
var rr = ' id=\'' + cm.name + '' + rowId + "\' ";

Write Preview
|||||||
100:0
Loading…
Cancel
Save