From eb6a2854aa5089a87c4d1f16572ad3fd11a11b32 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 03 八月 2022 20:51:45 +0800
Subject: [PATCH] 修改
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 114 ++++++++++++++++++++-----------------
WebTM/views/grf/瑞与祺江苏打印模板.grf | 42 +++++++++++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html | 12 +++
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html | 1
4 files changed, 106 insertions(+), 63 deletions(-)
diff --git "a/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf" "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
index 6ca3e1b..6c8f328 100644
--- "a/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
+++ "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
@@ -105,6 +105,9 @@
Item
Name='瀛愪欢瑙勬牸'
End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
End
End
Items Column
@@ -373,7 +376,7 @@
Items ReportHeader
Item
Name='ReportHeader1'
- Height=4.39208
+ Height=5.00063
Items Control
Item
Type=FreeGrid
@@ -384,6 +387,7 @@
Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
End
ColumnCount=9
+ RowCount=6
Items FreeGridColumn
Item[1]
Width=2.06375
@@ -416,8 +420,8 @@
Item
Type=Barcode
Name='Barcode1'
- Left=5.21229
- Width=3.175
+ Left=5.60917
+ Width=3.20146
Height=1.5875
BarcodeType=QRCode
CaptionPosition=None
@@ -426,9 +430,9 @@
Item
Type=FieldBox
Name='FieldBox1'
- Left=13.9965
+ Left=10.3981
Top=0.211667
- Width=4.39208
+ Width=3.20146
Height=1.19063
ShrinkFontToFit=T
DataField='鍗曟嵁鍙�'
@@ -438,7 +442,7 @@
Name='StaticBox1'
Left=0.211667
Top=0.211667
- Width=4.39208
+ Width=5.00063
Height=1.19063
Object Font
Name='瀹嬩綋'
@@ -451,9 +455,9 @@
Item
Type=StaticBox
Name='StaticBox2'
- Left=12.991
+ Left=8.99583
Top=0.211667
- Width=0.820208
+ Width=0.79375
Height=1.19063
Object Font
Name='瀹嬩綋'
@@ -462,6 +466,14 @@
Charset=134
End
Text='ID'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=14.3933
+ Width=4.41854
+ Height=1.5875
+ Text='鍗曟嵁鍙�'
End
End
ColSpan=9
@@ -587,6 +599,20 @@
End
ColSpan=2
End
+ Item[6,1]
+ Text='鏁伴噺'
+ End
+ Item[6,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Dock=Fill
+ DataField='鐢熶骇鏁伴噺'
+ End
+ End
+ End
End
End
End
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
index 99231a2..1484df6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
@@ -237,8 +237,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1207'
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index b7e9ff1..f073b7f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -307,6 +307,7 @@
form.on('submit(cmdQuery)', function () {
var HBillNo = $("#HBillNo").val();
var HSourceBillNo = $("#HSourceBillNo").val();
+ var index = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Gy_Mould/list1',
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index 490119b..59b067c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -262,8 +262,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1203'
@@ -399,60 +407,60 @@
//鍔犺浇缂撳瓨鍒楄〃鏁版嵁
- //function get_Display() {
- // var ajaxLoad = layer.load();
- // $.ajax({
- // url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
- // type: "GET",
- // data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
- // success: function (data1) {
- // if (data1.count == 1) {
- // var data = [];
- // //缁欑┖鐨勬暟缁勮祴鍊�
- // for (var key in data1.list) {
- // data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- // }
+ function get_Display() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
+ type: "GET",
+ data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
- // for (var i = 0; i < data.length; i++) {
- // if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- // }
- // else {
- // switch (data[i].Type) {
- // //int
- // case 'DateTime':
- // 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:
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- // }
- // }
- // }
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ 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:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
- // //鍔ㄦ�佹樉绀哄垪鍚�
- // table.render({
- // elem: '#dj-table'
- // , cols: [col]
- // , data: data1.data
- // , height: 550
- // , page: true
- // , cellMinWidth: 90
- // , limit: 50
- // , limits: [50, 500, 5000, 20000]
- // });
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render({
+ elem: '#dj-table'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ });
- // layer.close(ajaxLoad);
- // //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.close(ajaxLoad);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(ajaxLoad);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- //}
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鍒锋柊鏄庣粏椤电
table.render({
--
Gitblit v1.9.1