From ca092bb227d153813406e2592f5ca8e6aff8d44a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 18 三月 2024 17:20:24 +0800
Subject: [PATCH] 1.增加 直接调拨单 编辑模块， 并完善 直接调拨单 列表功能；（常规 功能， 新增，修改，删除，审核，作废，关闭，自定义过滤，源单类型列表（源单 调拨申请单，手工录入）， 合计行，保存控制，审核控制，删除控制，关联数回填 等等) 2.仓库管理下属模块，单据编辑界面，选择基础资料的 全部改为 基础资料列表 的方式； （生产入库单，生产退库单，其他入库单，分布式调入单，生产领料单，领用申请单，生产退料单，其他出库单，分布式调出单，出库申请单，直接调拨单，调拨申请单，条码状态变更单 ）
---
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html | 279 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 208 insertions(+), 71 deletions(-)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
index 493d602..eca6199 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
@@ -38,6 +38,7 @@
<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 = '1210'
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
//鍔犺浇婧愬崟绫诲瀷
@@ -107,11 +131,15 @@
//璇诲彇鍗曟嵁鍒楄〃
//
- 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;
@@ -131,46 +159,29 @@
}
})
});
-
+ //鍒锋柊
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: 150 }
]]
, height: 500
, done: function () {
@@ -178,8 +189,6 @@
}
})
});
-
-
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table')
@@ -219,9 +228,7 @@
}
});
});
-
-
-
+ //鍒犻櫎
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
@@ -266,31 +273,137 @@
}
});
+ //鏌ヨ
+ form.on('submit(cmdQuery)', function () {
+ var HBillNo = $("#HBillNo").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();
+ var index = layer.load();//閬僵
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
+ 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 });
+ }
+ });
+ });
- var sBillType = '1210'
- 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: '#dj-table'
+ // , url: GetWEBURL() + '/Web/chanpinruk'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ // , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ // , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ // , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+ // , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //})
+
+
+
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Web/chanpinruk1",
+ type: "GET",
+ async: false,
+ data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
+ //async: false,
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ 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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ } else {
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ ]]
+ , data: []
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
}
})
+
+
//宸蹭笂浼犲垪琛�
@@ -299,24 +412,48 @@
, 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: 150 }
]]
, height: 500
, done: function () {
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: 15 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 150 }
+ ]]
+ , height: 500
+ })
+
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
@@ -324,7 +461,7 @@
//, toolbar: '#toolbarDemo'
// , where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
]]
, page: true
, height: 500
--
Gitblit v1.9.1