From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 194 ++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 97 deletions(-)
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..ee18b10 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"
@@ -125,6 +125,7 @@
var sBillType = '1203';
var col = [];
+ var option = {}
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
//鍔犺浇婧愬崟绫诲瀷
@@ -141,20 +142,21 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100, totalRow: true}
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 100 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
layer.closeAll("loading");
}
})
+ table.render(option);
//宸蹭笂浼犲垪琛�
table.render({
elem: '#yd-table'
@@ -173,7 +175,7 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true}
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HOrgID', title: '缁勭粐', width: 120 }
]]
@@ -195,7 +197,7 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HOrgID', title: '缁勭粐', width: 120 }
]]
@@ -204,8 +206,10 @@
}
//閫�鍑�
- form.on('submit(Cancel)', function () {
- parent.location.href = "../../../views/index.html"
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html"
+ });
//window.close();//鍏抽棴褰撳墠椤�
})
//缂栬緫
@@ -231,41 +235,26 @@
//鍒锋柊
form.on('submit(cmdRefresh)', function () {
- get_Display();
- table.render({
- elem: '#yd-table'
- , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , page: true // 寮�鍚垎椤�
- , limits: [20, 40, 80, 100]
- , limit: 20
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HOrgID', title: '缁勭粐', width: 120 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- })
+ location.reload();
});
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ }else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1203'
$.ajax(
{
@@ -292,7 +281,7 @@
error: function (err) {
layer.msg('閿欒' + err, {
icon: 5,
- time: 20000
+ time: 2000
}, function () {
//do something
});
@@ -307,7 +296,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
@@ -386,7 +375,7 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HOrgID', title: '缁勭粐', width: 120 }
]]
@@ -399,61 +388,72 @@
//鍔犺浇缂撳瓨鍒楄〃鏁版嵁
- //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 });
- // }
- // }
- // }
+ col.push({ type: 'radio' });
+ 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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ 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]
- // });
+ option = {
+ elem: '#dj-table'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , totalRow: 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 });
- // }
- // });
- //}
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render(option);
+ 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({
elem: '#mx-table'
--
Gitblit v1.9.1