From 188ad6fc153f592c2e8c6f31b54e4be87623965e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 25 十二月 2021 15:16:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html | 164 +++++----
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 46 +-
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 162 +++++++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 4
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html | 244 +++++++++-----
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 74 +--
WebTM/views/index_Mobile.html | 4
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html | 206 ++++++++----
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 30 +
9 files changed, 582 insertions(+), 352 deletions(-)
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index bd99eab..b856f5c 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -432,9 +432,9 @@
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇棰嗘枡缂撳瓨鍒楄〃null
+ 鐢熶骇棰嗘枡缂撳瓨鍒楄〃
</a>
</dd>
<dd>
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_Fast.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_Fast.html"
index 864ca22..3592db0 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_Fast.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_Fast.html"
@@ -50,8 +50,8 @@
<option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
<!--<option value="1201">濮斿璁㈠崟-鎶曟枡</option>
<option value="1402">鍙戣揣閫氱煡鍗�</option>
- <option value="1234">涓嬫灦閫氱煡鍗�</option>
- <option value="1243">璋冩嫧鐢宠鍗�</option>-->
+ <option value="1234">涓嬫灦閫氱煡鍗�</option>-->
+ <option value="1243">璋冩嫧鐢宠鍗�</option>
</select>
<!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
</div>
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 4392c60..4208f7a 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"
@@ -67,6 +67,9 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
</div>
<div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ </div>
+ <div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
</div>
<div class="layui-col-xs2">
@@ -145,7 +148,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../浠撳簱璋冩嫧/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ , content: ['../../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
// , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
// , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
, resize: false
@@ -156,88 +159,130 @@
});
form.on('submit(cmdRefresh)', function () {//鍒锋柊
- var sBillType = '1207'
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
+ , 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({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
- { type: 'radio' }
+ { 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: 'HQty', title: '鏁伴噺', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ });
+
+
+ //鎾ら攢鍔熻兘
+ 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 sBillType = '1207'
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/Web/Rescind_Json",
+ async: true,
+ data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+ 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
+ });
+ }
+ });
});
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
- // console.log(data);
- // var sInterID = $('#HInterID').val()
+ , data = checkStatus.data;
var sInterID = data[0].HInterID
- //var sMaterID = data[0].HMaterID
- //var sBillType = $('#HBillType').val()
- //var sAuxPropID = data[0].HAuxPropID
- ////var sMTONo = data[0].HMTONo
- //var sMTONo = 0
- //var sSourceInterID = data[0].HSourceInterID
- //var sSourceEntryID = data[0].HSourceEntryID
$.ajax(
- {
- type: "Get",
- url: GetWEBURL() + "/Web/Delete_Json",
- async: true,
- data: { "sHInterID": sInterID },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //layer.msg(data.Message, { icon: 1 });
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , where: { HBillType: '1207', sWhere: '' }
- , 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
- })
- }
- else {
- layer.msg(data.Message, { icon: 2 });
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- });
+ {
+ 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
+ });
+ }
+ });
});
@@ -245,9 +290,9 @@
var sBillType = '1207'
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
+ , url: GetWEBURL() + '/Web/chanpinruk'
,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
, { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
@@ -263,7 +308,32 @@
, done: function () {
layer.closeAll("loading");
}
- })
+ })
+
+ //宸蹭笂浼犲垪琛�
+ table.render({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: 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: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
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_Fast.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_Fast.html"
index bdb1748..697750f 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_Fast.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_Fast.html"
@@ -369,7 +369,7 @@
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご-----涓嶄細璧�
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -381,16 +381,16 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HBillType").val(d.data[0].HSourceBillType);
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
- $("#HWHID").val(d.data[0].HWhID);
- $("#HStockPlaceID").val(d.data[0].HSPID);
- $("#HKeeperID").val(d.data[0].HKeeperID);
- $("#HSecManagerID").val(d.data[0].HSecManagerID);
+ //$("#HWHID").val(d.data[0].HWhID);
+ //$("#HStockPlaceID").val(d.data[0].HSPID);
+ //$("#HKeeperID").val(d.data[0].HKeeperID);
+ //$("#HSecManagerID").val(d.data[0].HSecManagerID);
RoadSup();
}
})
}
- function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛-----涓嶄細璧�
+ function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛
{
//var sInterID = $("#HInterID").val()
var HSourceBillNo = $('#HSourceBillNo').val()
@@ -426,48 +426,36 @@
}
}
- function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋-----涓嶄細璧�
+ function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
{
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'SellOut/SellOutDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (result) {
- if (result.count == 1) {
- option.data = result.list[0];
- table.render(option);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ var sInterID = $("#HInterID").val();
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
}
});
- //table.render({
- // elem: '#wl-table'
- // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- // , cellMinWidth: 80
- // , toolbar: '#toolbarDemo'
- // , where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
- // , cols: [[
- // { type: 'radio' }
- // , { field: 'HQty', title: '鏁伴噺', width: 80 }
- // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- // , { field: 'HBatchNo', title: '鎵规', width: 100 }
- // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
- // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
- // ]]
- // //, height: 500
- //})
}
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
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 0fbd27e..9919019 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"
@@ -132,29 +132,51 @@
})
});
- form.on('submit(cmdRefresh)', function () {//缂栬緫
- var sBillType = '1205'
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
+ , 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({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
- { type: 'radio' }
+ { 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: 'HQty', title: '鏁伴噺', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
});
@@ -175,7 +197,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
@@ -199,75 +221,69 @@
});
+
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
- // console.log(data);
- // var sInterID = $('#HInterID').val()
+ , data = checkStatus.data;
var sInterID = data[0].HInterID
- //var sMaterID = data[0].HMaterID
- //var sBillType = $('#HBillType').val()
- //var sAuxPropID = data[0].HAuxPropID
- ////var sMTONo = data[0].HMTONo
- //var sMTONo = 0
- //var sSourceInterID = data[0].HSourceInterID
- //var sSourceEntryID = data[0].HSourceEntryID
$.ajax(
- {
- type: "Get",
- url: GetWEBURL() + "/Web/Delete_Json",
- async: true,
- data: { "sHInterID": sInterID },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.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
- });
- }
- });
+ {
+ 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
+ });
+ }
+ });
});
+
var sBillType = '1205'
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
- , 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({
+ 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");
+ }
+ })
//宸蹭笂浼犲垪琛�
var
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 82654ce..0ce9d2e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -293,24 +293,26 @@
function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
{
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ var sInterID = $("#HInterID").val();
table.render({
elem: '#wl-table'
- , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
- //, cellMinWidth: 80
+ //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
- , where: { HBillID: linterid, HBillType: '1204', sWhere: '' }
+ , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
, cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
// , data: [linterid]
// , page: true
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
index f3968b9..52487de 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
@@ -67,6 +67,9 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
</div>
<div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ </div>
+ <div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
</div>
<div class="layui-col-xs2">
@@ -129,115 +132,184 @@
})
});
- form.on('submit(cmdRefresh)', function () {//缂栬緫
- var sBillType = '1204'
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
+ , 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({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
- { type: 'radio' }
+ { 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: 'HQty', title: '鏁伴噺', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ });
+
+
+ //鎾ら攢鍔熻兘
+ 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 sBillType = '1204'
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/Web/Rescind_Json",
+ async: true,
+ data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+ 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
+ });
+ }
+ });
});
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
- // console.log(data);
- // var sInterID = $('#HInterID').val()
+ , data = checkStatus.data;
var sInterID = data[0].HInterID
- //var sMaterID = data[0].HMaterID
- //var sBillType = $('#HBillType').val()
- //var sAuxPropID = data[0].HAuxPropID
- ////var sMTONo = data[0].HMTONo
- //var sMTONo = 0
- //var sSourceInterID = data[0].HSourceInterID
- //var sSourceEntryID = data[0].HSourceEntryID
$.ajax(
- {
- type: "Get",
- url: GetWEBURL() + "/Web/Delete_Json",
- async: true,
- data: { "sHInterID": sInterID },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //layer.msg(data.Message, { icon: 1 });
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , where: { HBillType: '1204', sWhere: '' }
- , 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
- })
- }
- else {
- layer.msg(data.Message, { icon: 2 });
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- });
+ {
+ 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
+ });
+ }
+ });
});
var sBillType = '1204'
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
- , 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({
+ 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({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: 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: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+
+
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index cc49977..c315584 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -339,10 +339,10 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HBillType").val(d.data[0].HSourceBillType);
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
- $("#HWHID").val(d.data[0].HWhID);
- $("#HStockPlaceID").val(d.data[0].HSPID);
- $("#HKeeperID").val(d.data[0].HKeeperID);
- $("#HSecManagerID").val(d.data[0].HSecManagerID);
+ //$("#HWHID").val(d.data[0].HWhID);
+ //$("#HStockPlaceID").val(d.data[0].HSPID);
+ //$("#HKeeperID").val(d.data[0].HKeeperID);
+ //$("#HSecManagerID").val(d.data[0].HSecManagerID);
}
})
}
@@ -352,20 +352,30 @@
{
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'ProdIn/ProdInDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (result) {
- if (result.count == 1) {
- option.data = result.list[0];
- table.render(option);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ var sInterID = $("#HInterID").val();
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
}
});
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
index 22eacc4..1b2b437 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
@@ -93,11 +93,11 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element;
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
//娓呯┖鐣岄潰 new
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -137,8 +137,45 @@
form.on('submit(cmdModify)', function () {
+ //var checkStatus = table.checkStatus('dj-table')
+ // , data = checkStatus.data;
+ //var sInterID = data[0].HInterID
+ //var sBillNo = data[0].HBillNo
+ //var sBillType = '1202'
+
+ //$.ajax({
+ // url: GetWEBURL() + "/ProductIn/ProductInTempList_Modify",
+ // type: "GET",
+ // data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": 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_ProductInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ // // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
+ // // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, '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: "娓╅Θ鎻愮ず" });
+ // }
+ // }
+ // })
+ // }
+
+ ////ajaxLabelData = data;
+ ////layer.alert(rows);
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
+ , data = checkStatus.data;
//ajaxLabelData = data;
//layer.alert(rows);
layer.open({
@@ -157,30 +194,73 @@
}
})
});
-
+ var option = {
+ elem: '#dj-table'
+ //, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Json'
+ , 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");
+ }
+ }
+ // url: GetWEBURL() + '/Web/chanpinruk',
form.on('submit(cmdRefresh)', function () {//鍒锋柊
- var sBillType = '1202'
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
- ,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
- , 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");
- }
- });
+ ,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({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: 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: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
});
@@ -190,7 +270,7 @@
, data = checkStatus.data;
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
- var sBillType = '1205'
+ var sBillType = '1202'
$.ajax(
{
type: "Get",
@@ -200,14 +280,15 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ 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 });
}
@@ -229,16 +310,7 @@
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
- // console.log(data);
- // var sInterID = $('#HInterID').val()
var sInterID = data[0].HInterID
- //var sMaterID = data[0].HMaterID
- //var sBillType = $('#HBillType').val()
- //var sAuxPropID = data[0].HAuxPropID
- ////var sMTONo = data[0].HMTONo
- //var sMTONo = 0
- //var sSourceInterID = data[0].HSourceInterID
- //var sSourceEntryID = data[0].HSourceEntryID
$.ajax(
{
type: "Get",
@@ -247,14 +319,15 @@
data: { "sHInterID": sInterID },
dataType: "json",
success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ 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 });
@@ -276,9 +349,9 @@
var sBillType = '1202'
table.render({
elem: '#dj-table'
- , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
+ , url: GetWEBURL() + '/Web/chanpinruk'
,toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType,sWhere:''}
+ , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
, cols: [[
{ type: 'radio' }
, { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
@@ -298,14 +371,13 @@
//宸蹭笂浼犲垪琛�
- var
table.render({
elem: '#yd-table'
, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
, toolbar: '#toolbarDemo'
, where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
- { type: 'radio' }
+ { type: 'radio' }
, { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
, { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
, { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
--
Gitblit v1.9.1