From 18ffbca9acaccd5099a7a63652f52210f59a7e40 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 19 九月 2024 11:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
WebRoot/js/hotkey.js | 497 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 361 insertions(+), 136 deletions(-)
diff --git a/WebRoot/js/hotkey.js b/WebRoot/js/hotkey.js
index 7f5bb6c..637d198 100644
--- a/WebRoot/js/hotkey.js
+++ b/WebRoot/js/hotkey.js
@@ -145,34 +145,36 @@
}
if (typeof (mygrid) != "undefined") {
if (typeof (panMain) != "undefined" && typeof (panMain[panIndex]) != "undefined")
- mygrid.excelTitle = new Base64().encode((panMain[panIndex].panelTitle == undefined ? "" : panMain[panIndex].panelTitle) + "~" + mygrid.gridTitle);// 闈㈡澘+鏍肩嚎鐨勫姩鎬佹爣棰�
+ mygrid.excelTitle = new Base64().encode((panMain[panIndex].panelTitle == undefined ? "" : panMain[panIndex].panelTitle) + "~" + mygrid.gridTitlefun());// 闈㈡澘+鏍肩嚎鐨勫姩鎬佹爣棰�
else
- mygrid.excelTitle = new Base64().encode("~" + mygrid.gridTitle);// a闈㈡澘+鏍肩嚎鐨勫姩鎬佹爣棰�
+ mygrid.excelTitle = new Base64().encode("~" + mygrid.gridTitlefun());// a闈㈡澘+鏍肩嚎鐨勫姩鎬佹爣棰�
var str = mygrid.exportExcl();
excelurl = str.split("&p&")[0];
- if (excelurl.indexOf("flag=") < 0) {
- excelurl += "flag=-1";
- }
TGData = str.split("&p&")[1].replace("TGData=", "");
} else {
if (typeof (panMain) != "undefined")
excelTitle = new Base64().encode((panMain[panIndex].panelTitle == undefined ? "" : panMain[panIndex].panelTitle) + "~" + "");// 闈㈡澘+鏍肩嚎鐨勫姩鎬佹爣棰�
- TGData = '{"Cfg":{"Sort":"","SortCols":"","SortTypes":"0","Group":"","GroupCols":"","SearchAction":"","TimeZone":"-480","ScrollLeft":"0","LeftScrollLeft":"0","ScrollTop":"0"},"CutFilter":{"Filter":""},"rowspan":"","Filters":[],"IO":{},"Fields":{"FieldsName":"" },"CutFilter":{"Filter":"" },"Exprs":{"expr":"" },"Cps":{"cp":"" },"rowspan":"","excelTitle":"fg==","Body":[{"Pos":"0"}]}';
+ TGData = '{"Cfg":{"Sort":"","SortCols":"","SortTypes":"0","Group":"","GroupCols":"","SearchAction":"","TimeZone":"-480","ScrollLeft":"0","LeftScrollLeft":"0","ScrollTop":"0"},"CutFilter":{"Filter":""},"rowspan":"","Filters":[],"IO":{},"Fields":{"FieldsName":""},"CutFilter":{"Filter":""},"Exprs":{"expr":""},"Cps":{"cp":""},"rowspan":"","excelTitle":"fg==","Body":[{"Pos":"0"}]}';
if (panMain[panIndex].panelTitle == null || panMain[panIndex].panelTitle == "") {
var doccode = $("#doccode").val();
if (doccode != null && doccode != "") {
panMain[panIndex].panelTitle = "doccode='" + doccode + "'";
}
}
- excelurl = "/gtGrid.do?m=load&where=" + (panMain[panIndex].panelTitle == undefined ? "" : panMain[panIndex].panelTitle) + "&formID=" + formId + "&winType=" + (formType == 16 ? 17 : formType) + "|0&flag=-1&autopaging=3&cp=0&formdatafilters=&pageSize=100&picFild=";
+ //16绫诲瀷鍗曠嫭澶勭悊
+ excelurl = "/gtGrid.do?m=load&where=" + (panMain[panIndex].panelTitle == undefined ? "" : panMain[panIndex].panelTitle) + "&formID=" + formId + "&winType=" + (formType == 496?497:formType)+ "|0&flag=-1&autopaging=3&cp=0&formdatafilters=&pageSize=100&picFild=";
}
- var obj = toJson(excelurl);
+ // 鍒涘缓涓�涓殣钘忕殑iframe锛岀敤浜庢帴鏀禘xcel鏂囦欢
+ // var iframe = $("<iframe>");
+ //iframe.attr('style', 'display:none');
+ //$('body').append(iframe);
+ var obj = toJson(excelurl);
var form = $("<form>");
form.attr('style', 'display:none');
form.attr('target', '');
form.attr('method', 'post');
- form.attr('action', "/gtGrid.do?m=" + obj.m);
+ form.attr('action', "/gtGrid.do?m="+ obj.m);
var input1 = $('<input>');
input1.attr('type', 'hidden');
input1.attr('name', 'autopaging');
@@ -186,12 +188,12 @@
var input3 = $('<input>');
input3.attr('type', 'hidden');
input3.attr('name', 'flag');
- input3.attr('value', obj.flag);
+ input3.attr('value', -1);
form.append(input3);
var input4 = $('<input>');
input4.attr('type', 'hidden');
input4.attr('name', 'formID');
- input4.attr('value', obj.formID);
+ input4.attr('value', formType==496?formId:obj.formID);
form.append(input4);
var input5 = $('<input>');
input5.attr('type', 'hidden');
@@ -221,7 +223,7 @@
var input10 = $('<input>');
input10.attr('type', 'hidden');
input10.attr('name', 'isExportExcel');
- input10.attr('value', obj.isExportExcel);
+ input10.attr('value', obj.isExportExcel==undefined?"0":obj.isExportExcel);
form.append(input10);
var input11 = $('<input>');
input11.attr('type', 'hidden');
@@ -231,45 +233,45 @@
var input12 = $('<input>');
input12.attr('type', 'hidden');
input12.attr('name', 'tbCols');
- input12.attr('value', obj.tbCols);
+ input12.attr('value', obj.tbCols==undefined?"":obj.tbCols);
form.append(input12);
$('body').append(form);
form.submit();
form.remove();
if (typeof (mygrid) != "undefined") mygrid.ReloadBody();
- top.myFresh.clickNode = false;
closeLoading();
}
function refalshGridOfColse() {
-
- var p_frame = parent.frames[inChangFrame];
- if (p_frame) {
- if (C_Grid != "") {
- var gr = eval('(' + C_Grid + ')');//寮瑰嚭鐨勭埗椤甸潰浼犺繃鏉ョ殑淇℃伅
- var pa = p_frame.Grids[gr.gridID];//寰楀埌grid
- if (pa.clickDb) {
- pa.clickDb = false;
- return;
- }
- if (pa && gr.clickGrid) {
- if (gr.toP == undefined || gr.toP == null || gr.toP == "null" || gr.toP == "") return;//娌℃湁闇�瑕佽繑鍥炲瓧娈碉紝涓嶄綔澶勭悊
- //澧炲姞濡傛灉褰撳墠椤甸潰鏄�31绫诲瀷寮瑰嚭浣滈�夋嫨鐢ㄥ垯闇�瑕佸垽鏂槸鍚﹀凡淇濆瓨浜嗘暟鎹墠缁欒繑鍥�
- if (gr.is31 && (this.getInsertedRecords().length > 0 || this.getUpdatedRecords().length > 0 || this.getDeletedRecords().length > 0)) {
- alert(this.GetText("isSave"));
- return;
- }
- var ower = gr.toP.split(";");//鑷〃
- var temp = [];
- var row = pa.Rows[gr.rowIDp];//涓夌偣寮瑰嚭鐨勬墍鍦ㄨ
- for (var i = 0; i < ower.length; i++) {
- temp[i] = row[ower[i]];
- }
- pa.threePop(temp, ower, row, null, -1);
- pa.EndEdit(0);
- }
- }
- }
+ return;
+//--涓嬮潰浠ｇ爜娌＄敤锛屽洜涓哄彇寰楃殑鏁版嵁涓虹┖銆傚啀鏇存柊娌℃剰涔変簡 by danaus 2024-03-20 15:59
+ /* var p_frame = parent.frames[inChangFrame];
+ if (p_frame) {
+ if (C_Grid != "") {
+ var gr = eval('(' + C_Grid + ')');//寮瑰嚭鐨勭埗椤甸潰浼犺繃鏉ョ殑淇℃伅
+ var pa = p_frame.Grids[gr.gridID];//寰楀埌grid
+ if (pa.clickDb) {
+ pa.clickDb = false;
+ return;
+ }
+ if (pa && gr.clickGrid) {
+ if (gr.toP == undefined || gr.toP == null || gr.toP == "null" || gr.toP == "") return;//娌℃湁闇�瑕佽繑鍥炲瓧娈碉紝涓嶄綔澶勭悊
+ //澧炲姞濡傛灉褰撳墠椤甸潰鏄�31绫诲瀷寮瑰嚭浣滈�夋嫨鐢ㄥ垯闇�瑕佸垽鏂槸鍚﹀凡淇濆瓨浜嗘暟鎹墠缁欒繑鍥�
+ if (gr.is31 && (this.getInsertedRecords().length > 0 || this.getUpdatedRecords().length > 0 || this.getDeletedRecords().length > 0)) {
+ alert(this.GetText("isSave"));
+ return;
+ }
+ var ower = gr.toP.split(";");//鑷〃
+ var temp = [];
+ var row = pa.Rows[gr.rowIDp];//涓夌偣寮瑰嚭鐨勬墍鍦ㄨ
+ for (var i = 0; i < ower.length; i++) {
+ temp[i] = row[ower[i]];
+ }
+ pa.threePop(temp, ower, row, null, -1);
+ pa.EndEdit(0);
+ }
+ }
+ }*/
}
function postCheck(y, grid) {//鐢辩洿鎺ユ寜纭鍚庢墠璋冪敤
@@ -436,10 +438,10 @@
function Base64() {
- // private property
+ // private property
_keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
- // public method for encoding
+ // public method for encoding
this.encode = function (input) {
var output = "";
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
@@ -465,7 +467,7 @@
return output;
}
- // public method for decoding
+ // public method for decoding
this.decode = function (input) {
var output = "";
var chr1, chr2, chr3;
@@ -492,7 +494,7 @@
return output;
}
- // private method for UTF-8 encoding
+ // private method for UTF-8 encoding
_utf8_encode = function (string) {
string = string.replace(/\r\n/g, "\n");
var utftext = "";
@@ -513,7 +515,7 @@
return utftext;
}
- // private method for UTF-8 decoding
+ // private method for UTF-8 decoding
_utf8_decode = function (utftext) {
var string = "";
var i = 0;
@@ -988,7 +990,7 @@
if (item.indexOf("_expr") > 0) continue;
var cell = row.insertCell(i);
var vlu = ob[item] == 'null' ? "" : ob[item];
- if (ob[item + "_expr"] == 0) {
+ if (ob[item + "_expr"]=== 0) {
vlu = "***";
cell.hd = ob[item];
}
@@ -1198,16 +1200,16 @@
},
close: function () {
layer.close(this.layIndex);
- //by danaus 2021/4/8 14:45
- if(this._flg_ == 2) {
- if (mygrid)
- mygrid.ReloadBody();
- }else if(this._flg_ == -1){
- //琛ㄧず鏄簭鍒楀彿鎵爜鍏ュ簱璋冪敤锛屼笉闇�瑕佸埛鏂伴〉闈�
- }else {
- if (location)
- location.reload();
- }
+ //by danaus 2021/4/8 14:45
+ if(this._flg_ == 2) {
+ if (mygrid)
+ mygrid.ReloadBody();
+ }else if(this._flg_ == -1){
+ //琛ㄧず鏄簭鍒楀彿鎵爜鍏ュ簱璋冪敤锛屼笉闇�瑕佸埛鏂伴〉闈�
+ }else {
+ if (location)
+ location.reload();
+ }
}
@@ -1216,7 +1218,15 @@
}
function codeScanning(state,formid,formtype,type){
- var url = "/general/SerialNumber/" + (type == "out" ? "deliveryPage.jsp?" : "warehousing.jsp?");
+ var page = "";
+ if (type == "out") {
+ page = "deliveryPage.jsp?";
+ } else if (type == "in") {
+ page = "warehousing.jsp?";
+ } else if (type == "cyc") {
+ page = "inventory.jsp?";
+ }
+ var url = "/general/SerialNumber/" + page;
var parm = "formid=" + formid + "&formtype=" + formtype + "&doccode=" + getDoc("doccode", ".value");
var isEdit = false;
if (state != null) {
@@ -1268,7 +1278,7 @@
gr.EndEdit(true);
var rowids = value.rowids;
for (var r in rowids) {
- gr.setSerialNumber("serialnumbers", (rowids[r] != "" ? rowids[r].join(";") : ""), r);
+ gr.setSerialNumber("serialnumbers", (rowids[r] != "" ? rowids[r].join(";") : ""), r);
}
if(isSave){//鏈夋敼鍔ㄨ繃鏄渶瑕佷繚瀛�
//澶勭悊淇濆瓨鑷姩鎵ц浜嬩欢
@@ -1362,14 +1372,21 @@
return lay;
}
function delemptyrefdata() {
- return;
+ return;
}
//瑙ｅ喅鏍肩嚎楂樺害闂
function gridHeight() {
try {
var panelHeight = (top.panelHeight == 0 ? document.documentElement.clientHeight : top.panelHeight);// 鑾峰彇椤甸潰鐨勬�婚珮搴�
var panelType = top.myFresh.panel[top.tabindex];// 鑾峰彇闈㈡澘鐨勭被鍨�
- if (';2;3;4;20;30;301;302;303;304;'.indexOf(';' + panelType + ';') != -1) {// 鏈夋爲褰㈢殑鐗规畩绐椾綋澶勭悊
+
+ // let panelControlDiv=$('.panelControlDiv');
+ // if(panelControlDiv && panelControlDiv.eq(0)){//鏄惁鏈夎繖涓猟iv灞� xin 2023-8-22 15:59:36
+ // //鍥哄畾杩欎釜灞傜殑鏈�澶ч珮搴︿负鑷�傚簲鑾峰彇鐨勯珮搴�,濡傛灉涓嶅浐瀹氫负鏈�澶ч珮搴︼紝鍦ㄦ湁42鎺т欢鏄剧ず灞傜殑鏃跺��,濡傛灉42鎺т欢鏄剧ず灞傚ぇ浜庤繖涓眰鐨勯珮搴﹁瘽浼氭妸浠栨拺楂樸��
+ // panelControlDiv.eq(0).css("max-height",panelControlDiv.outerHeight(true));
+ // }
+ // 鏈夋爲褰㈢殑鐗规畩绐椾綋澶勭悊
+ if (';2;3;4;20;30;301;302;303;304;'.indexOf(';' + panelType + ';') != -1) {
if (gridId.length == 0) return;
var panelWidth = document.documentElement.clientWidth;
var treeWidth = $('#wrappers').outerWidth(true);// 鏍戝舰鐨勫搴�
@@ -1378,33 +1395,44 @@
$('#' + gridId[0]).css('width', (panelWidth - treeWidth - 30) + 'px');
return;
}
- if (';1;9;10;15;17;18;497;499;'.indexOf(';' + panelType + ';') != -1 && typeof (formId) != 'undefined') {// 娓呭崟鍒楄〃椤甸潰
- var topPanelHeight = $('#top_table').outerHeight(true);
+
+ // 娓呭崟鍒楄〃椤甸潰
+ if (';1;9;10;15;17;18;19;497;499;'.indexOf(';' + panelType + ';') != -1 && typeof (formId) != 'undefined') {
+ var topPanelHeight = $('#top_table').outerHeight(true);//杩欎釜鏄ご閮ㄧ姸鎬佹爮楂樺害
if (topPanelHeight == null) {// 娌℃湁鏍囬鐨勯珮搴�
- topPanelHeight = $('#tplt-top').outerHeight(true)+10;
+ topPanelHeight = $('#tplt-top').outerHeight(true) + 10;
}
- panelHeight = panelHeight - 20;//鏂囧瓧棰滆壊璇存槑鍗犱簡20楂�
+ panelHeight = (panelHeight - topPanelHeight);//鎬婚珮搴� - 鐘舵�佹爮楂樺害
if (panelType == 1) {
- $('#' + gridId[0]).css('height', (panelHeight - topPanelHeight - 50) + 'px');// 鍑忓幓50鏄洜涓簃argin鍜宲adding鐨勫��
+ $('#' + gridId[0]).css('height', (panelHeight - 50) + 'px');// 鍑忓幓50鏄洜涓簃argin鍜宲adding鐨勫��
return;
}
- if (panelType == 10 || panelType == 18) {
- panelHeight = panelHeight - 8;//鏂囧瓧棰滆壊璇存槑鍗犱簡8楂�
+ panelHeight = (panelHeight - 60);//鏂囧瓧棰滆壊璇存槑鍗犱簡50楂�
+ if (panelType == 10 || panelType == 18 || panelType == 19) {
var panelTable0Height = $('#panelTable0').outerHeight(true);
- $('#' + gridId[0]).css('margin-bottom','0').css('margin-top','0');
- $('#' + gridId[0]).css('height', (panelHeight - topPanelHeight - panelTable0Height) + 5 + 'px');// 鍑忓幓25鏄洜涓簃argin鍜宲adding鐨勫��
+ panelHeight = panelHeight - panelTable0Height + 5;
+ $('#' + gridId[0]).css('margin-bottom', '0').css('margin-top', '0');
+ $('#' + gridId[0]).css('height', panelHeight + 'px');// 鍑忓幓25鏄洜涓簃argin鍜宲adding鐨勫��
return;
}
- var panelFormIdHeight = $('#panel_' + formId).outerHeight(true);
- if(panelFormIdHeight==null){
+ var panelFormIdHeight = $('#panel_' + formId).outerHeight(true);//闈㈡澘鎺т欢鍗犵敤鐨勯珮搴�
+ if (panelFormIdHeight == null) {
panelFormIdHeight = $('.main_talbe').outerHeight(true);
}
- $('#' + gridId[0]).css('height', (panelHeight - topPanelHeight - panelFormIdHeight - 10) + 'px');// 鍑忓幓50鏄洜涓簃argin鍜宲adding鐨勫��
+ panelHeight = (panelHeight - panelFormIdHeight);//鎬婚珮搴� - 闈㈡澘鎺т欢鍗犵敤鐨勯珮搴�
+ panelHeight = (panelHeight - 25);//鎬婚珮搴� - 鍏朵粬pdding绛夊洜绱狅紱
+ //鏂囧瓧棰滆壊璇存槑楂樺害
+ // let colorDescriptionContainer = $('.colorDescriptionContainer').outerHeight(true);
+ // if (colorDescriptionContainer != null) {
+ // colorDescriptionContainer = 40;
+ // }
+ // panelHeight = (panelHeight - colorDescriptionContainer);//鎬婚珮搴� - 鏂囧瓧棰滆壊璇存槑楂樺害
+ $('#' + gridId[0]).css('height', panelHeight + 'px');// 鍑忓幓50鏄洜涓簃argin鍜宲adding鐨勫��
return;
}
return;
} catch (e) {
- //$.messager.alert("鎿嶄綔鎻愮ず","鑾峰彇鏍肩嚎楂樺害鍑虹幇浜嗛敊璇紒"+e,"warning");
+ console.log("璋冭妭鏍肩嚎楂樺害鍑虹幇閿欒寮傚父銆�"+e);
}
}
@@ -1427,6 +1455,7 @@
if (this.Collection[Cid] == null) {//绗竴娆℃椂杩涘叆
this.getPanelParam(elem, Info, rod, Cid);//鑾峰彇閫氱敤灞炴��
}
+ this.PremissField(Info,this.Collection[Cid].wheres);//涓埆绐椾綋闇�瑕佹坊鍔犳潯浠惰繘鍘� 濡� 18绐椾綋琛ㄥ彿 xin 2023-2-8 08:46:12
// var scrollTop = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop;
this.Collection[Cid].top = elem.offsetTop + 26;//elem.offsetParent.offsetParent.offsetTop + elem.offsetParent.offsetTop + 28 - scrollTop;// 42鎺т欢div鐨則op鎺у埗
this.Collection[Cid].left = elem.offsetLeft;//elem.offsetParent.offsetParent.offsetLeft + elem.offsetParent.offsetLeft + 118;// 42绫诲瀷div鐨刲eft鎺у埗
@@ -1439,7 +1468,7 @@
var Cid = 'grid_table_' + col.rand;
var value="";
try {
- value = tg.Edit.Tag.value + "";
+ value = tg.Edit.Tag.value + "";
if (value == '' || this.inputValue == value) {
return;
}
@@ -1488,11 +1517,28 @@
list.wheres.sugg = Info.fk;
}
list.fk=Info.fk.toLowerCase().split(';');
- list.seekgroupid=Info.seekgroupid.toLowerCase().split(';');
+ list.seekgroupid=Info.seekgroupid.toLowerCase().split(';');//鎺ユ敹鑷韩瀛楁鍚�
list._pop_json={};
list.parm=list.wheres.sugg.split(';');
list.wheres.ft = Info.ft;
this.Collection[Cid] = list;
+ }
+ ,PremissField:function (Info,wheres) {//涓埆绐椾綋闇�瑕� 濡傦細18绫诲瀷琛ㄥ彿
+ if (wheres != null && wheres != '') {
+ let sPremissField = Info.spremissfield || '';//鑷韩鏉′欢瀛楁鍚�
+ let dPremissField = Info.dpremissfield || '';//澶栬〃鏉′欢瀛楁鍚�
+ wheres.formType = Info.ftformtype || 0;//琛ㄥ彿鐨勭獥浣撶被鍨�
+ wheres.parameter = "";
+ if (sPremissField != '' && dPremissField != '') {
+ let a = [];
+ sPremissField = sPremissField.split(";");
+ dPremissField = dPremissField.split(";");
+ for (let d = 0; d < dPremissField.length; d++) {
+ a.push(dPremissField[d] + "=" + $("#" + sPremissField[d]).val() || '');
+ }
+ wheres.parameter = a.join(";");
+ }
+ }
}
, getGrideParam: function (tg, elem, col, Cid,callback) {//鏍肩嚎闇�瑕佸埌鐨勫睘鎬�
var list = {};
@@ -1527,8 +1573,8 @@
list.array = [];
var array = $('#' + list.id).data('title');//鏄剧ず鐨勫瓧娈靛悕
if (typeof array == 'undefined'){//涓嶆槸鏈�鏂扮敓鎴愮殑鐣岄潰
- list.isOld=true;
- callback(false);
+ list.isOld=true;
+ callback(false);
}else{
if (array != null && array.length>0) {
array = eval('(' + array + ')');
@@ -1584,6 +1630,9 @@
for (i = 0; i < bens.length; i++) {
col = bens[i].toLowerCase();
if (col.Trim() != "") {
+ if (getDoc(col + "_expr", ".value") == 0) {//鏉冮檺鎺у埗灏变笉闇�瑕佸甫鍏ヨ繘鍘诲仛鏉′欢 xin 2024-6-24 10:10:06
+ continue;
+ }
value = getDoc(col, ".value");
// 閽堝 300029 璧勯噾甯愭埛
if (value == null) {
@@ -1652,6 +1701,31 @@
"data": '',//.data.item //瑙ｆ瀽鏁版嵁鍒楄〃
};
}
+ for(var i=0;i<res.count;i++){
+ var obj=res.data[i];
+ for(var o in obj) {
+ if (obj[o] != null && obj[o] != "" && isNaN(obj[o])) {
+ //console.log(obj[o]);
+ if ((obj[o] + "").match(/<("[^"]*"|'[^']*'|[^'">])*>/g) && (obj[o] + "").match(/<a[^>]*>|<img[^>]*>/g) == null) {
+ obj[o + "_escape"] = obj[o];
+ obj[o] = (obj[o] + "").replace(/</g, "<").replace(/>/g, ">");
+ }
+ }
+ //--- by danaus 2023-07-27 14:43
+ list.array.forEach(function (item, index) {
+ //澶勭悊5绫诲瀷鏃ユ湡鏍煎紡鏄剧ず
+ if (item.field == o && (item.controlType != undefined && item.controlType == 5)) {
+ var format = "yyyy-MM-dd";
+ if (item.displayformat != undefined && item.displayformat != null && item.displayformat != "") {
+ format = item.displayformat;
+ }
+ if (typeof (formatDate) == "function") {
+ obj[o] = formatDate(obj[o], format);
+ }
+ }
+ });
+ }
+ }
if (res instanceof Array) {
return {
"code": 0,//res.status, //瑙ｆ瀽鎺ュ彛鐘舵��
@@ -1699,7 +1773,7 @@
} else {
//鎵ц閲嶈浇
this.Env42table[list.id].reload({
- cols: [cols]//鏍囬鏁扮粍
+ cols: [cols]//鏍囬鏁扮粍
,page: {
curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
}
@@ -1738,9 +1812,19 @@
if (list.type == 0) {//闈㈡澘
var fk = list.fk;
var p=panMain[panIndex];
+ var encrypt = new JSEncrypt();
+ encrypt.setPublicKey(rsakey.pubkey);
for (var i = 0; i < fk.length; i++) {//璧嬪�肩粰椤甸潰
if (typeof data[fk[i]] != 'undefined') {
var v = (data[fk[i]] == null ? "" : data[fk[i]]);
+ //澶勭悊鍊兼槸html鏍囩鏍煎紡: 169 123<H 455>W 123锛屽洜涓烘樉绀烘椂鍊欏仛浜嗚浆涔夛紝杩欓噷鍙栧�煎氨闇�瑕佽繕鍘� by danaus 2023-07-04 09:34
+ if(data[fk[i]+"_escape"]!=undefined){
+ v=data[fk[i]+"_escape"];
+ }
+ if (getDoc(list.seekgroupid[i] + "_expr", ".value") != "" && getDoc(list.seekgroupid[i] + "_expr", ".value") == 0) {//鏉冮檺鎺у埗 鏄剧ず鏄熷彿 xin 2024-6-24 10:22:43
+ setDoc(list.seekgroupid[i] + "_expr_val", ".value='" + encrypt.encrypt(v) + "'");//鍔犲瘑鍊�
+ v = "******";
+ }
setDoc(list.seekgroupid[i], ".value='" + v + "'");
if (p.select[list.seekgroupid[i]] != null) {//鏈夌骇鑱斿埌31鎺т欢鐨勫瓧娈甸渶瑕佸姞杞� xin 2021-5-10 14:55:33
getSelect31(list.seekgroupid[i]);
@@ -1751,19 +1835,51 @@
}
}
} else if (list.type == 1) {//鏍肩嚎
+ //debugger;
var fileds = list.formfileds;
var V = [];
+ let arrayExpr = {};
+ let newExpr = {};
+ for (let name in data) {
+ //鍙栧嚭鏈夋潈闄愬瓧娈�
+ if (data[name + "_expr"] != undefined && data[name + "_expr"] === 0) {
+ arrayExpr[name] = 1;
+ }
+ }
+
for (var r = 0; r < fileds.length; r++) {
if (typeof data[fileds[r]] != 'undefined') {
- V.push((data[fileds[r]] != null ? data[fileds[r]] : ''));
+ //澶勭悊鍊兼槸html鏍囩鏍煎紡: 169 123<H 455>W 123锛屽洜涓烘樉绀烘椂鍊欏仛浜嗚浆涔夛紝杩欓噷鍙栧�煎氨闇�瑕佽繕鍘� by danaus 2023-07-04 09:34
+ var value = data[fileds[r]] != null ? data[fileds[r]] : '';
+ if (data[fileds[r] + "_escape"] != undefined) {
+ value = data[fileds[r] + "_escape"];
+ }
+ if (arrayExpr[fileds[r]] != undefined) {
+ //琛ㄧず杩欎釜鍊兼槸鍔犲瘑浜嗭紝闇�瑕佹敞鏄�
+ newExpr[list.to[r]] = value;
+ }
+ V.push(value);
} else {
V.push('');
}
}
if (list.gridIndex != null) {
var gd = Grids[list.gridIndex];
- // var row=gd.Rows[list.rowid];//涓夌偣寮瑰嚭鐨勬墍鍦ㄨ
- gd.threePop(V, list.to, GT.rowIDp, null, -1, null, null, list.Tfield);//璧嬪�肩粰椤甸潰
+ // var row=gd.Rows[list.rowid];//涓夌偣寮瑰嚭鐨勬墍鍦ㄨ,
+ // by danaus 2024-02-07 10:24 TODO 闇�瑕佸鍔犺繑鍥炴湁鏉冮檺琛ㄨ揪寮忕殑瀛楁锛屾洿鏂板搴旂殑瀛楁涓烘湁鏉冮檺琛ㄨ揪寮忥紝鍍�3鐐瑰脊鍑猴紝42閫夋嫨鍑烘潵鐨勬暟鎹繑鍥炴槸鏈夋潈闄愪负0鐨勫瓧娈碉紝鍒欑浉搴斿洖濉殑瀛楁涔熻璁剧疆鎴愭湁鏉冮檺涓�0鐨勫睘鎬�
+ //娓呯┖鍏宠仈
+
+ if (gd.Cols[list.Tfield] != undefined && gd.Cols[list.Tfield].emptyrefdata != undefined
+ && gd.Cols[list.Tfield].emptyrefdata != "") {
+ var ed = gd.Cols[list.Tfield].emptyrefdata.toLowerCase().split(";");
+ for (var i = 0; i < ed.length; i++) {
+ gd.SetValue(GT.rowIDp, ed[i], "", 0);
+ gd.RefreshCell(GT.rowIDp, ed[i]);
+ }
+ }
+ //澧炲姞浼爀xpr=0鐨勫瓧娈碉紝鎶婃潈闄愬睘鎬ф洿鏂板埌瀵瑰簲鐨勫瓧娈� by danaus 2024-02-23 10:07
+
+ gd.threePop(V, list.to, GT.rowIDp, null, -1, null, null, list.Tfield, newExpr);//璧嬪�肩粰椤甸潰
gd.EndEdit(0);
this.inputValue = "";
}
@@ -1790,20 +1906,26 @@
this.table42 = layui.table;
this.isControl42();
} else {
- var that=this;
- $("<link>").attr({
- rel: "stylesheet",
- type: "text/css",
- href: "/layui/css/layui.css"
- }).appendTo("head");
- $.getScript('/layui/layui.all.js', function () {
- if (typeof layui == 'undefined') {
- console.log('鑾峰彇42鎺т欢鎻掍欢灞傚け璐ワ紒');
- return null;
- }
- that.table42 = layui.table;
- that.isControl42();
- })
+ // var that=this;
+ // let u=location.hostname;
+ // let url=location.port;
+ // try {
+ // $("<link>").attr({
+ // rel: "stylesheet",
+ // type: "text/css",
+ // href: u+":"+url + "/layui/css/layui.css"
+ // }).appendTo("head");
+ // $.getScript(u+":"+url + '/layui/layui.all.js', function () {
+ // if (typeof layui == 'undefined') {
+ // console.log('鑾峰彇42鎺т欢鎻掍欢灞傚け璐ワ紒');
+ // return null;
+ // }
+ // that.table42 = layui.table;
+ // that.isControl42();
+ // })
+ // }catch (e) {
+ // console.log('鑾峰彇layui鎻掍欢淇℃伅鍑虹幇閿欒');
+ // }
}
}
, isControl42: function () {
@@ -1843,45 +1965,45 @@
};
//鎵ц鏀舵鏄剧ず浜岀淮鐮佹垨閫�娆�
function OpenPayAndRefund(doccode,type,formid){
- if(type=="pay"){//鏄剧ず浜岀淮鐮�
- let doc=doccode;
- var url = "/general/onlinePayment/payment.jsp?orderNo=" + doc+"&formId="+formid;
- layui.layer.open({
- type: 2,
- area: ['700px', '500px'],
- title: false,
- content: url,
- cancel: function (index, layero) {
- var envt = $(layero).find("iframe")[0].contentWindow;
- if (envt != null) {
- if (!envt.isChang) {
- if (!confirm("杩樻病鏈夋敮浠橈紝纭畾鍏抽棴鍚楋紵")) {
- return false;
- }
- }
- if (envt.ws != null) {
- envt.ws.close();
+ if(type=="pay"){//鏄剧ず浜岀淮鐮�
+ let doc=doccode;
+ var url = "/general/onlinePayment/payment.jsp?orderNo=" + doc+"&formId="+formid;
+ layui.layer.open({
+ type: 2,
+ area: ['700px', '500px'],
+ title: false,
+ content: url,
+ cancel: function (index, layero) {
+ var envt = $(layero).find("iframe")[0].contentWindow;
+ if (envt != null) {
+ if (!envt.isChang) {
+ if (!confirm("杩樻病鏈夋敮浠橈紝纭畾鍏抽棴鍚楋紵")) {
+ return false;
}
}
- layer.closeAll();
- getReductionURL(doc);
- }
- });
- }else{//纭畾
- $.ajax({
- url: "/gtGrid.do?m=newTran&formid="+formid+"&docCode="+doccode,
- type: "get",
- async: false,
- success: function (res) {
- if(res.state==-1) {
- layer.alert(res.msg,function (){location.reload();});
- }else{
- location.reload();
+ if (envt.ws != null) {
+ envt.ws.close();
}
- }, error: function (e, h, a) {
- layer.alert(e.responseText,function (){location.reload();} );
}
- });
+ layer.closeAll();
+ getReductionURL(doc);
+ }
+ });
+ }else{//纭畾
+ $.ajax({
+ url: "/gtGrid.do?m=newTran&formid="+formid+"&docCode="+doccode,
+ type: "get",
+ async: false,
+ success: function (res) {
+ if(res.state==-1) {
+ layer.alert(res.msg,function (){location.reload();});
+ }else{
+ location.reload();
+ }
+ }, error: function (e, h, a) {
+ layer.alert(e.responseText,function (){location.reload();} );
+ }
+ });
}
}
//閽堝鏀舵浜岀淮鐮佺晫闈㈠叧闂殑澶勭悊 xin 2021-9-8 10:09:33
@@ -1925,6 +2047,112 @@
bgColor: '#CCC'
});
}
+function formatDate (str, format) {
+ var d = new Date(toDate(str));//4浣嶇殑鏁板瓧涓嶄綔涓烘棩鏈熷鐞嗭紝鐩存帴杩斿洖
+ if (d==null||d.getFullYear() == '1970') return str;
+ var o = {
+ "M+": d.getMonth() + 1, //month
+ "d+": d.getDate(), //day
+ "H+": d.getHours(), //hour
+ "m+": d.getMinutes(), //minute
+ "s+": d.getSeconds(), //second
+ "q+": Math.floor((d.getMonth() + 3) / 3), //quarter
+ "S+": d.getMilliseconds() //millisecond
+ }
+ var format = format ? format : "yyyy-MM-dd HH:mm";
+ if (/(y+)/.test(format)) {
+ format = format.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+ }
+ for (var k in o) {
+ if (new RegExp("(" + k + ")").test(format)) {
+ if (RegExp.$1 == "S") {
+ format = format.replace(RegExp.$1, "000");
+ } else {
+ format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+ }
+ }
+ }
+ return format;
+};
+function toDate (dateStr) {
+ var regex1 = /^\d{4}\/\d{1,2}\/\d{1,2}$|^\d{1,2}\/\d{1,2}\/\d{4}$|^\d{4}\/\d{1,2}\/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}$|^\d{1,2}\/\d{1,2}\/\d{4} \d{1,2}:\d{1,2}:\d{1,2}:\d{1,3}$/;
+ var regex2 = /^\d{4}-\d{1,2}-\d{1,2}$/;
+ var regex3 = /^\d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2}$/;
+ var regex4 = /^\d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}$/;
+ var regex5 = /^\d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}.\d{1,3}$/;
+ var regex6 = /^\d{4}-\d{1,2}$/;
+ var regex7 = /^\d{4}$/;
+ if (regex1.test(dateStr)) {
+ return new Date(dateStr);
+ } else if (regex2.test(dateStr)) {
+ var arr = dateStr.split("-");
+ return new Date(arr[0], arr[1] - 1, arr[2]);
+ } else if (regex3.test(dateStr)) {
+ var arr1 = dateStr.split(" ");
+ var arr2 = arr1[0].split("-");
+ var arr3 = arr1[1].split(":");
+ return new Date(arr2[0], arr2[1] - 1, arr2[2], arr3[0], arr3[1])
+ } else if (regex4.test(dateStr)) {
+ var arr1 = dateStr.split(" ");
+ var arr2 = arr1[0].split("-");
+ var arr3 = arr1[1].split(":");
+ return new Date(arr2[0], arr2[1] - 1, arr2[2], arr3[0], arr3[1], arr3[2])
+ } else if (regex5.test(dateStr)) {
+ var arr1 = dateStr.split(" ");
+ var arr2 = arr1[0].split("-");
+ var arr3 = arr1[1].split(":");
+ return new Date(arr2[0], arr2[1] - 1, arr2[2], arr3[0], arr3[1], arr3[2].replace(/\.\d+/g, ""));
+ } else if (regex6.test(dateStr)) {
+ var arr2 = dateStr.split("-");
+ return new Date(arr2[0], arr2[1] - 1)
+ } else {
+ var art2= timeFormat(dateStr,"yyyy-MM-dd HH:mm");
+ return art2;
+ }
+};
+function timeFormat(timeStr,formatStr){
+ if(timeStr==""||timeStr==null||!isNaN(timeStr)){
+ return null;
+ }
+ var arr = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+ var arrtime = timeStr.split(" ");
+ var str = arrtime[2];//骞�
+ str += "-";
+ var flag=false;
+ for(var i=0;i<arr.length;i++){//鏈�
+ if(timeStr.indexOf(arr[i])!=-1){
+ str += (i+1)>=10?(i+1):"0"+(i+1);
+ flag=true;
+ }
+ }
+ if(!flag){//涓嶅瓨鍦ㄦ湀浠斤紝琛ㄧず涓嶆槸杩欑鏍煎紡鐨勬棩鏈�
+ return timeStr;
+ }
+ str += "-";
+ str += arrtime[1].substring(0,2);//鏃�
+ if(formatStr == "yyyy-MM-dd"){
+ return str;
+ }
+ str += " ";
+ var hh = arrtime[3].substring(0,2);//灏忔椂
+ if(formatStr == "yyyy-MM-dd HH:mm"){//灏忔椂鍒嗛挓
+ if(timeStr.indexOf("PM")!=-1){
+ str += (parseInt(hh)+12);
+ str += arrtime[3].substring(2,5);
+ }else{
+ str += arrtime[3].substring(0,5);
+ }
+ }
+ if(formatStr == "yyyy-MM-dd HH:mm:ss"){//灏忔椂鍒嗛挓绉�
+ if(timeStr.indexOf("PM")!=-1){
+ str += (parseInt(hh)+12);
+ str += arrtime[3].substring(2,9);
+ }else{
+ str += arrtime[3].substring(0,9);
+ }
+ }
+ return str;
+}
$(function () {
//鍗曟嵁绐椾綋澶撮儴鍥哄畾 xin 2020-10-26 17:23:58
if (isTopFixed()) {
@@ -1949,10 +2177,7 @@
if (isNaN(value) || value == "") {//涓嶅叏鏄暟瀛�
value = 0;
}
- if (value >= 1) {
- value = 100;
- }
- if (value > 0 && value < 1) {//杩欑鎯呭喌鏄�1琛ㄧず100%鐨勫�硷紝閭ｄ箞0.1*100=10
+ if (value > 0 ) {//杩欑鎯呭喌鏄�1琛ㄧず100%鐨勫�硷紝閭ｄ箞0.1*100=10 // && value < 1
value = value * 100;
}
progressBar(this, value);
--
Gitblit v1.8.0