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_SellOutBill_FastList.html | 324 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 222 insertions(+), 102 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
index e0cc7a5..9c4b93c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
@@ -34,10 +34,11 @@
</div>
</div>
</div>-->
- <div class="layui-tab" lay-filter="tab-POStockInBillList">
+ <div class="layui-tab" lay-filter="tab-SellOutBillList">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1">缂撳瓨鍒楄〃</li>
<li lay-id="2">宸蹭笂浼犲垪琛�</li>
+ <li lay-id="3">宸蹭笂浼犳煡璇�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -51,6 +52,28 @@
<div class="layui-row">
<div class="layui-col-xs12">
<table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </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">
+ </div>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
</div>
</div>
</div>
@@ -97,9 +120,10 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element;
+ var option = {};
//娓呯┖鐣岄潰 new
-
+ var sBillType = '1205'
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
//鍔犺浇婧愬崟绫诲瀷
@@ -107,70 +131,72 @@
//璇诲彇鍗曟嵁鍒楄〃
//
- 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();//鍏抽棴褰撳墠椤�
})
+ //缂栬緫
form.on('submit(cmdModify)', function () {
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
- //ajaxLabelData = data;
- //layer.alert(rows);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閿�鍞嚭搴撳崟'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
- , resize: false
- , cancel: function () {
- $(".layui-btn").removeClass("layui-btn-disabled");
+ , data = checkStatus.data;
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": sBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閿�鍞嚭搴撳崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ //, content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- })
+ });
});
form.on('submit(cmdRefresh)', function () {//鍒锋柊
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , 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 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }),
+ table.render(option);
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: 80 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { 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: 100 }
- , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 120 }
]]
, height: 500
, done: function () {
@@ -178,15 +204,23 @@
}
})
});
-
-
-
//鎾ら攢鍔熻兘
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 = '1205'
$.ajax(
{
@@ -220,50 +254,110 @@
}
});
});
-
-
-
- form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ //鍒犻櫎
+ form.on('submit(cmdDelete)', function () {
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
- var sInterID = data[0].HInterID
- $.ajax(
- {
- type: "Get",
- url: GetWEBURL() + "/ProductInBillList/Delete_Json",
- async: true,
- data: { "sHInterID": sInterID },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
- }
- else {
- layer.msg(data.Message, { icon: 2 });
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
+ if (checkStatus.data.length === 1) {
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+ async: true,
+ data: { "sHInterID": sInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
});
- }
- });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
});
+ //鏌ヨ
+ //form.on('submit(cmdQuery)', function () {
+ // var HBillNo = $("#HBillNo").val();
+ // var HSourceBillNo = $("#HSourceBillNo").val();
+ // //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_Mould/list1',
+ // type: "GET",
+ // data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.close(index);
+ // } else {
+ // layer.close(index);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(index);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //});
+
+ form.on('submit(cmdQuery)', function () {
+ var HBillNo = $("#HBillNo").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();;
+
+ table.render({
+ elem: '#sy-table'
+ , url: GetWEBURL() + '/ProductInBillList/list1'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
+ , 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");
+ }
+ })
+ });
-
- var sBillType = '1205'
table.render({
elem: '#dj-table'
, url: GetWEBURL() + '/Web/chanpinruk'
@@ -271,14 +365,14 @@
, 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: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
@@ -286,12 +380,17 @@
}
})
+
+
//宸蹭笂浼犲垪琛�
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: 80 }
@@ -310,6 +409,27 @@
layer.closeAll("loading");
}
})
+
+ //宸蹭笂浼犳煡璇�
+ table.render({
+ elem: '#sy-table'
+ , toolbar: '#toolbarDemo'
+ , 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
+ })
+
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
--
Gitblit v1.9.1