From db34c41cbb3df2c21b57d10bbe83ea206d9428d6 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 29 十二月 2021 09:20:57 +0800
Subject: [PATCH] 安瑞 增加 物料编码显示
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index d976ffd..5886990 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -46,13 +46,19 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</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="HName" id="HName">
</div>
@@ -138,16 +144,12 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><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-barcode"><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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
</div>
</script>
-
</div>
-
-
-
</div>
</div>
</div>
@@ -234,21 +236,22 @@
, cellMinWidth: 100
, cols: [[
//{ checkbox: true, fixed: true }
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox'/*, fixed: 'left'*/ }
//{ type: 'radio', fixed: true }
- , { field: 'sorderid', title: '搴忓彿', width: 80, fixed: true }
- , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
- , { field: 'hsubid', title: 'hsubid', sort: true, fixed: true, hide: true }
- , { field: '鐘舵��', title: '鐘舵��', sort: true, fixed: true }
- , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100, fixed: true }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100, fixed: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true, fixed: 'left' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true, fixed: 'left' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true, fixed: 'left' }
+ , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
+ , { field: 'hmainid', title: 'hmainid', sort: true /*, fixed: true*/, hide: true }
+ , { field: 'hsubid', title: 'hsubid', sort: true /*, fixed: true*/, hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true /*, fixed: true*/ }
+ , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100 /*, fixed: true*/ }
+ , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 /*, fixed: true*/ }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true/*, fixed: 'left'*/ }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true/*, fixed: 'left' */ }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */ }
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
@@ -377,6 +380,26 @@
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ break;
+ case 'btn-barcode':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //if (data[0].鏈敓鎴愭潯鐮佹暟閲� <= 0) {
+ // layer.msg("閫変腑琛屽凡鐢熸垚鏉＄爜锛�", { icon: 5 });
+ //}
+ 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 =SRM_EntrustOrderBill', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
}
})
break;
@@ -525,6 +548,8 @@
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
--
Gitblit v1.9.1