From d13d16e1e48ced35f297e6ff18e5caab093adabc Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 22 十一月 2022 21:04:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 46 +++++
WebTM/views/验收入库/产品入库/Kf_ICStockBillSub_WMS_List.html | 167 ++++++++++++++++++++
WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html | 39 ++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 9
WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html | 9
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 36 ++++
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html | 41 ++++
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 9 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 9
WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html | 33 ++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 5
WebTM/WebTM.csproj | 6
WebTM/views/系统管理/组织架构设置/Gy_DutyEdit.html | 14
13 files changed, 388 insertions(+), 35 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0931899..096b1f9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1097,6 +1097,7 @@
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_FastCheck.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_CheckList_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
@@ -1478,10 +1479,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <Folder Include="Files\000000001043\" />
- <Folder Include="Files\000000001077\" />
- <Folder Include="Files\000000001078\" />
- <Folder Include="Files\000000001080\" />
+ <Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
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_MoveStockBillList.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_MoveStockBillList.html"
index 75b0a28..c7e373a 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_MoveStockBillList.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_MoveStockBillList.html"
@@ -112,6 +112,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -166,6 +167,10 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
+ //鏄庣粏
+ case 'btn-WmsSub':
+ getWmsSub();
+ break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
break;
@@ -219,7 +224,8 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
- { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ { type: 'checkbox', fixed: 'left' }
+ ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
@@ -298,6 +304,34 @@
DisPlay_HideColumn();
}
+ //鏉＄爜鏄庣粏
+ function getWmsSub() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillType = "1207";
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鏉＄爜鏄庣粏" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ //, end : function () {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // get_Display(sWhere);
+ //}
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBill.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBill.html"
index 33b5e67..db9eeb5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBill.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBill.html"
@@ -210,9 +210,10 @@
//#region 鑷姩鎾斁妯″紡涓嬭幏鍙栭〉闈俊鎭殑鏂规硶
function set_LoadAgain() {
get_Display(sWhere);
- get_Display2(sWhere);
- get_Display3(sWhere);
- setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
+ setTimeout(function () { get_Display2(sWhere); }, 500);
+ setTimeout(function () { get_Display2(sWhere); }, 500);
+ setTimeout(function () { get_Display3(sWhere); }, 500);
+ setTimeout(function () { ins.reload({ autoplay: false }) }, 1000);
}
//#endregion
@@ -338,7 +339,7 @@
, limit: 50
, height: 300
, cols: [[
- , { field: '璁″垝', title: '璁″垝', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '璁″垝', width: 100 }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 100, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 940fab1..8587fd0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -388,10 +388,11 @@
, height: 'full-50'
, page: true
, cellMinWidth: 90
+ , totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
@@ -404,7 +405,7 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115, totalRow: true }
, { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', width: 115 }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 115 }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
index ec8a9dd..bfecf4a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
@@ -6,12 +6,12 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -109,7 +109,7 @@
</html>
<script>
layui.config({
- base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index a6b47f6..a0bd901 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -725,7 +725,7 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -738,7 +738,11 @@
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 });
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -751,6 +755,7 @@
, data: data1.data
, height: 550
, page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index b640f82..83df1ab 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -815,7 +815,7 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -828,7 +828,11 @@
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 });
+ if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -841,6 +845,7 @@
, data: data1.data
, height: 550
, page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 653b1d9..3a16b25 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -248,9 +248,10 @@
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
, height: 'full-70'
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿', width: 160 }
, { field: '鍞竴ID', title: '鍞竴ID', width: 160 }
, { field: '鐢熶骇璁㈠崟鍙�', title: '鎵瑰彿', width: 160 }
@@ -259,11 +260,11 @@
, { field: '寮�宸ユ棩鏈�', title: '涓嬭揪鏃ユ湡', width: 160, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '瑕佹眰瀹屽伐', title: '瑕佹眰瀹屽伐', width: 160, templet: "<div>{{d.瑕佹眰瀹屽伐 ==null ?'':layui.util.toDateString(d.瑕佹眰瀹屽伐, 'yyyy-MM-dd')}}</div>" }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 200 }
- , { field: '鏁存壒', title: '鏁存壒', width: 160 }
- , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾', width: 160 }
+ , { field: '鏁存壒', title: '鏁存壒', width: 160, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾', width: 160, totalRow: true}
, { field: '姹囨姤鍗曟暟閲�', title: '姹囨姤鍗曟暟閲�', width: 160 }
- , { field: '鍏ュ簱', title: '鍏ュ簱', width: 200 }
- , { field: '鍦ㄥ埗', title: '鍦ㄥ埗', width: 200 }
+ , { field: '鍏ュ簱', title: '鍏ュ簱', width: 200, totalRow: true}
+ , { field: '鍦ㄥ埗', title: '鍦ㄥ埗', width: 200, totalRow: true }
, { field: '宸ュ簭', title: '宸ュ簭', width: 200 }
, { field: '鐝粍', title: '鐝粍', width: 200 }
, { field: '鐘舵��', title: '鐘舵��', width: 200 }
@@ -272,6 +273,25 @@
, { field: '閿�鍞鍗曞彿', title: '閿�鍞崟鍙�', width: 160 }
, { field: '绛夌骇', title: '绛夌骇', width: 160 }
]]
+ ,done: function (res) {
+ var count = 0;
+ var HBillNo = "";
+ for (var i = 0; i < res.data.length; i++) {
+ if (res.data[i]["娴佽浆鍗″彿"] != HBillNo) {
+ count += res.data[i]["鏁存壒"];
+ HBillNo = res.data[i]["娴佽浆鍗″彿"];
+ }
+ }
+ var divArr = $(".layui-table-total div.layui-table-cell");
+ $.each(divArr, function (index, item) {
+ var _div = $(item);
+ var content = _div.html();
+ if (index == 9) {
+ content = count;
+ }
+ _div.html(content);
+ });
+ }
};
}
@@ -285,6 +305,18 @@
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
+ //var num = 0;
+ //for (let i = 0; i < data1.data.length; i++) {
+ // for (let j = i + 1; j < data1.data.length; j++) {
+ // if (data1.data[i].娴佽浆鍗″彿 === data1.data[j].娴佽浆鍗″彿) {
+ // //num += data1.data[i].鏁存壒;
+ // //data1.data[i].filter(() => {
+ // // return
+ // //})
+ // data1.data[j].鏁存壒 = '';
+ // }
+ // }
+ //}
table.render(option);
layer.close(wait);
} else {
@@ -418,7 +450,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index 2fe89a2..bce69e6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -105,13 +105,14 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -171,6 +172,10 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
+ break;
+ //鏄庣粏
+ case 'btn-WmsSub':
+ getWmsSub();
break;
//娴忚
case 'btn-view': get_ViewReport();
@@ -242,7 +247,8 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
- { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ { type: 'checkbox', fixed: 'left' }
+ ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: 'hmanagerid', title: 'hmanagerid', width: 160, hide: true }
@@ -308,6 +314,7 @@
]]
}
}
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var index = layer.load(0);
@@ -335,6 +342,34 @@
DisPlay_HideColumn();
}
+
+ //鏉＄爜鏄庣粏
+ function getWmsSub() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillType = "1206";
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鏉＄爜鏄庣粏" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ //, end : function () {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // get_Display(sWhere);
+ //}
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ }
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -374,7 +409,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
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 cc8b14a..1e2bb87 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"
@@ -1296,6 +1296,15 @@
if (sBarCode != "") {
$('#HBarCode').val("");
}
+ //浠撲綅蹇呴』褰曞叆
+ //if (sHSPID == '' || sHSPID == 0) {
+ // //
+ // playSound();
+ // layer.msg("浠撲綅涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // //11
+ // return false;
+ //}
+ //
$.ajax({
url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
type: "GET",
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_ICStockBillSub_WMS_List.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_ICStockBillSub_WMS_List.html"
new file mode 100644
index 0000000..b0c502c
--- /dev/null
+++ "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_ICStockBillSub_WMS_List.html"
@@ -0,0 +1,167 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏉＄爜鏄庣粏</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+
+<script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var BillType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+ var HInterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ //if (BillType == undefined) {
+ // BillType = 3711;
+ // HInterID = 70;
+ //}
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(1);
+ break;
+ };
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鏉＄爜', title: '鏉＄爜' }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜'}
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+ ]]
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ sWhere = " and HInterID=" + HInterID + " and HBillType='" + BillType+"'";
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Kf_ICStockBillSub_WMS/Kf_ICStockBillSub_WMS_List',
+ type: "GET",
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
\ No newline at end of file
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_ProductInBillList.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_ProductInBillList.html"
index 62daf59..cedb8eb 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_ProductInBillList.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_ProductInBillList.html"
@@ -111,6 +111,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -256,6 +257,10 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
+ break;
+ //鏄庣粏
+ case 'btn-WmsSub':
+ getWmsSub();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -475,9 +480,6 @@
}
- //#endregion
-
-
// 蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -523,6 +525,35 @@
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
+ //鏉＄爜鏄庣粏
+ function getWmsSub() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillType = "1202";
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鏉＄爜鏄庣粏" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ //, end : function () {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // get_Display(sWhere);
+ //}
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ }
+
// 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -543,7 +574,7 @@
set_ClearQuery();
get_Display(sWhere);
}
- //#endregion
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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_OtherInBillList.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_OtherInBillList.html"
index 5efc92d..3efe374 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_OtherInBillList.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_OtherInBillList.html"
@@ -111,6 +111,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -261,6 +262,10 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
break;
+ //鏄庣粏
+ case 'btn-WmsSub':
+ getWmsSub();
+ break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -370,6 +375,34 @@
DisPlay_HideColumn();
}
+ //鏉＄爜鏄庣粏
+ function getWmsSub() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillType = "1203";
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鏉＄爜鏄庣粏" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ //, end : function () {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // get_Display(sWhere);
+ //}
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1