From 948975757cb1239637e38c02a19eac5e6ecb95eb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 02 十一月 2024 11:19:42 +0800
Subject: [PATCH] 打印弹窗缩小；批量选择即时库存生成条码；系统默认转工序不允许删除；添康到货确认模块只传入单据id
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/PublicPage/MaterialInfo.html | 25 +++++++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_TK.html | 33 +++++-----
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 15 +++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 2
WebTM/views/质量管理/质量报表/QC_ProdBadReasonStatistics.html | 26 ++++++++
WebTM/views/Baseset/SRM_OpenTmpList.html | 29 ++++++---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22 ++++++
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 2
12 files changed, 127 insertions(+), 35 deletions(-)
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index b02e4d3..f46e42d 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -35,7 +35,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>
@@ -66,10 +66,10 @@
, loading: false
, 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: '妯℃澘鍚嶇О' }
]]
, page: true
, limits: [50, 500, 5000, 50000]
@@ -78,12 +78,21 @@
DisPlay_HideColumn();
- 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');
- });
+ //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');
+ //});
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
function getUrlVars() {
var vars = [], hash;
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 97009a0..8feafc5 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -99,7 +99,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
@@ -121,6 +121,27 @@
]]
};
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -162,7 +183,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 8a98c2b..d3fab6b 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -676,7 +676,25 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toFixed(2), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": "" }]
+
+ var data = checkStatus.data;
+ var arr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ arr.push({
+ "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+ , "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+ , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+ , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+ , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd")
+ , "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+ , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+ , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+ , "HCheckEmpName": ""
+ })
+ }
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -874,7 +892,7 @@
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, hide: true }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index fe01877..cab1f2d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -502,7 +502,7 @@
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index c903dd4..3493760 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -849,7 +849,7 @@
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 215f3b1..13d8844 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -301,7 +301,7 @@
rows = rows.substring(rows.length - 1, 0);
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 60ed9ee..01207d5 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1445,6 +1445,8 @@
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else if (table.cache["mainTable"][obj.tr.data('index')].HProcNo == "9999") {
+ layer.msg('绯荤粺杞伐搴忥紝涓嶅厑璁稿垹闄わ紒锛侊紒');
} else {
var oldData = table.cache["mainTable"];
oldData.splice(obj.tr.data('index'), 1)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
index 43ba134..4d00565 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
@@ -91,6 +91,7 @@
<div class="layui-btn-container">
<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="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -332,6 +333,10 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭
+ case 'get_export':
+ get_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -438,6 +443,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -472,6 +478,26 @@
get_FastQuery();
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option.data
+ 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, '').replaceAll(",","锛�"); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
index 541bec2..f112fa5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
@@ -516,6 +516,21 @@
// option_detail.data.push(option.data[i])
//}
+ if (data.field.HMaterName.indexOf("\"") != -1 || data.field.HMaterName.indexOf(";") != -1) {
+ data.field.HMaterName = data.field.HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (data.field.HMaterModel.indexOf("\"") != -1 || data.field.HMaterModel.indexOf(";") != -1) {
+ data.field.HMaterModel = data.field.HMaterModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].HMaterName.indexOf("\"") != -1 || option.data[i].HMaterName.indexOf(";") != -1) {
+ option.data[i].HMaterName = option.data[i].HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (option.data[i].HMaterModel.indexOf("\"") != -1 || option.data[i].HMaterModel.indexOf(";") != -1) {
+ option.data[i].HMaterModel = option.data[i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(option.data);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index dab7ec9..9e82a08 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -2871,7 +2871,7 @@
}
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index 4c2a4f9..0680789 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -586,7 +586,7 @@
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
index 8d42ff9..0b3427a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
@@ -239,25 +239,26 @@
function set_Aduit() {
var index = layer.load();
- for (var i = 0; i < table.cache["mainTable"].length; i++) {
- if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
- table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- 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(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
- table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- }
+ //for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ // if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
+ // table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ // 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(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ // if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
+ // table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ //}
- var HInterID = $('#HInterID').val();
- var HBillNo = $('#HBillNo').val();
- var sSubStr = table.cache['mainTable'];
+ //var HInterID = $('#HInterID').val();
+ //var HBillNo = $('#HBillNo').val();
+ //var sSubStr = table.cache['mainTable'];
+ var FID = table.cache['mainTable'][0].FID;
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
- type: "Post",
- data: { "msg": JSON.stringify(sSubStr) },
+ type: "Get",
+ data: { "FID": FID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.code == "1") {
layer.msg("瀹℃牳鎴愬姛", {
--
Gitblit v1.9.1