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_ProductInBill_FastList.html | 162 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 117 insertions(+), 45 deletions(-)
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