From 3d38632730ae4d3e787050def49d4bc5094e95ef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:06:52 +0800
Subject: [PATCH] 打印模板点击行选择；条码编辑模块添加列合计，保存时特殊字符转换；添康合并生成条码；送货单列表跳转查看条码明细；送货单添加审核、反审核功能；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 212 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 173 insertions(+), 39 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index c8aaf66..8bd441e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -42,31 +42,7 @@
<div class="layui-input-block" style="width:150px;">
<input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px;">
- <input type="text" class="layui-input" name="HDate1" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px;">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鐘舵��</label>
- <div class="layui-input-block">
- <select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="" selected="">鍏ㄩ儴</option>
- <option value="鏈鏍�">鏈鏍�</option>
- <option value="宸插鏍�">宸插鏍�</option>
- <option value="鏈叧闂�">鏈叧闂�</option>
- <option value="宸插叧闂�">宸插叧闂�</option>
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -78,11 +54,11 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
- </div>
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
@@ -90,17 +66,41 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
<div class="layui-colla-content" style="padding-left:82px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-block">
+ <select id="HClStatus" name="HClStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈鏍�">鏈鏍�</option>
+ <option value="宸插鏍�">宸插鏍�</option>
+ <option value="鏈叧闂�">鏈叧闂�</option>
+ <option value="宸插叧闂�">宸插叧闂�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="width:120px;">
+ <input type="text" class="layui-input" name="HDate1" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="width:120px;">
+ <input type="text" class="layui-input" name="HDate2" id="HDate2">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline" style="display:none">
@@ -139,14 +139,18 @@
<!--<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-reload"><i class="layui-icon layui-icon-refresh"></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-radio"></i>鍙嶅鏍�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></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-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></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-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MergeBuildBarcode"><i class="layui-icon layui-icon-file"></i>鍚堝苟鐢熸垚鏉＄爜</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-GetBar"><i class="layui-icon layui-icon-file"></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="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -482,6 +486,14 @@
, cellMinWidth: 90
, limit: 500
, limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (item.鍒拌揣鐘舵�� == '宸叉敹璐�') {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", "#7EFCB2")
+ }
+ })
+ }
}
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -597,6 +609,41 @@
else {
layer.msg('璇烽�夋嫨鏁版嵁锛�');
}
+ break;
+ case 'btn-DeAudit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ var InterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�;
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/DeAuditPOInStockBill",
+ data: { "HInterID": InterID, "HBillNo": HBillNo, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_Display(sql);
+ });
+
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+ }
+ break;
//鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
@@ -646,6 +693,31 @@
}
})
break;
+ case 'btn-edit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data[0].鍗曟嵁鐘舵�� == '瀹℃牳' || data[0].鍗曟嵁鐘舵�� == '宸插鏍�') {
+ layer.msg("閫佽揣鍗曞凡瀹℃牳锛岀姝慨鏀癸紒", { icon: 5 });
+ return;
+ }
+
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閫佽揣鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../../src/views/SRM/SRM_POInStockBill_Edit.html?linterid=' + linterid + '&lentryid=0' + '&lSourceBillType=1102' + '&type =edit'
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ break;
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -687,7 +759,7 @@
layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
return;
}
- if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�' && data[0].鍗曟嵁鐘舵�� != '瀹℃牳') {
layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
return;
}
@@ -699,7 +771,7 @@
//}
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -737,6 +809,56 @@
})
}
break;
+ case 'btn-MergeBuildBarcode':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+
+ if (data[0].鏈敓鎴愭潯鐮佹暟閲� <= 0) {
+ layer.msg("閫変腑琛屽凡鐢熸垚鏉＄爜锛�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏉＄爜鐢熸垚'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid + '&type=0' + '&mergeTags=1', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ break;
+ case 'btn-GetBar':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '鏉＄爜淇℃伅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBillList.html?type=check&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛岄�佽揣鍗曟煡璇㈡潯鐮佷俊鎭紒", { icon: 5 });
+ }
+ break;
case 'btn-exit':
//var index = parent.layer.getFrameIndex(window.name);
//element.tabDelete('layadmin-layout-tabs', this);
@@ -765,6 +887,18 @@
});
});
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
//涓�閿墦鍗�
function convenientPrint() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1