From 3d38632730ae4d3e787050def49d4bc5094e95ef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:06:52 +0800
Subject: [PATCH] 打印模板点击行选择；条码编辑模块添加列合计，保存时特殊字符转换；添康合并生成条码；送货单列表跳转查看条码明细；送货单添加审核、反审核功能；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 93 ++++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 212 ++++++++++++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 56 +++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 274 +++++++++++++++----
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 157 ++++++++---
WebSRM/App_Data/MssqlReportData.cs | 4
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html | 18
7 files changed, 609 insertions(+), 205 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index ce1da7b..e339451 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -21,11 +21,11 @@
//public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//
//澶忓疂
- //public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=192.168.1.223;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//瀹夌憺
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//娣诲悍绉戞妧
- public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
//public string sDataBase;
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
index fcb1003..e5cd8f4 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
@@ -34,7 +34,7 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
</div>
@@ -60,18 +60,20 @@
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
{ type: 'radio' }
- , { field: 'HItemID', width: 150, title: 'ID', hide: true }
- , { field: 'HNumber', width: 150, title: '妯″潡浠ｇ爜' }
- , { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
- , { field: '妯℃澘鍚嶇О', width: 150, title: '妯℃澘鍚嶇О' }
+ , { field: 'HItemID', title: 'ID', hide: true }
+ , { field: 'HNumber', title: '妯″潡浠ｇ爜' }
+ , { field: 'HName', title: '妯″潡鍚嶇О', hide: true }
+ , { field: '妯℃澘鍚嶇О', title: '妯℃澘鍚嶇О' }
]]
});
table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
- obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
- form.render('radio');
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
});
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index d64c4fd..fbb4c4c 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -298,9 +298,10 @@
, toolbar: '#toolbarDemo'
, limit: 500
, height: 500
+ , totalRow: true
, loading: false
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
, { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
@@ -314,12 +315,12 @@
, { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
, { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
, { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
- , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty" }
- , { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
- , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty" }
- , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
+ , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135, totalRow: true}
+ , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty", totalRow: true}
+ , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty", totalRow: true}
+ , { field: 'HBQty', title: '鍐呯鏁�', width: 100, totalRow: true}
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty", totalRow: true}
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100, totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
@@ -506,6 +507,16 @@
var newArray = [];
var index = -1;
//debugger;
+
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
@@ -693,7 +704,7 @@
sessionStorage["linterid"] = rows.toString();
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1010,6 +1021,7 @@
}
else
{
+ //鍚堝苟鏁伴噺鐢熸垚鏉＄爜
layer.load(3)
$.ajax({
type: "GET",
@@ -1028,8 +1040,8 @@
, "HMaterShortNumber": "", "HSubjoin": "", "HMaterName": data[i].HMaterName
, "HMaterModel": data[i].HMaterModel, "HUnitName": data[i].HUnitName, "HUnitNumber": data[i].HUnitNumber
, "HUnitID": data[i].HUnitID, "HDDQty": data[i].HDDQty, "HMrbQty": 0, "HBarcodeCount": data[i].HBarcodeCount
- , "HNotBarcodeCount": data[i].HNotBarcodeCount, "HQty": data[i].HQty, "HMinQty": data[i].HMinQty, "HBQty": data[i].HBQty
- , "HWXQty": data[i].HWXQty, "HWBQty": data[i].HWBQty, "HPrice": data[i].HPrice, "HMoney": data[i].HMoney, "HMTONO": ""
+ , "HNotBarcodeCount": data[i].HNotBarcodeCount, "HQty": data[i].HQty, "HMinQty": data[i].HQty, "HBQty": data[i].HBQty
+ , "HWXQty": data[i].HQty, "HWBQty": data[i].HWBQty, "HPrice": data[i].HPrice, "HMoney": data[i].HMoney, "HMTONO": ""
, "HBatchNo": data[i].HBatchNo, "HBatchManager": data[i].HBatchManager, "HISKFPERIOD": data[i].HISKFPERIOD
, "HEXPUNIT": data[i].HEXPUNIT, "HKFDate": data[i].HKFDate, "HKFPeriod": data[i].HKFPeriod, "HKFDQDate": data[i].HKFDQDate
, "HSupMaterNumber": data[i].HSupMaterNumber, "HSupBatchNo": data[i].HSupBatchNo, "HPOOrderInterID": data[i].HPOOrderInterID
@@ -1341,24 +1353,42 @@
});
}
else if (obj.event == 'inputHQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
else if (obj.event == 'inputHMinQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
else if (obj.event == 'inputHWXQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
});
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index eaa037f..c47f17d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -30,22 +30,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-filter="">
- <option value="" selected="">鍏ㄩ儴</option>
- <option value="鏈墦鍗�">鏈墦鍗�</option>
- <option value="宸叉墦鍗�">宸叉墦鍗�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏉＄爜缂栧彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
@@ -58,11 +42,23 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -70,21 +66,25 @@
</div>
<div class="layui-colla-content" style="padding-left:82px">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">鐘舵��</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�">鏈墦鍗�</option>
+ <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ </select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <label class="layui-form-label">鏉＄爜缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
@@ -175,16 +175,7 @@
var params = getUrlVars();
var type = params[params[0]];
- switch (type) {
- case "UnPrint":
- options[1].selected = true;
- sql += " and 鐘舵�� like ^^%鏈墦鍗�%^^";
- break;
- case "RePrint":
- options[2].selected = true;
- sql += " and 鐘舵�� like ^^%宸叉墦鍗�%^^";
- break;
- }
+ var HSourceBillNo = params[params[1]];
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -199,8 +190,26 @@
, form = layui.form
, element = layui.element;
+ switch (type) {
+ case "UnPrint":
+ options[1].selected = true;
+ sql += " and 鐘舵�� like ^^%鏈墦鍗�%^^";
+ break;
+ case "RePrint":
+ options[2].selected = true;
+ sql += " and 鐘舵�� like ^^%宸叉墦鍗�%^^";
+ break;
+ case "check":
+ if (HSourceBillNo != undefined) {
+ $("#HSourceBillNo").val(HSourceBillNo);
+
+ sql += " and 婧愬崟鍗曞彿 like ^^%" + HSourceBillNo + "%^^";
+ }
+ break;
+ }
+
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鏁伴噺", "鐘舵��", "鍗曚綅", "閲戦"];
+ var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鐘舵��", "鍗曚綅", "閲戦"];
var HModName = "SRM_BarCodeBillList";
var option = [];
//甯歌鐢ㄦ硶
@@ -315,7 +324,7 @@
sessionStorage["linterid"] = rows.toString();
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -378,6 +387,18 @@
};
});
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
//琛岀洃鍚簨浠�
table.on('row(mainTable)', function (obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index c8aaf66..8bd441e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -42,31 +42,7 @@
<div class="layui-input-block" style="width:150px;">
<input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px;">
- <input type="text" class="layui-input" name="HDate1" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px;">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鐘舵��</label>
- <div class="layui-input-block">
- <select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="" selected="">鍏ㄩ儴</option>
- <option value="鏈鏍�">鏈鏍�</option>
- <option value="宸插鏍�">宸插鏍�</option>
- <option value="鏈叧闂�">鏈叧闂�</option>
- <option value="宸插叧闂�">宸插叧闂�</option>
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -78,11 +54,11 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
- </div>
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
@@ -90,17 +66,41 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
<div class="layui-colla-content" style="padding-left:82px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-block">
+ <select id="HClStatus" name="HClStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈鏍�">鏈鏍�</option>
+ <option value="宸插鏍�">宸插鏍�</option>
+ <option value="鏈叧闂�">鏈叧闂�</option>
+ <option value="宸插叧闂�">宸插叧闂�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="width:120px;">
+ <input type="text" class="layui-input" name="HDate1" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="width:120px;">
+ <input type="text" class="layui-input" name="HDate2" id="HDate2">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline" style="display:none">
@@ -139,14 +139,18 @@
<!--<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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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"><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-changebg"><i class="layui-icon layui-icon-form"></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-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MergeBuildBarcode"><i class="layui-icon layui-icon-file"></i>鍚堝苟鐢熸垚鏉＄爜</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-GetBar"><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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -482,6 +486,14 @@
, cellMinWidth: 90
, limit: 500
, limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (item.鍒拌揣鐘舵�� == '宸叉敹璐�') {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", "#7EFCB2")
+ }
+ })
+ }
}
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -597,6 +609,41 @@
else {
layer.msg('璇烽�夋嫨鏁版嵁锛�');
}
+ break;
+ case 'btn-DeAudit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ var InterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�;
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/DeAuditPOInStockBill",
+ data: { "HInterID": InterID, "HBillNo": HBillNo, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_Display(sql);
+ });
+
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ break;
//鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
@@ -646,6 +693,31 @@
}
})
break;
+ case 'btn-edit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data[0].鍗曟嵁鐘舵�� == '瀹℃牳' || data[0].鍗曟嵁鐘舵�� == '宸插鏍�') {
+ layer.msg("閫佽揣鍗曞凡瀹℃牳锛岀姝慨鏀癸紒", { icon: 5 });
+ return;
+ }
+
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閫佽揣鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../../src/views/SRM/SRM_POInStockBill_Edit.html?linterid=' + linterid + '&lentryid=0' + '&lSourceBillType=1102' + '&type =edit'
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ break;
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -687,7 +759,7 @@
layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
return;
}
- if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�' && data[0].鍗曟嵁鐘舵�� != '瀹℃牳') {
layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
return;
}
@@ -699,7 +771,7 @@
//}
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -737,6 +809,56 @@
})
}
break;
+ case 'btn-MergeBuildBarcode':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+
+ if (data[0].鏈敓鎴愭潯鐮佹暟閲� <= 0) {
+ layer.msg("閫変腑琛屽凡鐢熸垚鏉＄爜锛�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏉＄爜鐢熸垚'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid + '&type=0' + '&mergeTags=1', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ break;
+ case 'btn-GetBar':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '鏉＄爜淇℃伅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBillList.html?type=check&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛岄�佽揣鍗曟煡璇㈡潯鐮佷俊鎭紒", { icon: 5 });
+ }
+ break;
case 'btn-exit':
//var index = parent.layer.getFrameIndex(window.name);
//element.tabDelete('layadmin-layout-tabs', this);
@@ -765,6 +887,18 @@
});
});
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
//涓�閿墦鍗�
function convenientPrint() {
var checkStatus = table.checkStatus('mainTable')
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index f5c1c3a..929325e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -21,7 +21,7 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
- <form id="form0" class="layui-form" action="">
+ <form id="form0" class="layui-form" action="" lay-filter="formData">
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
@@ -265,51 +265,59 @@
var linterid = params[params[0]];
var lentryid = params[params[1]];
var lSourceBillType = params[params[2]];
+ var HType = params[params[3]];
// debugger;
- $.ajax({
- url: GetWEBURL() + "GetNewPOInStockBillNo",
- type: "GET",
- data: { "sMsg": linterid, "sMsg3": lSourceBillType },
- async: false,
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
- $("#HDate").val(d.data[0].HDate);
- }
- });
- $.ajax({
- url: GetWEBURL() + "GetNewPOInStockShowBillMain",
- type: "GET",
- data: { "sMsg": linterid, "sMsg3": lSourceBillType },
- success: function (d) {
- //console.log(d.data);
- //$("#HDate").val(d.)
- //$("#HInterID").val(d.data[0].HInterID);
- //$("#HBillNo").val(d.data[0].HBillNo);
- $("#HRemark").val(d.data[0].HRemark);
- //$("#HDate").val(d.data[0].HDateForWeb);
- $("#HMaker").val(sessionStorage["HUserName"]);
- //$("#HMakerDate").val(d.data[0].HMakerDate)
- //$("#HChecker").val(d.data[0].HChecker);
- //$("#HCheckDate").val(d.data[0].HCheckDate);
- $("#HSupID").val(d.data[0].HSupID);
- $("#HSupName").val(d.data[0].HSupName);
- $("#HDeptID").val(d.data[0].HDeptID);
- $("#HDeptName").val(d.data[0].HDepName);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HEmpName").val(d.data[0].HEmpName);
- $("#HManagerID").val(d.data[0].HManagerID);
- $("#HManagerName").val(d.data[0].HManagerName);
- $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
- $("#HPURCHASEORGName").val(d.data[0].HOrgName);
- $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
- $("#HAddress").val(d.data[0].HAddress);
- //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
- }
- });
+ if (HType == "edit") {
+ //缂栬緫
+
+ } else {
+ //鏂板
+ $.ajax({
+ url: GetWEBURL() + "GetNewPOInStockBillNo",
+ type: "GET",
+ data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+ async: false,
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
+ $("#HDate").val(d.data[0].HDate);
+ }
+ });
+ $.ajax({
+ url: GetWEBURL() + "GetNewPOInStockShowBillMain",
+ type: "GET",
+ data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+ success: function (d) {
+ //console.log(d.data);
+ //$("#HDate").val(d.)
+ //$("#HInterID").val(d.data[0].HInterID);
+ //$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HRemark").val(d.data[0].HRemark);
+ //$("#HDate").val(d.data[0].HDateForWeb);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ //$("#HMakerDate").val(d.data[0].HMakerDate)
+ //$("#HChecker").val(d.data[0].HChecker);
+ //$("#HCheckDate").val(d.data[0].HCheckDate);
+ $("#HSupID").val(d.data[0].HSupID);
+ $("#HSupName").val(d.data[0].HSupName);
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDepName);
+ $("#HEmpID").val(d.data[0].HEmpID);
+ $("#HEmpName").val(d.data[0].HEmpName);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].HManagerName);
+ $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
+ $("#HPURCHASEORGName").val(d.data[0].HOrgName);
+ $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
+ $("#HAddress").val(d.data[0].HAddress);
+ //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
+ }
+ });
+ }
+
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -327,18 +335,26 @@
laydate.render({
elem: '#HDHDate'
});
- RoadHBillSub();
+
+ if (HType == "edit") {
+ //缂栬緫
+ RoadBillMain_Edit(linterid);
+ } else {
+ //鏂板
+ RoadHBillSub();
+ }
+
layer.load(3)
var HIsAduit = false;
-
var HModName = "SRM_POInStockBill_Edit";
+ var option = ""
window.HSubData = "";//鍏ㄥ眬鍙橀噺
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'sorderid', title: '搴忓彿', width: 80, hide: true, fixed: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, fixed: true, edit: 'text', hide: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
@@ -351,9 +367,9 @@
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, hide: true }
- , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty" }
- , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
- , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty", totalRow: true}
+ , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100, totalRow: true }
+ , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100, totalRow: true }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
, { field: 'HBatchManager', title: '鍚敤鎵规绠＄悊', width: 120, hide: true }
, { field: 'HOrderType', title: '璁㈠崟绫诲瀷', width: 120, hide: true }
@@ -386,7 +402,8 @@
// , data: [linterid]
// , page: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
+ , totalRow: true
+ , height: 'full-1000'
, done: function () {
layer.closeAll("loading");
}
@@ -576,8 +593,9 @@
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
- });
+ //$input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ });
}
});
@@ -615,6 +633,7 @@
layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
}
}
+ table.reload('mainTable');//鍒锋柊琛ㄦ牸淇℃伅锛屽悎璁℃暟閲�
}
});
@@ -628,7 +647,9 @@
success: function (result) {
if (result.count == 10000) {
for (let i = 0; i < result.data.length; i++) {
- result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
+ if (sessionStorage["Organization"] == "浜嬩笟涓�澶�") {
+ result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
+ }
}
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
HSubData = ajaxReturnData;
@@ -656,9 +677,19 @@
};
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + HType;
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -727,7 +758,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -795,6 +826,8 @@
});
form.on('submit(ChooseSource)', function (data) {
+ var HOrderType = HSubData[0].HOrderType == undefined ? HSubData[0].璁㈠崟绫诲瀷 : HSubData[0].HOrderType
+
layer.open({
type: 2
, area: ['95%', '95%']
@@ -802,7 +835,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow', 'yes']
+ , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow&HSupName=' + $("#HSupName").val() + '&HOrderType=' + HOrderType, 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
@@ -918,6 +951,101 @@
return Result = true;
}
return Result;
+ }
+
+ //缂栬緫閫佽揣鍗曞姞杞借〃澶磋〃浣撴暟鎹�
+ function RoadBillMain_Edit(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POInStockBill/cx",
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (data) {
+ if (data.code == 1) {
+ var data = data.data;
+
+ ajaxReturnData = JSON.parse(JSON.stringify(data));
+ HSubData = ajaxReturnData;
+
+ //涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data[0].hmainid
+ , "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": Format(new Date(data[0].鍗曟嵁鏃ユ湡), "yyyy-MM-dd")
+ , "HSupName": data[0].渚涘簲鍟嗗悕绉�
+ , "HSupID": data[0].HSupID
+ , "HDHDate": Format(new Date(data[0].棰勮鍒拌揣鏃ユ湡), "yyyy-MM-dd")
+ , "HManagerName": data[0].涓荤鍚嶇О
+ , "HManagerID": data[0].HManagerID
+ , "HEmpName": data[0].涓氬姟鍛樺悕绉�
+ , "HEmpID": data[0].HEmpID
+ , "HDeptName": data[0].閮ㄩ棬鍚嶇О
+ , "HDeptID": data[0].HDeptID
+ , "HPURCHASEORGName": data[0].閲囪喘缁勭粐鍚嶇О
+ , "HPURCHASEORGID": data[0].HPURCHASEORGID
+ , "HDeliveryNo": data[0].鐗╂祦鍗曞彿
+ , "HExpressSupplier": data[0].鐗╂祦鍏徃
+ , "HInnerBillNo": data[0].閫佽揣鍗曞彿
+ , "HReceiveGoodsMan": data[0].鏀惰揣浜�
+ , "HAddress": data[0].鏀惰幏鍦板潃
+ , "HReceiveGoodsLink": data[0].鏀惰揣浜鸿仈绯绘柟寮�
+ , "HSendGoodsMan": data[0].閫佽揣浜�
+ , "HSendGoodsAddr": data[0].閫佽揣鍦板潃
+ , "HSendGoodsLink": data[0].閫佽揣浜鸿仈绯绘柟寮�
+ //鍏朵粬淇℃伅
+ //, "HMaker": data[0].鍒跺崟浜�
+ //, "HChecker": data[0].
+ //, "HUpDater": data[0].
+ //, "HMakeDate": data[0].
+ //, "HCheckDate": data[0].
+ //, "HUpDateDate": data[0].
+ });
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "sorderid": (i + 1),"HMTONO": data[i].璁″垝璺熻釜鍗曞彿, "HMaterID": data[i].HMaterID, "HMaterNumber": data[i].鐗╂枡浠ｇ爜
+ , "HOldMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterShortNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HUnitName": data[i].璁￠噺鍗曚綅鍚嶇О, "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜
+ , "HUnitID": data[i].HUnitID, "FPrintCount": data[i].鎵撳嵃鏉＄爜鏁伴噺, "HQty": data[i].閫佽揣鏁伴噺
+ , "HRQty": data[i].鍓╀綑鍙彂璐ф暟閲�, "HSQty": data[i].婧愬崟鏁伴噺, "HBatchNo": data[i].鎵瑰彿
+ , "HBatchManager": data[i].鍚敤鎵规绠＄悊, "HOrderType": data[i].璁㈠崟绫诲瀷, "HKFDate": Format(new Date(data[i].鐢熶骇鏃ユ湡), "yyyy-MM-dd")
+ , "HKFPeriod": data[i].淇濊川鏈�, "HDate": data[i].瀛愰璁″埌璐ф棩鏈�, "HPrice": data[i].鍗曚环
+ , "HMoney": data[i].閲戦, "HRemark": data[i].瀛愬娉�, "HTAXPRICE_T": data[i].鍚◣閲嶉噺鍗曚环鍚�
+ , "HPOOrderInterID": data[i].HPOOrderInterID, "HPOOrderEntryID": data[i].HPOOrderEntryID
+ , "HPOOrderBillNo": data[i].閲囪喘璁㈠崟鍙�, "HWWOrderInterID": data[i].HWWOrderInterID
+ , "HWWOrderEntryID": data[i].HWWOrderEntryID, "HWWOrderBillNo": data[i].濮斿璁㈠崟鍙�, "HBillType": data[i].鍗曟嵁绫诲瀷
+ , "HSourceBillType": data[i].HSourceBillType, "HSourceBillNo": data[i].婧愬崟鍗曞彿, "HSupMaterNumber": data[i].渚涘簲鍟嗘枡鍙�
+ , "HSupBatchNo": data[i].渚涘簲鍟嗘壒娆�, "HExpressNumberSub": data[i].瀛愮墿娴佸崟鍙�, "HExpressSupplierSub": data[i].瀛愮墿娴佸叕鍙�
+ , "HPlanArrivalDate": data[i].鍒拌揣鏃ユ湡, "HBoxNumber": data[i].绠卞彿, "HSourceInterID": data[i].HSourceInterID
+ , "HSourceEntryID": data[i].HSourceEntryID, "FSHDD": "", "F_xbkf_Combo": ""
+ }
+ )
+ }
+ //鍒锋柊琛ㄤ綋鏁版嵁
+ table.reload('mainTable', {
+ data: rowdata
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+
+ //option.data = rowdata;
+ //table.render(option);
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, time: 3000 });
+ }
+
+ layer.closeAll("loading");
+ },
+ error: function (result) {
+ layer.closeAll("loading");
+ layer.msg(data.Message, { icon: 2, time: 3000 });
+ }
+ });
}
////闅愯棌鍒楄缃�
@@ -1047,8 +1175,29 @@
var HSubLen = HSubData.length + 1;
var a = [];
- var HOrderType = HSubData[0].HOrderType
+ var HOrderType = HSubData[0].璁㈠崟绫诲瀷 == undefined ? HSubData[0].HOrderType : HSubData[0].璁㈠崟绫诲瀷
+ var HSupNum = HSubData[0].HOrderType
var HError = "";
+
+ //for (let i = 0; i < HSubData.length; i++) {
+ // if (obj[i].hmaterid == HSubData[i].HMaterID) {
+ // obj[i].HBatchNo = HSubData[i].HBatchNo
+ // Batchno = HSubData[i].HBatchNo
+ // break;
+ // }
+ //}
+
+ var HData_Sub = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+
+ for (let i = 0; i < obj.length; i++) {
+ for (let j = 0; j < HSubData.length; j++) {
+ if (obj[i].hmaterid == HSubData[j].HMaterID) {
+ obj[i].HBatchNo = HSubData[j].鎵瑰彿
+ Batchno = HSubData[j].HBatchNo
+ }
+ }
+ }
+
for (let i = 0; i < obj.length; i++) {
if (obj[i].璁㈠崟绫诲瀷 != HOrderType) {
HError += obj[i].璁㈠崟绫诲瀷;
@@ -1063,15 +1212,16 @@
//"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date()
"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
- "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": Batchno, "HMaterID": obj[i].hmaterid,
+ "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
"HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
- "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitName": obj[i].璁￠噺鍗曚綅, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鏈叧鑱旀暟閲�,
- "HRQty": obj[i].鏈叧鑱旀暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": new Date().toISOString().slice(0, 10),
+ "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitName": obj[i].璁￠噺鍗曚綅, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+ "HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": new Date().toISOString().slice(0, 10),
"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date(),
"HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
};
HSubData.push(row_options);
+ HData_Sub.push(row_options);
HSubLen++;
//var NewRow = {
@@ -1083,7 +1233,7 @@
return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
}
table.reload('mainTable', {
- data: HSubData
+ data: HData_Sub
, height: 'full-10'
, loading: false
, done: function (index, res) {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 9598a2a..d8eb976 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -63,6 +63,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block" style="width:100px;">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
@@ -75,22 +81,17 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HStatus" id="HStatus" lay-filter="">
- <option value="" selected="">鍏ㄩ儴</option>
- <option value="鏈‘璁�">鏈‘璁�</option>
- <option value="宸茬‘璁�">宸茬‘璁�</option>
- <option value="宸查┏鍥�">宸查┏鍥�</option>
- </select>
+ <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block" style="width:130px;">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鐘舵��</label>
<div class="layui-input-block" style="width:120px">
<select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="" selected>鍏ㄩ儴</option>
- <option value="鏈叧闂�">鏈叧闂�</option>
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈叧闂�" selected>鏈叧闂�</option>
<option value="宸插叧闂�">宸插叧闂�</option>
</select>
</div>
@@ -136,14 +137,6 @@
</select>
</div>
</div>
-
- <div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
- <div class="layui-input-block" style="width:130px;">
- <input type="text" class="layui-input" name="HSupName" id="HSupName">
- </div>
- </div>
-
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -151,9 +144,14 @@
</div>
<div class="layui-colla-content" style="padding-left:82px">
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈‘璁�">鏈‘璁�</option>
+ <option value="宸茬‘璁�">宸茬‘璁�</option>
+ <option value="宸查┏鍥�">宸查┏鍥�</option>
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -243,6 +241,8 @@
}
var params = getUrlVars();
var type = params[params[0]];
+ var HSupName = params[params[1]];
+ var HOrderType = params[params[2]];
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -270,6 +270,12 @@
var option = [];
var HModName = "SRM_POOrderBillList";
var sqlWhere = "";
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細HBillType 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+ HOrderType = getParams("HOrderType");
+
+ HSupName = getParams("HSupName");
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
switch (type) {
case "UnConfirm":
@@ -286,22 +292,29 @@
options[3].selected = true;
sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
break;
- //case "AddRow":
- // $("#HStatus").attr("disabled", "disabled");
- // $("#HStatus").val('宸茬‘璁�');
- // $("#HFinishStatus").attr("disabled", "disabled");
- // form.render('select');
- // sqlWhere += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
- // sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
- // $('#btn_reload').addClass("layui-btn-disabled").attr("visibility", "hidden");
- // $('#btn_confirm').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#btn_back').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#btn_report').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#btn_details').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#btn_barcode').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#btn_generate').addClass("layui-btn-disabled").attr("disabled", true);
- // $('#set_dao').addClass("layui-btn-disabled").attr("disabled", true);
- // break;
+ case "AddRow":
+ //$("#HStatus").attr("disabled", "disabled");
+ //$("#HStatus").val('宸茬‘璁�');
+ //$("#HFinishStatus").attr("disabled", "disabled");
+ //form.render('select');
+ //sqlWhere += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+ //sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
+ //$('#btn_reload').addClass("layui-btn-disabled").attr("visibility", "hidden");
+ //$('#btn_confirm').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_back').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_report').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_details').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_barcode').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_generate').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#set_dao').addClass("layui-btn-disabled").attr("disabled", true);
+ if (HSupName != undefined) {
+ sql += " and 渚涘簲鍟� = ^^" + HSupName + "^^";
+ }
+ if (HOrderType != undefined) {
+ sql += " and 璁㈠崟绫诲瀷 = ^^" + HOrderType + "^^";
+ }
+
+ break;
}
set_ClearBill();
@@ -519,7 +532,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺') {
+ if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺' || data[i].name == '鍙彂璐ф暟閲�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
} else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
@@ -657,7 +670,8 @@
sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
}
}
- sql = sqlWhere;
+
+ sqlWhere = sqlWhere + sql;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
get_Display(sqlWhere);
@@ -696,6 +710,18 @@
});
});
}
+ });
+
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
});
//澶村伐鍏锋爮浜嬩欢
@@ -819,25 +845,30 @@
if (data.length == 0) {
layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
- }
- if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
- return layer.msg('璁㈠崟宸插畬鎴愶紒')
- }
+ }
ajaxLabelData = data;
//鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
var ids = "";
var entryids = "";
var HBillType = data[0].璁㈠崟绫诲瀷
+ var HSupNumber = data[0].渚涘簲鍟嗕唬鐮�
var HErr = "";
+ var HSupErr = "";
$.each(data, function (obj) {
ids += data[obj].hmainid + ",";
entryids += data[obj].hsubid + ",";
if (HBillType != data[obj].璁㈠崟绫诲瀷) {
HErr += data[obj].璁㈠崟绫诲瀷;
}
+ if (HSupNumber != data[obj].渚涘簲鍟嗕唬鐮�) {
+ HSupErr += data[obj].渚涘簲鍟嗕唬鐮�;
+ }
})
if (HErr != "") {
return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+ if (HSupErr != "") {
+ return layer.msg('渚涘簲鍟嗕笉鍚岋紝涓嶅厑璁稿悎骞朵笅鎺ㄧ敓鎴愰�佽揣鍗曪紒')
}
ids = ids.substring(0, ids.length - 1);
@@ -877,8 +908,10 @@
if (!hasPrivileage) {
return;
}
+
var rows = '';
var HEntry = '';
+ var HOrderRows = '';
for (var i = 0; i < data.length; i++) {
if (data[i]["鐘舵��"] == "宸茬‘璁�") {
rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
@@ -886,10 +919,18 @@
else {
HEntry += (i + 1) + ',';
}
+
+ if (data[i].瀹屾垚鐘舵�� == "宸插畬鎴�") {
+ HOrderRows += (i + 1) + ',';
+ }
}
if (HEntry != '') {
HEntry = HEntry.substring(0, HEntry.length - 1);
layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+ }
+ else if (HOrderRows != '') {
+ HOrderRows = HOrderRows.substring(0, HOrderRows.length - 1);
+ layer.msg("绗�" + HOrderRows + "琛�,璁㈠崟宸插畬鎴愶紒", { icon: 5 });
}
else {
layer.open({
@@ -899,7 +940,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
+ , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102' + '&type =add', 'yes']
, resize: false
,end: function () {
get_FastQuery(table, option)
@@ -1010,9 +1051,23 @@
var ColName = [];
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i]["hide"] != true) {
- ColName.push(option.cols[0][i]["field"]);
+ ColName.push(option.cols[0][i]["field"]);
}
}
+ //鏇挎崲鎹㈣绗�
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ }
+ });
//缁戝畾鏁版嵁
var data = excel.filterExportData(option.data, ColName)
@@ -1058,6 +1113,18 @@
});
});
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
+
});
</script>
</body>
--
Gitblit v1.9.1